com php-src: Fixed substr(), but no kidding now.: ext/standard/string.c

From: Date: Wed, 16 Oct 2013 10:09:41 +0000
Subject: com php-src: Fixed substr(), but no kidding now.: ext/standard/string.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73487@lists.php.net to get a copy of this message
Commit: a61c753006d03db4cca2ec90b71b69a972ae1a5a Author: Anatol Belski <ab@php.net> Sat, 17 Aug 2013 10:10:15 -0700 Parents: 51ddf600fecfb66368583b6afe4cf85147625350 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a61c753006d03db4cca2ec90b71b69a972ae1a5a Log: Fixed substr(), but no kidding now. all the signed/unsigned arithmetic needs clear understanding Changed paths: M ext/standard/string.c Diff: diff --git a/ext/standard/string.c b/ext/standard/string.c index 5805ab9..ad83cb8 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2212,11 +2212,12 @@ PHP_FUNCTION(chunk_split) /* {{{ proto string substr(string str, int start [, int length]) Returns part of a string */ +/* XXX This function has to be revised when a better php integer type was integrated */ PHP_FUNCTION(substr) { char *str; php_int_t l = 0, f; - zend_str_size str_len; + zend_str_size_int str_len; int argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Si|i", &str, &str_len, &f, &l) == FAILURE) { @@ -2226,20 +2227,20 @@ PHP_FUNCTION(substr) if (argc > 2) { if ((l < 0 && -l > str_len)) { RETURN_FALSE; - } else if (l >= 0 && l > str_len) { + } else if (l > (long)str_len) { l = str_len; } } else { l = str_len; } - if (f > 0 && f > str_len) { + if (f > (long)str_len) { RETURN_FALSE; } else if (f < 0 && -f > str_len) { f = 0; } - if (l < 0 && ((f > 0 && (l + str_len) < f) || (f < 0 && (l+str_len) > -f))) { + if (l < 0 && (l + (long)str_len - f) < 0) { RETURN_FALSE; } @@ -2247,7 +2248,7 @@ PHP_FUNCTION(substr) * of the string */ if (f < 0) { - f = str_len + f; + f = (long)str_len + f; if (f < 0) { f = 0; } @@ -2257,17 +2258,17 @@ PHP_FUNCTION(substr) * needed to stop that many chars from the end of the string */ if (l < 0) { - l = (str_len - f) + l; + l = ((long)str_len - f) + l; if (l < 0) { l = 0; } } - if (f >= str_len) { + if (f >= (long)str_len) { RETURN_FALSE; } - if ((f + l) > str_len) { + if ((f + l) > (long)str_len) { l = str_len - f; }

« previous php.cvs (#73487) next »