iliaa Fri, 26 Nov 2010 21:00:03 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305780
Log:
Missing bit from previous commit
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/base64.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/base64.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/base64.c 2010-11-26 20:59:13 UTC
(rev 305779)
+++ php/php-src/branches/PHP_5_3/ext/standard/base64.c 2010-11-26 21:00:03 UTC
(rev 305780)
@@ -152,7 +152,7 @@
/* run through the whole string, converting as we go */
while ((ch = *current++) != '\0' && length-- > 0) {
if (ch == base64_pad) {
- if (*current != '=' && (i % 4) == 1) {
+ if (*current != '=' && ((i % 4) == 1 || (strict &&
length > 0))) {
efree(result);
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
