Attachment 599581 Details for Bug 169857 – CVE-2012-3365-test.patch

[patch] CVE-2012-3365-test.patch

CVE-2012-3365-test.patch (text/plain), 2.20 KB, created by Svyatoslav Lempert on 2012-07-22 11:34:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Svyatoslav Lempert

Created: 2012-07-22 11:34:25 UTC

Size: 2.20 KB

patch

obsolete

>diff -Nru php52-backports/ext/pdo_sqlite/sqlite_driver.c php52-backports.sqlitetestfix/ext/pdo_sqlite/sqlite_driver.c
>--- php52-backports/ext/pdo_sqlite/sqlite_driver.c	2012-07-22 06:49:29.000000000 +0000
>+++ php52-backports.sqlitetestfix/ext/pdo_sqlite/sqlite_driver.c	2012-07-22 11:20:33.000000000 +0000
>@@ -642,7 +642,7 @@
> 
> 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) {
>diff -Nru php52-backports/ext/sqlite/sqlite.c php52-backports.sqlitetestfix/ext/sqlite/sqlite.c
>--- php52-backports/ext/sqlite/sqlite.c	2012-07-22 06:49:21.000000000 +0000
>+++ php52-backports.sqlitetestfix/ext/sqlite/sqlite.c	2012-07-22 11:18:33.000000000 +0000
>@@ -747,7 +747,7 @@
> 			return SQLITE_OK;
> #ifdef SQLITE_ATTACH
> 		case SQLITE_ATTACH:
>-			if (strncmp(arg3, ":memory:", sizeof(":memory:") - 1)) {
>+			if (memcmp(arg3, ":memory:", sizeof(":memory:")) && *arg3) {
> 				TSRMLS_FETCH();
> 				if (PG(safe_mode) && (!php_checkuid(arg3, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
> 					return SQLITE_DENY;
>@@ -1230,7 +1230,7 @@
> 		ZVAL_NULL(errmsg);
> 	}
> 
>-	if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
>+	if (memcmp(filename, ":memory:", sizeof(":memory:")) != 0) {
> 		/* resolve the fully-qualified path name to use as the hash key */
> 		if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
> 			RETURN_FALSE;
>@@ -1306,7 +1306,7 @@
> 		ZVAL_NULL(errmsg);
> 	}
> 
>-	if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
>+	if (memcmp(filename, ":memory:", sizeof(":memory:")) != 0) {
> 		/* resolve the fully-qualified path name to use as the hash key */
> 		if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
> 			php_std_error_handling();
>@@ -1358,7 +1358,7 @@
> 		ZVAL_NULL(errmsg);
> 	}
> 
>-	if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
>+	if (memcmp(filename, ":memory:", sizeof(":memory:")) != 0) {
> 		/* resolve the fully-qualified path name to use as the hash key */
> 		if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
> 			php_std_error_handling();

Actions: View | Diff

Attachments on bug 169857: 599581