From 98cd07cb773373d61f700f7305f402159b70ed45 Mon Sep 17 00:00:00 2001
From: logan <>
Date: Wed, 4 Jun 2014 20:04:55 +0000
Subject: Fix a leak that can occur when len == 0, and as a result we leak a \0
 byte.

(From Frantisek Boranek)

OK from miod@
---
 src/lib/libcrypto/pkcs12/p12_kiss.c         | 2 +-
 src/lib/libssl/src/crypto/pkcs12/p12_kiss.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c
index bc1fcff45d..cfefc6aaac 100644
--- a/src/lib/libcrypto/pkcs12/p12_kiss.c
+++ b/src/lib/libcrypto/pkcs12/p12_kiss.c
@@ -269,7 +269,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
 			int len, r;
 			unsigned char *data;
 			len = ASN1_STRING_to_UTF8(&data, fname);
-			if(len > 0) {
+			if(len >= 0) {
 				r = X509_alias_set1(x509, data, len);
 				free(data);
 				if (!r)
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c b/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c
index bc1fcff45d..cfefc6aaac 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c
@@ -269,7 +269,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
 			int len, r;
 			unsigned char *data;
 			len = ASN1_STRING_to_UTF8(&data, fname);
-			if(len > 0) {
+			if(len >= 0) {
 				r = X509_alias_set1(x509, data, len);
 				free(data);
 				if (!r)
-- 
cgit v1.2.3-55-g6feb