From: David Carlier <devnexen@gmail.com>
Date: Wed, 23 Mar 2016 17:50:57 +0000 (+0000)
Subject: CLEANUP: chunk: adding NULL check to chunk_dup allocation.
X-Git-Tag: v1.7-dev3~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ab1043c6bdc3c044edb31a674031d277b877bc7;p=thirdparty%2Fhaproxy.git

CLEANUP: chunk: adding NULL check to chunk_dup allocation.

Avoiding harmful memcpy call if the allocation failed.
Resetting the size which avoids further harmful freeing
invalid pointer. Closer to the comment behavior description.
---

diff --git a/include/common/chunk.h b/include/common/chunk.h
index b74c767488..aac5282fb1 100644
--- a/include/common/chunk.h
+++ b/include/common/chunk.h
@@ -177,6 +177,12 @@ static inline char *chunk_dup(struct chunk *dst, const struct chunk *src)
 		dst->size++;
 
 	dst->str = (char *)malloc(dst->size);
+	if (!dst->str) {
+		dst->len = 0;
+		dst->size = 0;
+		return NULL;
+	}
+
 	memcpy(dst->str, src->str, dst->len);
 	if (dst->len < dst->size)
 		dst->str[dst->len] = 0;