[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard base64.c

[Marcus Boerger]

helly           Thu Dec  5 16:02:03 2002 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/standard  base64.c 
  Log:
  MFH: both the check and php_error in the comment
  
  
Index: php4/ext/standard/base64.c
diff -u php4/ext/standard/base64.c:1.33 php4/ext/standard/base64.c:1.33.4.1
--- php4/ext/standard/base64.c:1.33     Wed Aug 21 21:20:50 2002
+++ php4/ext/standard/base64.c  Thu Dec  5 16:02:02 2002
@@ -15,7 +15,7 @@
    | Author: Jim Winstead <[EMAIL PROTECTED]>                                  |
    +----------------------------------------------------------------------+
  */
-/* $Id: base64.c,v 1.33 2002/08/22 01:20:50 sniper Exp $ */
+/* $Id: base64.c,v 1.33.4.1 2002/12/05 21:02:02 helly Exp $ */
 
 #include <string.h>
 
@@ -119,7 +119,7 @@
                ch += 16;
        }
        sprintf(sp, "};");
-       php_error(E_NOTICE,"reverse_table:\n%s", s);
+       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Reverse_table:\n%s", s);
        efree(s);
 }
 */
@@ -140,7 +140,7 @@
        }
 
        /* run through the whole string, converting as we go */
-       while ((ch = *current++) != '\0') {
+       while ((ch = *current++) != '\0' && length-- > 0) {
                if (ch == base64_pad) break;
 
            /* When Base64 gets POSTed, all pluses are interpreted as spaces.



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php