com php-src: fixed parse_url(): ext/standard/url.c

From: Date: Mon, 11 Nov 2013 11:49:57 +0000
Subject: com php-src: fixed parse_url(): ext/standard/url.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73934@lists.php.net to get a copy of this message
Commit: 2cbd452cfbaed840ad93ae24661dc56e34bde09b Author: Anatol Belski <ab@php.net> Mon, 11 Nov 2013 12:49:57 +0100 Parents: ebc2816318700995c255cebef55ade7e0cd7eeab Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2cbd452cfbaed840ad93ae24661dc56e34bde09b Log: fixed parse_url() Changed paths: M ext/standard/url.c Diff: diff --git a/ext/standard/url.c b/ext/standard/url.c index b8af28d..53f30ec 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -186,10 +186,10 @@ PHPAPI php_url *php_url_parse_ex(char const *str, zend_str_size_int length) } if (pp - p > 0 && pp - p < 6 && (*pp == '/' || *pp == '\0')) { - long port; + php_int_t port; memcpy(port_buf, p, (pp - p)); port_buf[pp - p] = '\0'; - port = strtol(port_buf, NULL, 10); + port = ZEND_STRTOL(port_buf, NULL, 10); if (port > 0 && port <= 65535) { ret->port = (unsigned short) port; } else { @@ -280,10 +280,10 @@ PHPAPI php_url *php_url_parse_ex(char const *str, zend_str_size_int length) efree(ret); return NULL; } else if (e - p > 0) { - long port; + php_int_t port; memcpy(port_buf, p, (e - p)); port_buf[e - p] = '\0'; - port = strtol(port_buf, NULL, 10); + port = ZEND_STRTOL(port_buf, NULL, 10); if (port > 0 && port <= 65535) { ret->port = (unsigned short)port; } else { @@ -416,7 +416,7 @@ PHP_FUNCTION(parse_url) if (resource->fragment != NULL) RETVAL_STRING(resource->fragment, 1); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL component identifier %ld", key); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL component identifier " ZEND_INT_FMT, key); RETVAL_FALSE; } goto done;

« previous php.cvs (#73934) next »