mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-22 19:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

- return correct hash constants

Browse Source 
- check for 'memory' in sqlite_factory() too (noticed by John Coggeshal)
This commit is contained in:
Marcus Boerger 2003-09-21 19:36:40 +00:00
parent 4f6874b3ff
commit 36655400cb
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/sqlite/sqlite.c
View File

@ -757,7 +757,7 @@ typedef struct _sqlite_object {
static int sqlite_free_persistent(list_entry *le, void *ptr TSRMLS_DC)
{
return le->ptr == ptr;
return le->ptr == ptr ? ZEND_HASH_APPLY_REMOVE : ZEND_HASH_APPLY_KEEP;
}
static void sqlite_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
@ -1172,14 +1172,16 @@ PHP_FUNCTION(sqlite_factory)
zval_dtor(errmsg);
}
if (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
php_std_error_handling();
RETURN_NULL();
}
if (php_check_open_basedir(filename TSRMLS_CC)) {
php_std_error_handling();
RETURN_NULL();
if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
if (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
php_std_error_handling();
RETURN_NULL();
}
if (php_check_open_basedir(filename TSRMLS_CC)) {
php_std_error_handling();
RETURN_NULL();
}
}
php_sqlite_open(filename, mode, NULL, return_value, errmsg, return_value TSRMLS_CC);