com php-src: fix explode(): ext/standard/string.c

From: Date: Sun, 10 Nov 2013 16:09:51 +0000
Subject: com php-src: fix explode(): ext/standard/string.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73922@lists.php.net to get a copy of this message
Commit: b7705365a2259aff84a14b316a9d9843200092c4 Author: Anatol Belski <ab@php.net> Sun, 10 Nov 2013 17:09:51 +0100 Parents: 3069b384e18d6d58f44f943203077cf5974eec39 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b7705365a2259aff84a14b316a9d9843200092c4 Log: fix explode() Changed paths: M ext/standard/string.c Diff: diff --git a/ext/standard/string.c b/ext/standard/string.c index aed2b0d..b93706b 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1050,7 +1050,7 @@ PHPAPI void php_explode_negative_limit(zval *delim, zval *str, zval *return_valu */ } else { zend_str_size allocated = EXPLODE_ALLOC_STEP, found = 0; - long i, to_return; + php_int_t i, to_return; char **positions = emalloc(allocated * sizeof(char *)); positions[found++] = p1; @@ -1082,7 +1082,7 @@ PHP_FUNCTION(explode) { char *str, *delim; zend_str_size str_len = 0, delim_len = 0; - php_int_t limit = PHP_SIZE_MAX_LONG; /* No limit */ + php_int_t limit = PHP_INT_MAX; /* No limit */ zval zdelim, zstr; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|i", &delim, &delim_len, &str, &str_len, &limit) == FAILURE) {

« previous php.cvs (#73922) next »