Merge branch 'PHP-7.2' into PHP-7.3

nikic · nikic · commit 69f54dd54938 · 2018-12-23T20:20:53.000+01:00
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
@@ -755,7 +755,7 @@ PHP_FUNCTION(get_browser)
 			found_entry = zend_hash_str_find_ptr(bdata->htab,
 				DEFAULT_SECTION_NAME, sizeof(DEFAULT_SECTION_NAME)-1);
 			if (found_entry == NULL) {
-				efree(lookup_browser_name);
+				zend_string_release(lookup_browser_name);
 				RETURN_FALSE;
 			}
 		}
diff --git a/ext/standard/tests/misc/browscap_no_default.ini b/ext/standard/tests/misc/browscap_no_default.ini
@@ -0,0 +1,2 @@
+[Firefox]
+Browser="Firefox"
diff --git a/ext/standard/tests/misc/get_browser_no_default.phpt b/ext/standard/tests/misc/get_browser_no_default.phpt
@@ -0,0 +1,12 @@
+--TEST--
+get_browser() without a default
+--INI--
+browscap={PWD}/browscap_no_default.ini
+--FILE--
+<?php
+
+var_dump(get_browser(""));
+
+?>
+--EXPECT--
+bool(false)

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ PHP_FUNCTION(get_browser)`
`755`	`755`	`found_entry = zend_hash_str_find_ptr(bdata->htab,`
`756`	`756`	`DEFAULT_SECTION_NAME, sizeof(DEFAULT_SECTION_NAME)-1);`
`757`	`757`	`if (found_entry == NULL) {`
`758`		`- efree(lookup_browser_name);`
	`758`	`+ zend_string_release(lookup_browser_name);`
`759`	`759`	`RETURN_FALSE;`
`760`	`760`	`}`
`761`	`761`	`}`