tony2001 Wed Jul 12 13:08:38 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/dbase/tests 001.phpt
Modified files:
/php-src/ext/dbase dbase.c
Log:
bailout on error and don't try to create fields of unknown type
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/dbase.c?r1=1.74.2.2.2.2&r2=1.74.2.2.2.3&diff_format=u
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.74.2.2.2.2
php-src/ext/dbase/dbase.c:1.74.2.2.2.3
--- php-src/ext/dbase/dbase.c:1.74.2.2.2.2 Thu Jun 15 15:31:54 2006
+++ php-src/ext/dbase/dbase.c Wed Jul 12 13:08:38 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbase.c,v 1.74.2.2.2.2 2006/06/15 15:31:54 bjori Exp $ */
+/* $Id: dbase.c,v 1.74.2.2.2.3 2006/07/12 13:08:38 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -713,6 +713,8 @@
break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown
field type '%c'", cur_f->db_type);
+ free_dbf_head(dbh);
+ RETURN_FALSE;
}
cur_f->db_foffset = rlen;
rlen += cur_f->db_flen;
http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/tests/001.phpt?view=markup&rev=1.1
Index: php-src/ext/dbase/tests/001.phpt
+++ php-src/ext/dbase/tests/001.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
