restore missing check and prevent segfaulting

MFB and add test

diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c
index eb0e2e6e9436d4c4328b9e6e67933522021e43e1..1d38b15719c05e32a399d15f61eca4961f9e5cb6 100644 (file)
--- a/ext/dbase/dbase.c
+++ b/ext/dbase/dbase.c
@@ -573,6 +573,11 @@ PHP_FUNCTION(dbase_create)
        }
        convert_to_string_ex(filename);
 
+       if (Z_TYPE_PP(fields) != IS_ARRAY) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array as second parameter");
+               RETURN_FALSE;
+       }
+
        if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
                RETURN_FALSE;
        }
@@ -685,6 +690,8 @@ PHP_FUNCTION(dbase_create)
                        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;

diff --git a/ext/dbase/tests/001.phpt b/ext/dbase/tests/001.phpt
new file mode 100644 (file)
index 0000000..3fbb58e
--- /dev/null
+++ b/ext/dbase/tests/001.phpt
@@ -0,0 +1,65 @@
+--TEST--
+dbase_create() tests
+--SKIPIF--
+<?php if (!extension_loaded("dbase")) print "skip"; ?>
+--FILE--
+<?php
+
+function my_error_handler($errno, $errstr, $errfile, $errline) {
+       var_dump($errstr);
+}
+
+set_error_handler('my_error_handler');
+
+$fields_arr = Array(
+    Array(
+        array('date','D'),
+        ),
+    Array(
+        array('error', 'E'),
+        ),
+    Array(
+        array('error', -1),
+        ),
+    Array(
+        array(-1, 'N', 3, 0),
+        ),
+    Array(
+        array(),
+        ),
+    Array(
+        ),
+);
+
+$file = dirname(__FILE__).'/001.dbf';
+
+foreach ($fields_arr as $fields) {
+    var_dump(dbase_create($file, $fields));
+    @unlink($file);
+}
+
+var_dump(dbase_create($file, -1));
+@unlink($file);
+
+var_dump(dbase_create("", ""));
+
+echo "Done\n";
+?>
+--EXPECTF--    
+int(%d)
+string(38) "dbase_create(): unknown field type 'E'"
+bool(false)
+string(38) "dbase_create(): unknown field type '-'"
+bool(false)
+int(%d)
+string(71) "dbase_create(): expected field name as first element of list in field 0"
+bool(false)
+int(%d)
+string(67) "Argument 2 passed to dbase_create() must be an array, integer given"
+string(50) "dbase_create(): Expected array as second parameter"
+bool(false)
+string(%d) "unlink(%s001.dbf): No such file or directory"
+string(66) "Argument 2 passed to dbase_create() must be an array, string given"
+string(50) "dbase_create(): Expected array as second parameter"
+bool(false)
+Done