Fixed bug #71221 (Null pointer deref (segfault) in get_defined_vars via ob_start)

10 years ago · 6700be67f5
3 changed files with 16 additions and 0 deletions
--- a/2
+++ b/2
@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2016 PHP 7.0.3

 - Core:
+  . Fixed bug #71221 (Null pointer deref (segfault) in get_defined_vars via
+    ob_start). (hugh at allthethings dot co dot nz)
  . Fixed bug #71201 (round() segfault on 64-bit builds). (Anatol)
  . Added support for new HTTP 451 code. (Julien)

--- a/Zend/tests/bug71221.phpt
+++ b/Zend/tests/bug71221.phpt
@ -0,0 +1,10 @@
+--TEST--
+Bug #71221 (Null pointer deref (segfault) in get_defined_vars via ob_start)
+--FILE--
+<?php 
+ob_start("get_defined_vars");
+ob_end_clean();
+?>
+okey
+--EXPECT--
+okey
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@ -1947,6 +1947,10 @@ ZEND_FUNCTION(get_defined_vars)
 {
 	zend_array *symbol_table = zend_rebuild_symbol_table();

+	if (UNEXPECTED(symbol_table == NULL)) {
+		return;
+	}
+
 	RETURN_ARR(zend_array_dup(symbol_table));
 }
 /* }}} */