Merge branch 'PHP-7.1' into PHP-7.2

tpunt · tpunt · commit 3139be0bea9f · 2018-04-29T20:04:18.000+01:00
* PHP-7.1:
  Fix potential memory leak in the enchant extension
  Fix potential memory leak in curl extension
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
@@ -719,7 +719,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
 	}
 
 	if (sugg) {
-		zval_dtor(sugg);
+		zval_ptr_dtor(sugg);
 		array_init(sugg);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -719,7 +719,7 @@ PHP_FUNCTION(enchant_dict_quick_check)`
`719`	`719`	`}`
`720`	`720`
`721`	`721`	`if (sugg) {`
`722`		`- zval_dtor(sugg);`
	`722`	`+ zval_ptr_dtor(sugg);`
`723`	`723`	`array_init(sugg);`
`724`	`724`	`}`
`725`	`725`