From: Nikita Popov <nikic@php.net>
Date: Sat, 13 Feb 2016 17:03:06 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.4RC1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30d5432bfe2b44819cd01b47a8687912e1091e9d;p=php

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	ext/sqlite3/sqlite3.c
---

30d5432bfe2b44819cd01b47a8687912e1091e9d
diff --cc ext/sqlite3/sqlite3.c
index 6f2656ab51,ce9472a714..912cc9cb2d
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@@ -117,9 -123,10 +117,10 @@@ 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 TSRMLS_CC))) {
 -			zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Unable to expand filepath", 0 TSRMLS_CC);
 +		if (!(fullpath = expand_filepath(filename, NULL))) {
 +			zend_throw_exception(zend_ce_exception, "Unable to expand filepath", 0);
  			return;
  		}