aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/uthash/utstring.h4
m---------src/rdns0
m---------src/ucl0
3 files changed, 3 insertions, 1 deletions
diff --git a/contrib/uthash/utstring.h b/contrib/uthash/utstring.h
index 4ef7b5690..f11f34b77 100644
--- a/contrib/uthash/utstring.h
+++ b/contrib/uthash/utstring.h
@@ -44,6 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
typedef struct {
char *d;
+ void **pd;
size_t n; /* allocd size */
size_t i; /* index of first unused byte */
} UT_string;
@@ -54,6 +55,7 @@ do { \
(s)->d = (char*)realloc((s)->d, (s)->n + amt); \
if ((s)->d == NULL) oom(); \
(s)->n += amt; \
+ if ((s)->pd) *((s)->pd) = (s)->d; \
} \
} while(0)
@@ -78,7 +80,7 @@ do { \
#define utstring_new(s) \
do { \
- s = (UT_string*)calloc(sizeof(UT_string),1); \
+ s = (UT_string*)calloc(1, sizeof(UT_string)); \
if (!s) oom(); \
utstring_init(s); \
} while(0)
diff --git a/src/rdns b/src/rdns
-Subproject a7f457e2548cfb8f5c6199aa0ed2e9486171710
+Subproject 44e4c9ba12d2504379443e7f7a7f94ad088a28e
diff --git a/src/ucl b/src/ucl
-Subproject d84b73bb28b0bd762c3a5cd3183e6ba5e86b4a1
+Subproject e3e15c4802bb8bf764ff4936e345f28676dad12