From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 23 Sep 2021 14:59:59 +0000 (+0200)
Subject: CAA value may be empty
X-Git-Tag: 1.8.0-rc.1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=590c1d4986351490ebd001ea72222a7a5b90f01d;p=thirdparty%2Fldns.git

CAA value may be empty

Thanks Robert Mortimer
---

diff --git a/Changelog b/Changelog
index fe1efd3a..62834a9c 100644
--- a/Changelog
+++ b/Changelog
@@ -45,6 +45,7 @@
 	  Thanks niknah
 	* PR #133: Update m4 files for python modules.
 	  Thanks Petr Menšík
+	* Bufix CAA value fields may be empty: Thanks Robert Mortimer
 
 1.7.1	2019-07-26
 	* bugfix: Manage verification paths for OpenSSL >= 1.1.0
diff --git a/str2host.c b/str2host.c
index 420bbdfd..c9911d38 100644
--- a/str2host.c
+++ b/str2host.c
@@ -1551,15 +1551,15 @@ ldns_str2rdf_long_str(ldns_rdf **rd, const char *str)
 	}
 	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) {
-		LDNS_FREE(dp);
-		return LDNS_STATUS_MEM_ERR;
+		data = NULL;
+	} else {
+		/* Lose the overmeasure */
+		data = LDNS_XREALLOC(dp = data, uint8_t, length);
+		if (! data) {
+			LDNS_FREE(dp);
+			return LDNS_STATUS_MEM_ERR;
+		}
 	}
-
 	/* Create rdf */
 	*rd = ldns_rdf_new(LDNS_RDF_TYPE_LONG_STR, length, data);
 	if (! *rd) {