- Removed unnecessary strlen() call and if statement.

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 0e4b4daa4b067ec1f345d683f26b94cac4c6ad30..7ee9b367d2a4eadba936609f6fc46c5e3f114db2 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1803,14 +1803,11 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
                                                char *type;
                                                ++postval;
 
-                                               if ((type = php_memnstr(postval, ";type=", sizeof(";type=") - 1, postval + strlen(postval)))) {
+                                               if ((type = php_memnstr(postval, ";type=", sizeof(";type=") - 1, postval + Z_STRLEN_PP(current)))) {
                                                        *type = '\0';
                                                }
                                                /* safe_mode / open_basedir check */
                                                if (php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(postval, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
-                                                       if (type) {
-                                                               *type = ';';
-                                                       }
                                                        RETVAL_FALSE;
                                                        return 1;
                                                }