upstream/redis
1
0
Fork 0
mirror of https://github.com/redis/redis.git synced 2026-05-28 04:02:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add error handling for HLL operations in sunioncardCommand

Browse source
This commit is contained in:
Hristo Staykov 2026-03-25 18:57:15 +02:00
parent 675f965fa5
commit 59365a1ec2
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/t_set.c
View file

@ -1908,6 +1908,7 @@ void sunioncardCommand(client *c) {
}
robj *hllobj = createHLLObject();
int hll_err = 0;
long elements_processed = 0;
int early_exit = 0;
@ -1923,12 +1924,18 @@ void sunioncardCommand(client *c) {
setTypeInitIterator(&si, sets[j].set);
while ((encoding = setTypeNext(&si, &str, &len, &llval)) != -1) {
int retval = 0;
if (str != NULL) {
hllAdd(hllobj, (unsigned char *)str, len);
retval = hllAdd(hllobj, (unsigned char *)str, len);
} else {
char buf[LONG_STR_SIZE];
size_t slen = ll2string(buf, sizeof(buf), (long long)llval);
hllAdd(hllobj, (unsigned char *)buf, slen);
retval = hllAdd(hllobj, (unsigned char *)buf, slen);
}
if (retval == -1) {
hll_err = 1;
early_exit = 1;
break;
}
elements_processed++;
@ -1943,10 +1950,6 @@ void sunioncardCommand(client *c) {
setTypeResetIterator(&si);
}
uint64_t cardinality = hllCount(hllobj->ptr, NULL);
if (limit > 0 && cardinality > (uint64_t)limit)
cardinality = (uint64_t)limit;
if (server.memory_tracking_enabled) {
for (j = 0; j < numkeys; j++) {
robj *obj = sets[j].set;
@ -1956,7 +1959,15 @@ void sunioncardCommand(client *c) {
}
}
addReplyLongLong(c, (long long)cardinality);
if (!hll_err) {
uint64_t cardinality = hllCount(hllobj->ptr, NULL);
if (limit > 0 && cardinality > (uint64_t)limit)
cardinality = (uint64_t)limit;
addReplyLongLong(c, (long long)cardinality);
} else {
addReplyError(c, "-INVALIDOBJ Corrupted HLL object detected");
}
decrRefCount(hllobj);
zfree(sets);
return;