Browse Source

MFH: do not allow db without fields

experimental/5.2-WITH_DRCP
Antony Dovgal 19 years ago
parent
commit
fb3a3b72f1
  1. 5
      ext/dbase/dbase.c
  2. 4
      ext/dbase/tests/001.phpt

5
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));

4
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)

Loading…
Cancel
Save