aboutsummaryrefslogtreecommitdiffstats
path: root/main/ldns/CVE-2017-1000232.patch
blob: d36738ca22949f79a05866d8abf0032879be74e5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
From f5bae2bf02aa0d8a38e02e14f27e3c4dee15077d Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 27 Apr 2017 00:25:20 +0200
Subject: [PATCH] bugfix #1257: Free after reallocing to 0 size

Thanks Stephan Zeisberg
---
 str2host.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/str2host.c b/str2host.c
index c396f547..c3afba1d 100644
--- a/str2host.c
+++ b/str2host.c
@@ -1496,8 +1496,10 @@ ldns_str2rdf_long_str(ldns_rdf **rd, const char *str)
 	if (! str) {
 		return LDNS_STATUS_SYNTAX_BAD_ESCAPE;
 	}
-	length = (size_t)(dp - data);
-
+	if (!(length = (size_t)(dp - data))) {
+		LDNS_FREE(data);
+		return LDNS_STATUS_SYNTAX_EMPTY;
+	}
 	/* Lose the overmeasure */
 	data = LDNS_XREALLOC(dp = data, uint8_t, length);
 	if (! data) {