summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2004-03-06 19:06:12 +0000
committerIlia Alshanetsky <iliaa@php.net>2004-03-06 19:06:12 +0000
commitc3d0c735b862905b953cf98047fbe21d2f0051d2 (patch)
treea4b986a29a004731cbb611862930fc57229a4890
parent1a5342e46802f99d7064b84038e1023919aec13c (diff)
downloadphp-git-c3d0c735b862905b953cf98047fbe21d2f0051d2.tar.gz
MFH: Fixed bug #27460 (base64_decode() does not handle extra padding).
-rw-r--r--NEWS2
-rw-r--r--ext/standard/base64.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 74078c7e78..394816eb59 100644
--- 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 7243e6e0cd..760ec7842f 100644
--- 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;