cvs: php-src(PHP_5_0) /ext/standard pack.c
| From: | Ilia Alshanetsky | Date: | Fri, 27 May 2005 02:03:27 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/standard pack.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32019@lists.php.net to get a copy of this message | ||
iliaa Thu May 26 22:03:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard pack.c
Log:
Fixed bug #33080 (missing MFH of a fix for bug #31465)
http://cvs.php.net/diff.php/php-src/ext/standard/pack.c?r1=1.52.2.3&r2=1.52.2.4&ty=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.52.2.3 php-src/ext/standard/pack.c:1.52.2.4
--- php-src/ext/standard/pack.c:1.52.2.3 Mon Mar 21 03:55:43 2005
+++ php-src/ext/standard/pack.c Thu May 26 22:03:27 2005
@@ -15,7 +15,7 @@
| Author: Chris Schneider <cschneid@relog.ch> |
+----------------------------------------------------------------------+
*/
-/* $Id: pack.c,v 1.52.2.3 2005/03/21 08:55:43 hyanantha Exp $ */
+/* $Id: pack.c,v 1.52.2.4 2005/05/27 02:03:27 iliaa Exp $ */
#include "php.h"
@@ -824,7 +824,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) {