From fb911432cbe4e0976c017622c1a57dd0aa964be0 Mon Sep 17 00:00:00 2001 From: Timo Teras Date: Tue, 6 Jan 2009 19:19:52 +0200 Subject: [PATCH] apk_array: clear newly allocated memory --- src/apk_defines.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/apk_defines.h b/src/apk_defines.h index 4b741d4..f86a4a8 100644 --- a/src/apk_defines.h +++ b/src/apk_defines.h @@ -13,6 +13,7 @@ #define APK_DEFINES_H #include +#include #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define BIT(x) (1 << (x)) @@ -66,9 +67,13 @@ void apk_log(const char *prefix, const char *format, ...); array_type_name##_resize(struct array_type_name *a, int size) \ { \ struct array_type_name *tmp; \ + int oldnum = a ? a->num : 0; \ tmp = (struct array_type_name *) \ realloc(a, sizeof(struct array_type_name) + \ - size * sizeof(elem_type_name)); \ + size * sizeof(elem_type_name)); \ + if (size > oldnum) \ + memset(&tmp->item[oldnum], 0, \ + (size - oldnum) * sizeof(a->item[0])); \ tmp->num = size; \ return tmp; \ } \