From d63ec2dfcb9f091c85d22fc2b352bc66931e36e1 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 20 Nov 2019 14:01:01 +0100
Subject: [PATCH] - Fix Terminating Quotes not Written, reported by X41 D-Sec.

---
 dnscrypt/dnscrypt.c | 6 +++---
 doc/Changelog       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dnscrypt/dnscrypt.c b/dnscrypt/dnscrypt.c
index 72a9527f5..4a1bd1a10 100644
--- a/dnscrypt/dnscrypt.c
+++ b/dnscrypt/dnscrypt.c
@@ -751,9 +751,9 @@ dnsc_load_local_data(struct dnsc_env* dnscenv, struct config_file *cfg)
         for(j=0; j<sizeof(struct SignedCert); j++) {
 			int c = (int)*((const uint8_t *) cert + j);
             if (isprint(c) && c != '"' && c != '\\') {
-                snprintf(rr + strlen(rr), rrlen - 1 - strlen(rr), "%c", c);
+                snprintf(rr + strlen(rr), rrlen - strlen(rr), "%c", c);
             } else {
-                snprintf(rr + strlen(rr), rrlen - 1 - strlen(rr), "\\%03d", c);
+                snprintf(rr + strlen(rr), rrlen - strlen(rr), "\\%03d", c);
             }
         }
         verbose(VERB_OPS,
@@ -762,7 +762,7 @@ dnsc_load_local_data(struct dnsc_env* dnscenv, struct config_file *cfg)
 			" to local-data to config: %s",
 			serial, rr
 		);
-        snprintf(rr + strlen(rr), rrlen - 1 - strlen(rr), "\"");
+        snprintf(rr + strlen(rr), rrlen - strlen(rr), "\"");
         cfg_strlist_insert(&cfg->local_data, strdup(rr));
         free(rr);
     }
diff --git a/doc/Changelog b/doc/Changelog
index 9d5db1a54..5ae98c560 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -31,6 +31,7 @@
 	  ifdef sha2.h inclusion for older systems.
 	- Fixed Compat Code Diverging from Upstream, reported by X41 D-Sec.
 	- Fix compile with --enable-alloc-checks, reported by X41 D-Sec.
+	- Fix Terminating Quotes not Written, reported by X41 D-Sec.
 
 19 November 2019: Wouter
 	- Fix CVE-2019-18934, shell execution in ipsecmod.