From 45ed952d978db0fca265b0d06ca1864fee0e696b Mon Sep 17 00:00:00 2001 From: ranshid Date: Tue, 25 Jun 2024 12:40:15 +0000 Subject: [PATCH] Fix bad memory accounting for sds when no malloc_size available Signed-off-by: ranshid --- src/sds.c | 2 +- src/sdsalloc.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sds.c b/src/sds.c index c52c14759b..1c0ddd559d 100644 --- a/src/sds.c +++ b/src/sds.c @@ -415,7 +415,7 @@ size_t sdsAllocSize(sds s) { char type = s[-1] & SDS_TYPE_MASK; /* SDS_TYPE_5 header doesn't contain the size of the allocation */ if (type == SDS_TYPE_5) { - return s_malloc_size(sdsAllocPtr(s)); + return s_malloc_usable_size(sdsAllocPtr(s)); } else { return sdsHdrSize(type) + sdsalloc(s) + 1; } diff --git a/src/sdsalloc.h b/src/sdsalloc.h index 6fd076d9f0..dfa8257ebd 100644 --- a/src/sdsalloc.h +++ b/src/sdsalloc.h @@ -51,5 +51,6 @@ #define s_trymalloc_usable ztrymalloc_usable #define s_tryrealloc_usable ztryrealloc_usable #define s_malloc_size zmalloc_size +#define s_malloc_usable_size zmalloc_usable_size #endif