Merge branch 'PHP-7.0' into PHP-7.1

lt · lt · commit d2f07edf711a · 2017-01-18T14:47:49.000Z
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -880,7 +880,7 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s
 
 		if (needs_free) {
 			/* ASN1_STRING_to_UTF8(3): The buffer out should be freed using free(3) */
-			free(to_add);
+			OPENSSL_free(to_add);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -880,7 +880,7 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s`
`880`	`880`
`881`	`881`	`if (needs_free) {`
`882`	`882`	`/* ASN1_STRING_to_UTF8(3): The buffer out should be freed using free(3) */`
`883`		`- free(to_add);`
	`883`	`+ OPENSSL_free(to_add);`
`884`	`884`	`}`
`885`	`885`	`}`
`886`	`886`