diff options
| author | DarrenJiang13 <yjjiang1996@163.com> | 2022-10-18 13:28:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-18 08:28:25 +0300 |
| commit | ba1f09d3fecc4c1c52a1b7e17dea207939a5843d (patch) | |
| tree | bccc8e53dd163970dea6cde324e86854dfb11cd3 | |
| parent | a9d561afa5970a38b35be0c9cf23af5294bcedf0 (diff) | |
| download | redis-ba1f09d3fecc4c1c52a1b7e17dea207939a5843d.tar.gz | |
fix malloc macro in listpack.c (#11398)
fix some malloc macros in `listpack.c`.
listpack has it's own malloc aliases, but in some places normal redis malloc calls have slipped in.
| -rw-r--r-- | src/listpack.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/listpack.c b/src/listpack.c index 479ab097d..db9a1b4ab 100644 --- a/src/listpack.c +++ b/src/listpack.c @@ -1124,7 +1124,7 @@ unsigned char *lpMerge(unsigned char **first, unsigned char **second) { lplength = lplength < UINT16_MAX ? lplength : UINT16_MAX; /* Extend target to new lpbytes then append or prepend source. */ - target = zrealloc(target, lpbytes); + target = lp_realloc(target, lpbytes); if (append) { /* append == appending to target */ /* Copy source after target (copying over original [END]): @@ -1148,11 +1148,11 @@ unsigned char *lpMerge(unsigned char **first, unsigned char **second) { /* Now free and NULL out what we didn't realloc */ if (append) { - zfree(*second); + lp_free(*second); *second = NULL; *first = target; } else { - zfree(*first); + lp_free(*first); *first = NULL; *second = target; } @@ -1397,7 +1397,7 @@ void lpRandomPairs(unsigned char *lp, unsigned int count, listpackEntry *keys, l unsigned int index; unsigned int order; } rand_pick; - rand_pick *picks = zmalloc(sizeof(rand_pick)*count); + rand_pick *picks = lp_malloc(sizeof(rand_pick)*count); unsigned int total_size = lpLength(lp)/2; /* Avoid div by zero on corrupt listpack */ @@ -1431,7 +1431,7 @@ void lpRandomPairs(unsigned char *lp, unsigned int count, listpackEntry *keys, l p = lpNext(lp, p); } - zfree(picks); + lp_free(picks); } /* Randomly select count of key value pairs and store into 'keys' and |