Fixed bug #52202 (CURLOPT_PRIVATE gets corrupted).

diff --git a/NEWS b/NEWS
index 2b136343d97789b986659ead5cdb0eb826bf4eb5..e33da9ecdf652141d8138c0777392053d2889f1e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@
 - Curl extension:
   . Fixed bug #52828 (curl_setopt does not accept persistent streams).
     (Gustavo, Ilia)
+  . Fixed bug #52202 (CURLOPT_PRIVATE gets corrupted). (Ilia)
 
 - DOM extension:
   . Fixed bug #52656 (DOMCdataSection does not work with splitText). (Ilia)

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 9e89fc34fac44837b030f802021c3464a32fb7ed..3f65a8ac14aced92af96bcb8a5ba94a7557726b2 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1252,7 +1252,6 @@ static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
 /* }}} */
 #endif
 
-#if LIBCURL_VERSION_NUM < 0x071101
 /* {{{ curl_free_string
  */
 static void curl_free_string(void **string)
@@ -1260,7 +1259,6 @@ static void curl_free_string(void **string)
        efree(*string);
 }
 /* }}} */
-#endif
 
 /* {{{ curl_free_post
  */
@@ -1337,9 +1335,7 @@ static void alloc_curl_handle(php_curl **ch)
 
        memset(&(*ch)->err, 0, sizeof((*ch)->err));
 
-#if LIBCURL_VERSION_NUM < 0x071101
        zend_llist_init(&(*ch)->to_free.str,   sizeof(char *),            (llist_dtor_func_t) curl_free_string, 0);
-#endif
        zend_llist_init(&(*ch)->to_free.slist, sizeof(struct curl_slist), (llist_dtor_func_t) curl_free_slist,  0);
        zend_llist_init(&(*ch)->to_free.post,  sizeof(struct HttpPost),   (llist_dtor_func_t) curl_free_post,   0);
 }
@@ -1556,11 +1552,10 @@ PHP_FUNCTION(curl_copy_handle)
        curl_easy_setopt(dupch->cp, CURLOPT_INFILE,            (void *) dupch);
        curl_easy_setopt(dupch->cp, CURLOPT_WRITEHEADER,       (void *) dupch);
 
-#if LIBCURL_VERSION_NUM < 0x071101
        zend_llist_copy(&dupch->to_free.str, &ch->to_free.str);
        /* Don't try to free copied strings, they're free'd when the original handle is destroyed */
        dupch->to_free.str.dtor = NULL;
-#endif
+
        zend_llist_copy(&dupch->to_free.slist, &ch->to_free.slist);
        zend_llist_copy(&dupch->to_free.post, &ch->to_free.post);
 
@@ -1742,14 +1737,22 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
                                        return 1;
                                }
                        } else {
+                               if (option == CURLOPT_PRIVATE) {
+                                       char *copystr;
+#if LIBCURL_VERSION_NUM < 0x071100
+string_copy:
+#endif
+                                       copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue));
+                                       error = curl_easy_setopt(ch->cp, option, copystr);
+                                       zend_llist_add_element(&ch->to_free.str, &copystr);
+                               } else {
 #if LIBCURL_VERSION_NUM >= 0x071100
-                               /* Strings passed to libcurl as ’char *’ arguments, are copied by the library... NOTE: before 7.17.0 strings were not copied. */
-                               error = curl_easy_setopt(ch->cp, option, Z_STRVAL_PP(zvalue));
-#else
-                               copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue));
-                               error = curl_easy_setopt(ch->cp, option, copystr);
-                               zend_llist_add_element(&ch->to_free.str, &copystr);
+                                       /* Strings passed to libcurl as ’char *’ arguments, are copied by the library... NOTE: before 7.17.0 strings were not copied. */
+                                       error = curl_easy_setopt(ch->cp, option, Z_STRVAL_PP(zvalue));
+#else                          
+                                       goto string_copy;                       
 #endif
+                               }
                        }
                        break;
                }
@@ -2456,9 +2459,7 @@ static void _php_curl_close_ex(php_curl *ch TSRMLS_DC)
        }
 
        curl_easy_cleanup(ch->cp);
-#if LIBCURL_VERSION_NUM < 0x071101
        zend_llist_clean(&ch->to_free.str);
-#endif
 
        /* cURL destructors should be invoked only by last curl handle */
        if (Z_REFCOUNT_P(ch->clone) <= 1) {

diff --git a/ext/curl/tests/bug52202.phpt b/ext/curl/tests/bug52202.phpt
new file mode 100644 (file)
index 0000000..a304d7f
--- /dev/null
+++ b/ext/curl/tests/bug52202.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #52202 (CURLOPT_PRIVATE gets clobbered)
+--SKIPIF--
+<?php
+if (!extension_loaded('curl')) exit("skip curl extension not loaded");
+?>
+--FILE--
+<?php
+$curl = curl_init("http://www.google.com");
+curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+curl_setopt($curl, CURLOPT_PRIVATE, "123");
+curl_exec($curl);
+
+var_dump(curl_getinfo($curl, CURLINFO_PRIVATE));
+--EXPECT--
+string(3) "123"