archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

base64_decode: remove redundant check

Browse source 
If length == 0 || *current != '=' is false, the for loop will always
end up in this same point, until the if statement becomes true.
Thus, the if statement is not needed.
This commit is contained in:
Lauri Kenttä 2016-05-25 21:15:52 +03:00 • committed by Nikita Popov
parent c65de8ac13
commit ef6f163161
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/standard/base64.c
View file

@ -145,12 +145,13 @@ PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length
/* run through the whole string, converting as we go */
while (length-- > 0 && (ch = *current++) != '\0') {
if (ch == base64_pad) {
/* fail if the padding character is second in a group (like V===) */
/* FIXME: why do we still allow invalid padding in other places in the middle of the string? */
if (i % 4 == 1) {
if (length == 0 || *current != '=') {
zend_string_free(result);
return NULL;
}
} else if (length > 0 && *current != '=' && strict) {
zend_string_free(result);
return NULL;
}
if (length > 0 && *current != '=' && strict) {
while (--length > 0 && isspace(*++current)) {
continue;
}