From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 10 Jan 2001 01:06:31 +0000 (+0000)
Subject: Fix uni2asc() so it can properly convert zero length
X-Git-Tag: OpenSSL_0_9_6a-beta1~81^2~57
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cbf0f45f90ce316360f07c8b6c5f37b913d9c24d;p=oweals%2Fopenssl.git

Fix uni2asc() so it can properly convert zero length
unicode strings. Certain PKCS#12 files contain these
in BMPStrings and it used to crash on them.
---

diff --git a/CHANGES b/CHANGES
index 75fdcc509b..e5371b98dc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,10 @@
 
  Changes between 0.9.6 and 0.9.7  [xx XXX 2000]
 
+  *) Fix to uni2asc() to cope with zero length Unicode strings.
+     These are present in some PKCS#12 files.
+     [Steve Henson]
+
   *) Finish off removing the remaining LHASH function pointer casts.
      There should no longer be any prototype-casting required when using
      the LHASH abstraction, and any casts that remain are "bugs". See
diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index 2c2166e8d7..8ed3e0d0c7 100644
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -83,7 +83,7 @@ char *uni2asc (unsigned char *uni, int unilen)
 	char *asctmp;
 	asclen = unilen / 2;
 	/* If no terminating zero allow for one */
-	if (uni[unilen - 1]) asclen++;
+	if (!unilen || uni[unilen - 1]) asclen++;
 	uni++;
 	if (!(asctmp = OPENSSL_malloc (asclen))) return NULL;
 	for (i = 0; i < unilen; i+=2) asctmp[i>>1] = uni[i];