iliaa Wed Jun 6 22:04:47 2007 UTC
Modified files:
/php-src/ext/standard/tests/strings unpack.phpt
/php-src/ext/standard pack.c
Log:
MFB: Added missing format validator to unpack() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/unpack.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/unpack.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/unpack.phpt:1.2
--- /dev/null Wed Jun 6 22:04:47 2007
+++ php-src/ext/standard/tests/strings/unpack.phpt Wed Jun 6 22:04:46 2007
@@ -0,0 +1,11 @@
+--TEST--
+Invalid format type validation
+--FILE--
+<?php
+ var_dump(unpack("-2222", 1));
+ echo "Done\n";
+?>
+--EXPECTF--
+Warning: unpack(): Invalid format type - in %s/unpack.php on line %d
+bool(false)
+Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/pack.c?r1=1.67&r2=1.68&diff_format=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.67 php-src/ext/standard/pack.c:1.68
--- php-src/ext/standard/pack.c:1.67 Tue Apr 3 19:50:43 2007
+++ php-src/ext/standard/pack.c Wed Jun 6 22:04:47 2007
@@ -15,7 +15,7 @@
| Author: Chris Schneider <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: pack.c,v 1.67 2007/04/03 19:50:43 shire Exp $ */
+/* $Id: pack.c,v 1.68 2007/06/06 22:04:47 iliaa Exp $ */
#include "php.h"
@@ -613,6 +613,12 @@
case 'd':
size = sizeof(double);
break;
+
+ default:
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid format type %c", type);
+ zval_dtor(return_value);
+ RETURN_FALSE;
+ break;
}
/* Do actual unpacking */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
