cvs: ZendEngine2 / zend_ini.c

jani            Thu Sep 27 16:28:39 2007 UTC

  Modified files:              
    /ZendEngine2        zend_ini.c 
  Log:
  MFB: Missing part of some fix (by Ilia)
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.c?r1=1.62&r2=1.63&diff_format=u
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.62 ZendEngine2/zend_ini.c:1.63
--- ZendEngine2/zend_ini.c:1.62 Thu Sep 27 15:52:56 2007
+++ ZendEngine2/zend_ini.c      Thu Sep 27 16:28:39 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ini.c,v 1.62 2007/09/27 15:52:56 jani Exp $ */
+/* $Id: zend_ini.c,v 1.63 2007/09/27 16:28:39 jani Exp $ */
 
 #include "zend.h"
 #include "zend_qsort.h"
@@ -55,7 +55,9 @@
                                ini_entry->on_modify(ini_entry, 
ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, 
ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
                        } zend_end_try();
                }
-               efree(ini_entry->value);
+               if (ini_entry->value != ini_entry->orig_value) {
+                       efree(ini_entry->value);
+               }
                ini_entry->value = ini_entry->orig_value;
                ini_entry->value_length = ini_entry->orig_value_length;
                ini_entry->modified = 0;

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php