From: Xinchen Hui <laruence@php.net>
Date: Sat, 5 May 2012 16:50:37 +0000 (+0800)
Subject: Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
X-Git-Tag: php-5.4.4RC1~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19632ae7dcdbbb7c34bf0ffde9fb7858f55424cd;p=php

Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
---

diff --git a/NEWS b/NEWS
index 9ef6abf66f..8b82237849 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ PHP                                                                        NEWS
     bug #61785 (Memory leak when access a non-exists file without router).
     (Laruence)
 
+- CURL:
+  . Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction).
+    (Laruence)
+
 - Core:
   . Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config).
     (Laruence)
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index b359952a8b..b03f346b59 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2177,7 +2177,7 @@ string_copy:
 
 			convert_to_string_ex(zvalue);
 
-			if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) {
+			if (!Z_STRLEN_PP(zvalue) || php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) {
 				RETVAL_FALSE;
 				return 1;
 			}