Browse Source

Improve check for :memory: pseudo-filename in SQlite

PHP-5.3.15
Johannes Schlüter 14 years ago
parent
commit
055ecbc628
  1. 2
      ext/pdo_sqlite/sqlite_driver.c
  2. 4
      ext/sqlite3/sqlite3.c

2
ext/pdo_sqlite/sqlite_driver.c

@ -760,7 +760,7 @@ static struct pdo_dbh_methods sqlite_methods = {
static char *make_filename_safe(const char *filename TSRMLS_DC)
{
if (*filename && strncmp(filename, ":memory:", sizeof(":memory:")-1)) {
if (*filename && memcmp(filename, ":memory:", sizeof(":memory:"))) {
char *fullpath = expand_filepath(filename, NULL TSRMLS_CC);
if (!fullpath) {

4
ext/sqlite3/sqlite3.c

@ -117,7 +117,7 @@ PHP_METHOD(sqlite3, open)
if (strlen(filename) != filename_len) {
return;
}
if (strncmp(filename, ":memory:", 8) != 0) {
if (memcmp(filename, ":memory:", sizeof(":memory:")) != 0) {
if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Unable to expand filepath", 0 TSRMLS_CC);
return;
@ -1962,7 +1962,7 @@ static int php_sqlite3_authorizer(void *autharg, int access_type, const char *ar
switch (access_type) {
case SQLITE_ATTACH:
{
if (strncmp(arg3, ":memory:", sizeof(":memory:")-1) && *arg3) {
if (memcmp(arg3, ":memory:", sizeof(":memory:")) && *arg3) {
TSRMLS_FETCH();
#if PHP_API_VERSION < 20100412

Loading…
Cancel
Save