com php-src: base64_decode: fix bug #722 63 (skips char after padding): ext/standard /base64.c ext/standard/tests/strings/bug72263 .phpt

Commit: c1ac081bf1bdd8abb50e9a707bd4ea4a6389b735 Author: Lauri Kenttä <lauri.kentta@gmail.com> Wed, 25 May 2016 20:53:47 +0300 Committer: Nikita Popov <nikic@php.net> Thu, 7 Jul 2016 01:27:23 +0200 Parents: b9c9be13ccbf48c02ad01e19f4fce20c104a003e Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c1ac081bf1bdd8abb50e9a707bd4ea4a6389b735 Log: base64_decode: fix bug #72263 (skips char after padding) Bugs: https://bugs.php.net/72263 Changed paths: M ext/standard/base64.c A ext/standard/tests/strings/bug72263.phpt Diff: diff --git a/ext/standard/base64..c b/ext/standard/base64.c index 6c890e3..ea54815 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -157,8 +157,9 @@ PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length return NULL; } if (length > 0 && *current != '=' && strict) { - while (--length > 0 && isspace(*++current)) { - continue; + while (length > 0 && isspace(*current)) { + current++; + length--; } if (length == 0 || *current == '\0') { continue; diff --git a/ext/standard/tests/strings/bug72263.phpt b/ext/standard/tests/strings/bug72263.phpt new file mode 100644 index 0000000..d827af2 --- /dev/null +++ b/ext/standard/tests/strings/bug72263.phpt @@ -0,0 +1,13 @@ +--TEST-- +Bug #72263 (base64_decode skips a character after padding in strict mode) +--FILE-- +<?php +var_dump(base64_decode("*", true)); +var_dump(base64_decode("=*", true)); +var_dump(base64_decode("VVV=", true)); +var_dump(base64_decode("VVV=*", true)); +--EXPECT-- +bool(false) +bool(false) +string(2) "UU" +bool(false)