diff options
| author | kusano <kusano@users.noreply.github.com> | 2016-02-17 01:00:58 +0900 |
|---|---|---|
| committer | kusano <kusano@users.noreply.github.com> | 2016-02-17 01:00:58 +0900 |
| commit | 07cae46b02795f8364d28ecad6ec45f507e7114b (patch) | |
| tree | 47795fa54a8cf014e918d8bfe3056e9b30ec9b0e /ext/sqlite3/sqlite3.c | |
| parent | d31e8a9a85efea54db0b647424f6c4485d71db8b (diff) | |
| parent | 3244d3c7e936b23ad33892e367500f64468c6140 (diff) | |
| download | php-git-07cae46b02795f8364d28ecad6ec45f507e7114b.tar.gz | |
Merge branch 'master' into fix-mt_rand
Conflicts:
ext/standard/rand.c
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 755934376b..6416d03e89 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -117,20 +117,13 @@ PHP_METHOD(sqlite3, open) if (strlen(filename) != filename_len) { return; } - if (memcmp(filename, ":memory:", sizeof(":memory:")) != 0) { + if (filename_len != sizeof(":memory:")-1 || + memcmp(filename, ":memory:", sizeof(":memory:")-1) != 0) { if (!(fullpath = expand_filepath(filename, NULL))) { zend_throw_exception(zend_ce_exception, "Unable to expand filepath", 0); return; } -#if PHP_API_VERSION < 20100412 - if (PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { - zend_throw_exception_ex(zend_ce_exception, 0, "safe_mode prohibits opening %s", fullpath); - efree(fullpath); - return; - } -#endif - if (php_check_open_basedir(fullpath)) { zend_throw_exception_ex(zend_ce_exception, 0, "open_basedir prohibits opening %s", fullpath); efree(fullpath); @@ -163,11 +156,7 @@ PHP_METHOD(sqlite3, open) db_obj->initialised = 1; -#if PHP_API_VERSION < 20100412 - if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) { -#else if (PG(open_basedir) && *PG(open_basedir)) { -#endif sqlite3_set_authorizer(db_obj->db, php_sqlite3_authorizer, NULL); } @@ -1980,13 +1969,6 @@ static int php_sqlite3_authorizer(void *autharg, int access_type, const char *ar case SQLITE_ATTACH: { if (memcmp(arg3, ":memory:", sizeof(":memory:")) && *arg3) { - -#if PHP_API_VERSION < 20100412 - if (PG(safe_mode) && (!php_checkuid(arg3, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { - return SQLITE_DENY; - } -#endif - if (php_check_open_basedir(arg3)) { return SQLITE_DENY; } |