opensourcemirror
/
redis
mirror of https://github.com/antirez/redis.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ziplistNext should work as expected when called with a pointer to ZIP_END

This commit is contained in:
Pieter Noordhuis 2010-05-31 23:35:21 +02:00
parent a03611e133
commit d71b98650f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ziplist.c
View File

@ -430,7 +430,16 @@ unsigned char *ziplistIndex(unsigned char *zl, int index) {
/* Return pointer to next entry in ziplist. */
unsigned char *ziplistNext(unsigned char *zl, unsigned char *p) {
((void) zl);
return (p[0] == ZIP_END) ? NULL : p+zipRawEntryLength(p);
/* "p" could be equal to ZIP_END, caused by ziplistDelete,
* and we should return NULL. Otherwise, we should return NULL
* when the *next* element is ZIP_END (there is no next entry). */
if (p[0] == ZIP_END) {
return NULL;
} else {
p = p+zipRawEntryLength(p);
return (p[0] == ZIP_END) ? NULL : p;
}
}
/* Return pointer to previous entry in ziplist. */