mfh

Sterling Hughes · Sterling Hughes · commit d8b14bd70062 · 2002-12-27T03:22:42.000Z
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -1352,6 +1352,9 @@ PHP_FUNCTION(stristr)
 	if (Z_TYPE_PP(needle) == IS_STRING) {
 		if (!Z_STRLEN_PP(needle)) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter.");
+			efree(haystack_orig);
+			zval_ptr_dtor(haystack);
+			zval_ptr_dtor(needle);
 			RETURN_FALSE;
 		}
 
@@ -1372,6 +1375,8 @@ PHP_FUNCTION(stristr)
 		RETVAL_FALSE;
 	}
 
+	zval_ptr_dtor(haystack);
+	zval_ptr_dtor(needle);
 	efree(haystack_orig);
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -1352,6 +1352,9 @@ PHP_FUNCTION(stristr)`
`1352`	`1352`	`if (Z_TYPE_PP(needle) == IS_STRING) {`
`1353`	`1353`	`if (!Z_STRLEN_PP(needle)) {`
`1354`	`1354`	`php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter.");`
	`1355`	`+ efree(haystack_orig);`
	`1356`	`+ zval_ptr_dtor(haystack);`
	`1357`	`+ zval_ptr_dtor(needle);`
`1355`	`1358`	`RETURN_FALSE;`
`1356`	`1359`	`}`
`1357`	`1360`
`@@ -1372,6 +1375,8 @@ PHP_FUNCTION(stristr)`
`1372`	`1375`	`RETVAL_FALSE;`
`1373`	`1376`	`}`
`1374`	`1377`
	`1378`	`+ zval_ptr_dtor(haystack);`
	`1379`	`+ zval_ptr_dtor(needle);`
`1375`	`1380`	`efree(haystack_orig);`
`1376`	`1381`	`}`
`1377`	`1382`	`/* }}} */`