cvs: php-src(PHP_5_2) / NEWS /ext/dba/libinifile inifile.c

iliaa Thu Nov 13 18:22:23 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/dba/libinifile inifile.c /php-src NEWS Log: MFB: Fixed a bug inside dba_replace() that could cause file truncation with invalid keys http://cvs.php.net/viewvc.cgi/php-src/ext/dba/libinifile/inifile.c?r1=1.14.2.1.2.4&r2=1.14.2.1.2.5&diff_format=u Index: php-src/ext/dba/libinifile/inifile.c diff -u php-src/ext/dba/libinifile/inifile.c:1.14.2.1.2.4 php-src/ext/dba/libinifile/inifile.c:1.14.2.1.2.5 --- php-src/ext/dba/libinifile/inifile.c:1.14.2.1.2.4 Mon Dec 31 07:20:05 2007 +++ php-src/ext/dba/libinifile/inifile.c Thu Nov 13 18:22:23 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: inifile.c,v 1.14.2.1.2.4 2007/12/31 07:20:05 sebastian Exp $ */ +/* $Id: inifile.c,v 1.14.2.1.2.5 2008/11/13 18:22:23 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -43,7 +43,7 @@ /* {{{ inifile_version */ char *inifile_version() { - return "1.0, $Revision: 1.14.2.1.2.4 $"; + return "1.0, $Revision: 1.14.2.1.2.5 $"; } /* }}} */ @@ -508,7 +508,9 @@ /* 5 */ if (ret == SUCCESS) { - ret = inifile_truncate(dba, append ? pos_grp_next : pos_grp_start TSRMLS_CC); /* writes error on fail */ + if (!value || (key->name && strlen(key->name))) { + ret = inifile_truncate(dba, append ? pos_grp_next : pos_grp_start TSRMLS_CC); /* writes error on fail */ + } } if (ret == SUCCESS) { http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1313&r2=1.2027.2.547.2.1314&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1313 php-src/NEWS:1.2027.2.547.2.1314 --- php-src/NEWS:1.2027.2.547.2.1313 Wed Nov 12 12:01:29 2008 +++ php-src/NEWS Thu Nov 13 18:22:23 2008 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Nov 2008, PHP 5.2.7 - Fixed sybase_fetch_*() to continue reading after CS_ROW_FAIL status (Timm) +- Fixed a bug inside dba_replace() that could cause file truncation with + invalid keys. (Ilia) - Fixed bug #46543 (ibase_trans() memory leaks when using wrong parameters). (Felipe)