From: Scott MacVicar <scottmac@php.net>
Date: Sun, 29 Mar 2009 23:33:01 +0000 (+0000)
Subject: MFH Fix bug #47828 - Converting to UTF-8 can sometimes fail, check error codes and... 
X-Git-Tag: php-5.2.10RC1~262
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e617627f654ddc076ee994536259dec8d2c7db0;p=php

MFH Fix bug #47828 - Converting to UTF-8 can sometimes fail, check error codes and avoid segfault.
---

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index dd406004ae..d67ae447ac 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -301,7 +301,9 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s
 				str = X509_NAME_ENTRY_get_data(ne);
 				if (ASN1_STRING_type(str) != V_ASN1_UTF8STRING) {
 					to_add_len = ASN1_STRING_to_UTF8(&to_add, str);
-					add_next_index_stringl(subentries, (char *)to_add, to_add_len, 1);
+					if (to_add_len != -1) {
+						add_next_index_stringl(subentries, (char *)to_add, to_add_len, 1);
+					}
 				} else {
 					to_add = ASN1_STRING_data(str);
 					to_add_len = ASN1_STRING_length(str);
@@ -317,7 +319,7 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s
 		} else {
 			zval_dtor(subentries);
 			FREE_ZVAL(subentries);
-			if (obj_cnt && str) {
+			if (obj_cnt && str && to_add_len > -1) {
 				add_assoc_stringl(subitem, sname, (char *)to_add, to_add_len, 1);
 			}
 		}