iliaa Tue Jan 25 17:52:19 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard pack.c
Log:
MFH: Fixed bug #31465 (False warning in unpack() when working with *).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.818&r2=1.1247.2.819&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.818 php-src/NEWS:1.1247.2.819
--- php-src/NEWS:1.1247.2.818 Tue Jan 25 16:26:40 2005
+++ php-src/NEWS Tue Jan 25 17:52:18 2005
@@ -13,6 +13,7 @@
- Fixed bug #31580 (fgetcsv() problematic with "" escape sequences). (Ilia)
- Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia)
- Fixed bug #31479 (Fixed crash in chunk_split(), when chunklen > strlen).
(Ilia)
+- Fixed bug #31465 (False warning in unpack() when working with *). (Ilia)
- Fixed bug #31454 (session_set_save_handler crashes PHP when supplied
non-existent object ref). (Tony)
- Fixed bug #31444 (Memory leak in zend_language_scanner.c).
http://cvs.php.net/diff.php/php-src/ext/standard/pack.c?r1=1.40.2.6&r2=1.40.2.7&ty=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.40.2.6
php-src/ext/standard/pack.c:1.40.2.7
--- php-src/ext/standard/pack.c:1.40.2.6 Sun Nov 28 07:44:56 2004
+++ php-src/ext/standard/pack.c Tue Jan 25 17:52:19 2005
@@ -15,7 +15,7 @@
| Author: Chris Schneider <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: pack.c,v 1.40.2.6 2004/11/28 12:44:56 sesser Exp $ */
+/* $Id: pack.c,v 1.40.2.7 2005/01/25 22:52:19 iliaa Exp $ */
#include "php.h"
@@ -833,7 +833,9 @@
inputpos += size;
if (inputpos < 0) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Type %c: outside of string", type);
+ if (size != -1) { /* only print warning
if not working with * */
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Type %c: outside of string", type);
+ }
inputpos = 0;
}
} else if (arg < 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
