cvs: ZendEngine2(PHP_5_3) / zend_ini.c /tests bug46811.phpt

bjori		Tue Dec  9 10:11:21 2008 UTC

  Added files:                 (Branch: PHP_5_3)
    /ZendEngine2/tests	bug46811.phpt 

  Modified files:              
    /ZendEngine2	zend_ini.c 
  Log:
  Fixed bug#46811 ini_set() doesn't return false on failure
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.c?r1=1.39.2.2.2.18.2.16&r2=1.39.2.2.2.18.2.17&diff_format=u
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.39.2.2.2.18.2.16 ZendEngine2/zend_ini.c:1.39.2.2.2.18.2.17
--- ZendEngine2/zend_ini.c:1.39.2.2.2.18.2.16	Mon Jul  7 21:50:56 2008
+++ ZendEngine2/zend_ini.c	Tue Dec  9 10:11:20 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ini.c,v 1.39.2.2.2.18.2.16 2008/07/07 21:50:56 scottmac Exp $ */
+/* $Id: zend_ini.c,v 1.39.2.2.2.18.2.17 2008/12/09 10:11:20 bjori Exp $ */
 
 #include "zend.h"
 #include "zend_qsort.h"
@@ -291,6 +291,7 @@
 		ini_entry->value_length = new_value_length;
 	} else {
 		efree(duplicate);
+		return FAILURE;
 	}
 
 	return SUCCESS;

http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug46811.phpt?view=markup&rev=1.1
Index: ZendEngine2/tests/bug46811.phpt
+++ ZendEngine2/tests/bug46811.phpt
--TEST--
ini_set() function
--INI--
arg_separator.output=&
--FILE--
<?php
var_dump(ini_set("arg_separator.output", ""));
var_dump(ini_get("arg_separator.output"));
?>
--EXPECT--
bool(false)
string(1) "&"