From c1ac081bf1bdd8abb50e9a707bd4ea4a6389b735 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lauri=20Kentt=C3=A4?= <lauri.kentta@gmail.com>
Date: Wed, 25 May 2016 20:53:47 +0300
Subject: [PATCH] base64_decode: fix bug #72263 (skips char after padding)

---
 ext/standard/base64.c                    |  5 +++--
 ext/standard/tests/strings/bug72263.phpt | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 ext/standard/tests/strings/bug72263.phpt

diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index 6c890e34fc..ea548159c6 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 0000000000..d827af21ce
--- /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)
-- 
2.40.0