summaryrefslogtreecommitdiff
path: root/databases/php4-dba/files
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2009-03-24 17:02:45 +0000
committerPav Lucistnik <pav@FreeBSD.org>2009-03-24 17:02:45 +0000
commita85d0d86589932ed726ee4cc1d5c484e63d3a976 (patch)
tree608e889b937f3b9cf5390efe328b9466c532e618 /databases/php4-dba/files
parent- Add MAKE_JOBS_SAFE to support SMP compilation (diff)
- Fix bug when dba_replace() will truncate INI file when it was asked to
replace a 52 non-existent key. PR: ports/129459 Submitted by: Eygene Ryabinkin <rea-fbsd@codelabs.ru> Reviewed by: maintainer timeout (ale; 3 months) Security: http://www.securityfocus.com/archive/1/498746/30/0/threaded
Notes
Notes: svn path=/head/; revision=230878
Diffstat (limited to 'databases/php4-dba/files')
-rw-r--r--databases/php4-dba/files/patch-fix-dba_replace-truncation17
1 files changed, 17 insertions, 0 deletions
diff --git a/databases/php4-dba/files/patch-fix-dba_replace-truncation b/databases/php4-dba/files/patch-fix-dba_replace-truncation
new file mode 100644
index 000000000000..0f6dab4e5da7
--- /dev/null
+++ b/databases/php4-dba/files/patch-fix-dba_replace-truncation
@@ -0,0 +1,17 @@
+Patch that fixes dba_replace() file truncation issue
+
+Adopted from: http://cvs.php.net/viewvc.cgi/php-src/ext/dba/libinifile/inifile.c?r1=1.14.2.1.2.5&r2=1.14.2.1.2.4&view=patch
+
+--- libinifile/inifile.c 2007/12/31 07:20:05 1.14.2.1.2.4
++++ libinifile/inifile.c 2008/11/13 18:22:23 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) {