mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 02:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix error with initialisation flag being set too early. If encryption is enabled and fails to decrypt a crash can occur.

Browse Source 
Also fix a WS error.
This commit is contained in:
Scott MacVicar 2011-01-03 19:15:36 +00:00
parent 3f5ad237e1
commit 9e0c423bc4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/sqlite3/sqlite3.c
View File

@ -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