MFH: Fixed bug #27460 (base64_decode() does not handle extra padding).

diff --git a/NEWS b/NEWS
index 74078c7e785192c4512339676dd317f8a911ea87..394816eb59c0f0392f188c72574e6c9f8b93f601 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP 4                                                                      NEWS
   allocation functions. (Ilia)
 - Fixed bug #27505 (htmlentities() does not handle BIG5 correctly). (Ilia, 
   ywliu at hotmail dot com)
+- Fixed bug #27460 (base64_decode() does not handle extra padding).
+  (Ilia, naish at klanen dot net)
 - Fixed bug #27443 (defined() returns wrong type). (Derick)
 - Fixed bug #27437 (wrong freetype include inside GD library). (Ilia)
 - Fixed bug #27384 (unpack() misbehaves with 1 char string). (GeorgeS)

diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index 7243e6e0cdf4ef69fce7e4b1f9beefbb026f1785..760ec7842f8db872b15d334a9e5492a186ba62e6 100644 (file)
--- a/ext/standard/base64.c
+++ b/ext/standard/base64.c
@@ -188,7 +188,6 @@ PHPAPI unsigned char *php_base64_decode(const unsigned char *str, int length, in
        /* mop things up if we ended on a boundary */
        if (ch == base64_pad) {
                switch(i % 4) {
-               case 0:
                case 1:
                        efree(result);
                        return NULL;