From 4acf396f8375bd5888f656b91ebc84d228c7b66f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Fri, 27 Sep 2019 12:01:30 +0200
Subject: [PATCH] lib/isc/pkc11.c: Fix possible NULL pointer dereference in
 push_attribute()

(cherry picked from commit e8948fd9b4b8b188db2d51600dc01a46d57d4b5f)
---
 lib/isc/pk11.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
index aaddac5c20..234a07e81f 100644
--- a/lib/isc/pk11.c
+++ b/lib/isc/pk11.c
@@ -802,13 +802,17 @@ push_attribute(pk11_object_t *obj, isc_mem_t *mctx, size_t len) {
 	CK_ATTRIBUTE *attr;
 	CK_BYTE cnt = obj->attrcnt;
 
+	REQUIRE(old != NULL || cnt == 0);
+
 	obj->repr = isc_mem_get(mctx, (cnt + 1) * sizeof(*attr));
 	if (obj->repr == NULL) {
 		obj->repr = old;
 		return (NULL);
 	}
 	memset(obj->repr, 0, (cnt + 1) * sizeof(*attr));
-	memmove(obj->repr, old, cnt * sizeof(*attr));
+	if (old != NULL) {
+		memmove(obj->repr, old, cnt * sizeof(*attr));
+	}
 	attr = obj->repr + cnt;
 	attr->ulValueLen = (CK_ULONG) len;
 	attr->pValue = isc_mem_get(mctx, len);