From: Antony Dovgal <tony2001@php.net>
Date: Wed, 16 May 2007 13:17:50 +0000 (+0000)
Subject: MFH: fix #41394 (dbase_create creates file with corrupted header)
X-Git-Tag: php-5.2.3RC1~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a10e5c0786d522ac0519624c7a028bc0cebbddb;p=php

MFH: fix #41394 (dbase_create creates file with corrupted header)
---

diff --git a/NEWS b/NEWS
index 9edc9b9536..0e1fae144a 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PHP                                                                        NEWS
 - Fixed segfault in strripos(). (Tony, Joxean Koret)
 - Fixed bug #41403 (json_decode cannot decode floats if localeconv 
   decimal_point is not '.'). (Tony)
+- Fixed bug #41394 (dbase_create creates file with corrupted header). (Tony)
 - Fixed bug #41390 (Clarify error message with invalid protocol scheme).
   (Scott)
 - Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in 
diff --git a/ext/dbase/dbf_head.c b/ext/dbase/dbf_head.c
index 0f9ad61461..33e3a425d7 100644
--- a/ext/dbase/dbf_head.c
+++ b/ext/dbase/dbf_head.c
@@ -184,7 +184,7 @@ int put_dbf_field(dbhead_t *dbh, dbfield_t *dbf)
 	/* build the on disk field info */
 	scp = dbf->db_fname; dcp = dbfield.dbf_name;
 
-	strlcpy(dbfield.dbf_name, dbf->db_fname, DBF_NAMELEN);
+	strlcpy(dbfield.dbf_name, dbf->db_fname, DBF_NAMELEN + 1);
 
 	dbfield.dbf_type = dbf->db_type;
 	switch (dbf->db_type) {
@@ -215,7 +215,7 @@ void put_dbf_info(dbhead_t *dbh)
 	int		fcnt;
 
 	if ((cp = db_cur_date(NULL))) {
-		strlcpy(dbh->db_date, cp, 8);
+		strlcpy(dbh->db_date, cp, 9);
 		free(cp);
 	}
 	put_dbf_head(dbh);