MFH: do not allow db without fields

diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c
index 6c13bb6dccafe7ff0bd27f64afbcbde1baeff3af..eb1963e3f277e3764ac8c156f5dd5a3680edf3d0 100644 (file)
--- a/ext/dbase/dbase.c
+++ b/ext/dbase/dbase.c
@@ -621,6 +621,11 @@ PHP_FUNCTION(dbase_create)
 
        num_fields = zend_hash_num_elements(Z_ARRVAL_PP(fields));
 
+       if (num_fields <= 0) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create database without fields");
+               RETURN_FALSE;
+       }
+
        /* have to use regular malloc() because this gets free()d by
           code in the dbase library */
        dbh = (dbhead_t *)malloc(sizeof(dbhead_t));

diff --git a/ext/dbase/tests/001.phpt b/ext/dbase/tests/001.phpt
index 51a44887085885bbbab144a9d6059a0520f81084..7c10efb267d9ab906585bee6c1a92a826e3e2175 100644 (file)
--- a/ext/dbase/tests/001.phpt
+++ b/ext/dbase/tests/001.phpt
@@ -51,7 +51,9 @@ int(%d)
 
 Warning: dbase_create(): expected field name as first element of list in field 0 in %s on line %d
 bool(false)
-int(%d)
+
+Warning: dbase_create(): Unable to create database without fields in %s on line %d
+bool(false)
 
 Warning: dbase_create(): Expected array as second parameter in %s on line %d
 bool(false)