caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: case when SPOP with count>MAXINT, setTypeRandomElements() will get negative count argument due to signed/unsigned mismatch.

Browse Source 
setTypeRandomElements() now returns unsigned long, and also uses unsigned long for anything related to count of members.
spopWithCountCommand() now uses unsigned long elements_returned instead of int, for values returned from setTypeRandomElements()
This commit is contained in:
Alon Diamant 2014-12-18 12:39:58 +02:00
parent 288028876f
commit 3c8a75583d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/redis.h
View File

@ -1266,7 +1266,7 @@ void setTypeReleaseIterator(setTypeIterator *si);
int setTypeNext(setTypeIterator *si, robj **objele, int64_t *llele); int setTypeNext(setTypeIterator *si, robj **objele, int64_t *llele);
robj *setTypeNextObject(setTypeIterator *si); robj *setTypeNextObject(setTypeIterator *si);
int setTypeRandomElement(robj *setobj, robj **objele, int64_t *llele); int setTypeRandomElement(robj *setobj, robj **objele, int64_t *llele);
int setTypeRandomElements(robj *set, int count, robj *aux_set); unsigned long setTypeRandomElements(robj *set, unsigned long count, robj *aux_set);
unsigned long setTypeSize(robj *subject); unsigned long setTypeSize(robj *subject);
void setTypeConvert(robj *subject, int enc); void setTypeConvert(robj *subject, int enc);

12
src/t_set.c
View File

@ -225,11 +225,11 @@ int setTypeRandomElement(robj *setobj, robj **objele, int64_t *llele) {
* at producing N elements, and the elements are guaranteed to be non * at producing N elements, and the elements are guaranteed to be non
* repeating. * repeating.
*/ */
int setTypeRandomElements(robj *set, int count, robj *aux_set) { unsigned long setTypeRandomElements(robj *set, unsigned long count, robj *aux_set) {
int set_size; unsigned long set_size;
int elements_to_return = count; unsigned long elements_to_return = count;
int elements_copied = 0; unsigned long elements_copied = 0;
int current_element = 0; unsigned long current_element = 0;
/* Like all setType* functions, we assume good behavior on part of the caller, /* Like all setType* functions, we assume good behavior on part of the caller,
* so no extra parameter checks are made. */ * so no extra parameter checks are made. */
@ -480,7 +480,7 @@ void scardCommand(redisClient *c) {
void spopWithCountCommand(redisClient *c) { void spopWithCountCommand(redisClient *c) {
long l; long l;
unsigned long count, size; unsigned long count, size;
int elements_returned; unsigned long elements_returned;
robj *set, *aux, *aux_set; robj *set, *aux, *aux_set;
int64_t llele; int64_t llele;