diff options
| author | Scott MacVicar <scottmac@php.net> | 2011-01-03 19:15:36 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2011-01-03 19:15:36 +0000 |
| commit | 9e0c423bc44b66b21f84854d9dcf46e9df0f3dca (patch) | |
| tree | 5eaa1eed781c8f92bc29238a0a354f7c653a8545 /ext/sqlite3/sqlite3.c | |
| parent | 3f5ad237e141752333b0c7788a03a311a9b2df60 (diff) | |
| download | php-git-9e0c423bc44b66b21f84854d9dcf46e9df0f3dca.tar.gz | |
Fix error with initialisation flag being set too early. If encryption is enabled and fails to decrypt a crash can occur.
Also fix a WS error.
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index ad7de1f325..2e13918a11 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -40,7 +40,7 @@ ZEND_DECLARE_MODULE_GLOBALS(sqlite3) static PHP_GINIT_FUNCTION(sqlite3); static int php_sqlite3_authorizer(void *autharg, int access_type, const char *arg3, const char *arg4, const char *arg5, const char *arg6); static void sqlite3_param_dtor(void *data); -static int php_sqlite3_compare_stmt_zval_free( php_sqlite3_free_list **free_list, zval *statement ); +static int php_sqlite3_compare_stmt_zval_free(php_sqlite3_free_list **free_list, zval *statement); /* {{{ Error Handler */ @@ -152,8 +152,6 @@ PHP_METHOD(sqlite3, open) return; } - db_obj->initialised = 1; - #if SQLITE_HAS_CODEC if (encryption_key_len > 0) { if (sqlite3_key(db_obj->db, encryption_key, encryption_key_len) != SQLITE_OK) { @@ -163,6 +161,8 @@ PHP_METHOD(sqlite3, open) } #endif + db_obj->initialised = 1; + #if PHP_API_VERSION < 20100412 if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) { #else |