From: Jakub Hrozek <jakub.hrozek@gmail.com>
Date: Wed, 3 Dec 2014 14:45:09 +0000 (+0100)
Subject: rwrap: Don't dereference NULL when skipping broken records.
X-Git-Url: http://git.samba.org/?p=amitay%2Fsamba.git;a=commitdiff_plain;h=5c0ada1d570175498a4b97628b6f1dc45a72109a

rwrap: Don't dereference NULL when skipping broken records.

CID: 83426
CID: 83425

Signed-off-by: Jakub Hrozek <jakub.hrozek@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/resolv_wrapper/resolv_wrapper.c b/lib/resolv_wrapper/resolv_wrapper.c
index a0b28211597..7211ad087a4 100644
--- a/lib/resolv_wrapper/resolv_wrapper.c
+++ b/lib/resolv_wrapper/resolv_wrapper.c
@@ -678,12 +678,6 @@ static int rwrap_get_record(const char *hostfile, unsigned recursion,
 		NEXT_KEY(rec_type, key);
 		NEXT_KEY(key, value);
 
-		q = value;
-		while(q[0] != '\n' && q[0] != '\0') {
-			q++;
-		}
-		q[0] = '\0';
-
 		if (key == NULL || value == NULL) {
 			RWRAP_LOG(RWRAP_LOG_WARN,
 				"Malformed line: not enough parts, use \"rec_type key data\n"
@@ -691,6 +685,12 @@ static int rwrap_get_record(const char *hostfile, unsigned recursion,
 			continue;
 		}
 
+		q = value;
+		while(q[0] != '\n' && q[0] != '\0') {
+			q++;
+		}
+		q[0] = '\0';
+
 		if (TYPE_MATCH(type, ns_t_a, rec_type, "A", key, query)) {
 			rc = rwrap_create_fake_a_rr(key, value, rr);
 			break;