From: Jakub Zelenka <bukka@php.net>
Date: Sun, 4 Jun 2017 17:11:49 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff93f74f63994aaf25323dc94366876b1e6c28a4;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

ff93f74f63994aaf25323dc94366876b1e6c28a4
diff --cc ext/openssl/openssl.c
index 77897a2f44,6b382ba6bd..f9d022a657
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -874,15 -852,15 +879,17 @@@ static void add_assoc_name_entry(zval 
  					zend_hash_str_update(Z_ARRVAL(subitem), sname, strlen(sname), &tmp);
  				}
  			} else {
+ 				/* it might be better to expand it and pass zval from ZVAL_STRING
+ 				 * to zend_symtable_str_update so we do not silently drop const
+ 				 * but we need a test to cover this part first */
  				add_assoc_stringl(&subitem, sname, (char *)to_add, to_add_len);
  			}
 +		} else {
 +			php_openssl_store_errors();
  		}
  
- 		if (needs_free) {
- 			/* ASN1_STRING_to_UTF8(3): The buffer out should be freed using free(3) */
- 			OPENSSL_free(to_add);
+ 		if (to_add_buf != NULL) {
+ 			OPENSSL_free(to_add_buf);
  		}
  	}