sqlite2 v1.0.3 for PHP 5.4 (FreeBSD, Linux)

--- sqlite.c    2012-05-20 07:36:59.000000000 +0300
+++ sqlite.c    2012-05-20 08:47:46.000000000 +0300
@@ -526,7 +526,7 @@ const zend_function_entry sqlite_functio
    PHP_FE(sqlite_udf_encode_binary,    arginfo_sqlite_udf_encode_binary)
    PHP_FE(sqlite_udf_decode_binary,    arginfo_sqlite_udf_decode_binary)
    PHP_FE(sqlite_fetch_column_types,   arginfo_sqlite_fetch_column_types)
-   {NULL, NULL, NULL}
+   PHP_FE_END
 };

 const zend_function_entry sqlite_funcs_db[] = {
@@ -1066,10 +1066,6 @@ static int php_sqlite_authorizer(void *a
        case SQLITE_COPY:
            if (strncmp(arg4, ":memory:", sizeof(":memory:") - 1)) {
                TSRMLS_FETCH();
-               if (PG(safe_mode) && (!php_checkuid(arg4, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
-                   return SQLITE_DENY;
-               }
-
                if (php_check_open_basedir(arg4 TSRMLS_CC)) {
                    return SQLITE_DENY;
                }
@@ -1079,10 +1075,6 @@ static int php_sqlite_authorizer(void *a
        case SQLITE_ATTACH:
            if (strncmp(arg3, ":memory:", sizeof(":memory:") - 1)) {
                TSRMLS_FETCH();
-               if (PG(safe_mode) && (!php_checkuid(arg3, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
-                   return SQLITE_DENY;
-               }
-
                if (php_check_open_basedir(arg3 TSRMLS_CC)) {
                    return SQLITE_DENY;
                }
@@ -1166,7 +1158,7 @@ static void sqlite_object_new(zend_class
    memset(intern, 0, sizeof(sqlite_object));

    zend_object_std_init(&intern->std, class_type TSRMLS_CC);
-   zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+   object_properties_init(&intern->std, class_type);

    retval->handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) sqlite_object_free_storage, NULL TSRMLS_CC);
    retval->handlers = handlers;
@@ -1510,7 +1502,7 @@ static struct php_sqlite_db *php_sqlite_
    /* authorizer hook so we can enforce safe mode
     * Note: the declaration of php_sqlite_authorizer is correct for 2.8.2 of libsqlite,
     * and IS backwards binary compatible with earlier versions */
-   if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) {
+   if ((PG(open_basedir) && *PG(open_basedir))) {
        sqlite_set_authorizer(sdb, php_sqlite_authorizer, NULL);
    }

@@ -1569,8 +1561,7 @@ PHP_FUNCTION(sqlite_popen)
            RETURN_FALSE;
        }

-       if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
-               php_check_open_basedir(fullpath TSRMLS_CC)) {
+       if (php_check_open_basedir(fullpath TSRMLS_CC)) {
            efree(fullpath);
            RETURN_FALSE;
        }
@@ -1656,8 +1647,7 @@ PHP_FUNCTION(sqlite_open)
            }
        }

-       if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
-               php_check_open_basedir(fullpath TSRMLS_CC)) {
+       if (php_check_open_basedir(fullpath TSRMLS_CC)) {
            efree(fullpath);
            zend_restore_error_handling(&error_handling TSRMLS_CC);
            if (object) {
@@ -1688,7 +1678,7 @@ PHP_FUNCTION(sqlite_factory)
    zend_error_handling error_handling;

    zend_replace_error_handling(EH_THROW, sqlite_ce_exception, &error_handling TSRMLS_CC);
-   if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/",
+   if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|lz/",
                &filename, &filename_len, &mode, &errmsg)) {
        zend_restore_error_handling(&error_handling TSRMLS_CC);
        RETURN_NULL();
@@ -1710,8 +1700,7 @@ PHP_FUNCTION(sqlite_factory)
            RETURN_NULL();
        }

-       if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
-               php_check_open_basedir(fullpath TSRMLS_CC)) {
+       if (php_check_open_basedir(fullpath TSRMLS_CC)) {
            efree(fullpath);
            zend_restore_error_handling(&error_handling TSRMLS_CC);
            RETURN_NULL();