iliaa Wed Nov 22 17:30:35 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/dbase dbase.c
Log:
Fixed a possible crash in dbase_open() on empty filename.
http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/dbase.c?r1=1.74.2.2.2.5&r2=1.74.2.2.2.6&diff_format=u
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.74.2.2.2.5
php-src/ext/dbase/dbase.c:1.74.2.2.2.6
--- php-src/ext/dbase/dbase.c:1.74.2.2.2.5 Tue Oct 10 23:01:23 2006
+++ php-src/ext/dbase/dbase.c Wed Nov 22 17:30:34 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbase.c,v 1.74.2.2.2.5 2006/10/10 23:01:23 tony2001 Exp $ */
+/* $Id: dbase.c,v 1.74.2.2.2.6 2006/11/22 17:30:34 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -129,6 +129,11 @@
convert_to_string_ex(dbf_name);
convert_to_long_ex(options);
+ if (!Z_STRLEN_PP(dbf_name)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The filename
cannot be empty.");
+ RETURN_FALSE;
+ }
+
if (Z_LVAL_PP(options) == 1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot open %s in
write-only mode", Z_STRVAL_PP(dbf_name));
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
