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

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 23557b092d5141d7bfbae366e957731dc6fdaa80..8c82e7637036e53108dcdbbc7471f0803828b2ed 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -575,7 +575,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);
@@ -591,7 +593,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);
                        }
                }