From adbf5b87d5788f1f10a9631c73a2b963e99bc590 Mon Sep 17 00:00:00 2001
From: beck <beck@openbsd.org>
Date: Tue, 2 May 2017 04:03:06 +0000
Subject: [PATCH] Add regress for free functions that should be safe with NULL

---
 regress/lib/libcrypto/free/Makefile   | 20 +++++++++++++
 regress/lib/libcrypto/free/freenull.c | 43 +++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 regress/lib/libcrypto/free/Makefile
 create mode 100644 regress/lib/libcrypto/free/freenull.c

diff --git a/regress/lib/libcrypto/free/Makefile b/regress/lib/libcrypto/free/Makefile
new file mode 100644
index 00000000000..cde5cb6702d
--- /dev/null
+++ b/regress/lib/libcrypto/free/Makefile
@@ -0,0 +1,20 @@
+#	$OpenBSD: Makefile,v 1.1 2017/05/02 04:03:06 beck Exp $
+
+TESTS = \
+	freenull
+
+REGRESS_TARGETS= all_tests
+
+LDADD=		-lcrypto
+DPADD=		${LIBCRYPTO} ${LIBSSL}
+LDFLAGS+=	-lcrypto
+CFLAGS+=	-DLIBRESSL_INTERNAL
+
+CLEANFILES+= ${TESTS}
+
+all_tests: ${TESTS}
+	@for test in $>; do \
+		./$$test; \
+	done
+
+.include <bsd.regress.mk>
diff --git a/regress/lib/libcrypto/free/freenull.c b/regress/lib/libcrypto/free/freenull.c
new file mode 100644
index 00000000000..8a3cd5de29d
--- /dev/null
+++ b/regress/lib/libcrypto/free/freenull.c
@@ -0,0 +1,43 @@
+/* $OpenBSD: freenull.c,v 1.1 2017/05/02 04:03:06 beck Exp $ */
+/*
+ * Copyright (c) 2017 Bob Beck <beck@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
+#include <err.h>
+#include <stdio.h>
+#include <string.h>
+
+/* Make sure we do the right thing. Add here if you convert ones in tree */
+int
+main(int argc, char **argv)
+{
+	int failed = 0;
+	ASN1_OBJECT_free(NULL);
+	ASN1_INTEGER_free(NULL);
+	ASN1_OCTET_STRING_free(NULL);
+	NAME_CONSTRAINTS_free(NULL);
+	GENERAL_SUBTREE_free(NULL);
+	DIST_POINT_free(NULL);
+	X509_NAME_ENTRY_free(NULL);
+	GENERAL_NAME_free(NULL);
+	sk_GENERAL_NAME_pop_free(NULL, GENERAL_NAME_free);
+	sk_X509_NAME_ENTRY_pop_free(NULL, X509_NAME_ENTRY_free);
+	printf("PASS\n");
+	return (failed);
+}
-- 
2.20.1