From 848c63a5fd3aa2261dbb693a1617d3e3520448a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sat, 20 Jan 2007 21:53:32 +0000 Subject: [PATCH] Check for NUL characters in string and return ASN1_BAD_CHARACTER error-code if we find them. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20011 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/asn1/der_get.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/asn1/der_get.c b/lib/asn1/der_get.c index 1dbaa6919..e9280ee39 100644 --- a/lib/asn1/der_get.c +++ b/lib/asn1/der_get.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2007 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -140,6 +140,9 @@ der_get_general_string (const unsigned char *p, size_t len, if (len > len + 1) return ASN1_BAD_LENGTH; + if (memchr(p, 0, len) != NULL) + return ASN1_BAD_CHARACTER; + s = malloc (len + 1); if (s == NULL) return ENOMEM;