fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3221 from oranagra/bitfield_fix

Browse Source 
fix crash in BITFIELD GET when key is integer encoded
This commit is contained in:
Salvatore Sanfilippo 2016-05-18 05:53:53 -07:00
commit 4c9c9d726a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bitops.c
View File

@ -1035,16 +1035,28 @@ void bitfieldCommand(client *c) {
changes++; changes++;
} else { } else {
/* GET */ /* GET */
o = lookupKeyRead(c->db,c->argv[1]);
size_t olen = (o == NULL) ? 0 : sdslen(o->ptr);
unsigned char buf[9]; unsigned char buf[9];
size_t olen = 0;
unsigned char *src = NULL;
char llbuf[32];
o = lookupKeyRead(c->db,c->argv[1]);
/* Set the 'p' pointer to the string, that can be just a stack allocated
* array if our string was integer encoded. */
if (o && o->encoding == OBJ_ENCODING_INT) {
src = (unsigned char*) llbuf;
olen = ll2string(llbuf,sizeof(llbuf),(long)o->ptr);
} else if (o) {
src = (unsigned char*) o->ptr;
olen = sdslen(o->ptr);
}
/* For GET we use a trick: before executing the operation /* For GET we use a trick: before executing the operation
* copy up to 9 bytes to a local buffer, so that we can easily * copy up to 9 bytes to a local buffer, so that we can easily
* execute up to 64 bit operations that are at actual string * execute up to 64 bit operations that are at actual string
* object boundaries. */ * object boundaries. */
memset(buf,0,9); memset(buf,0,9);
unsigned char *src = o ? o->ptr : NULL;
int i; int i;
size_t byte = thisop->offset >> 3; size_t byte = thisop->offset >> 3;
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {