iliaa Wed Jun 6 22:04:05 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings unpack.phpt
Modified files:
/php-src/ext/standard pack.c
/php-src NEWS
Log:
Added missing format validator to unpack() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/pack.c?r1=1.57.2.5.2.4&r2=1.57.2.5.2.5&diff_format=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.57.2.5.2.4
php-src/ext/standard/pack.c:1.57.2.5.2.5
--- php-src/ext/standard/pack.c:1.57.2.5.2.4 Tue Apr 3 19:50:40 2007
+++ php-src/ext/standard/pack.c Wed Jun 6 22:04:04 2007
@@ -15,7 +15,7 @@
| Author: Chris Schneider <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: pack.c,v 1.57.2.5.2.4 2007/04/03 19:50:40 shire Exp $ */
+/* $Id: pack.c,v 1.57.2.5.2.5 2007/06/06 22:04:04 iliaa Exp $ */
#include "php.h"
@@ -635,6 +635,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 */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.765&r2=1.2027.2.547.2.766&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.765 php-src/NEWS:1.2027.2.547.2.766
--- php-src/NEWS:1.2027.2.547.2.765 Wed Jun 6 18:53:35 2007
+++ php-src/NEWS Wed Jun 6 22:04:05 2007
@@ -13,6 +13,7 @@
- Fixed size calculation in chunk_split() (Stas)
- Fixed integer overlow in str[c]spn() (Stas)
- Fixed UMR in money_format() (Stas, Ilia)
+- Added missing format validator to unpack() function (Ilia)
- Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory
already exists). (Pierre)
- Fixed bug #41608 (segfault on a weird code with objects and switch()).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/unpack.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/strings/unpack.phpt
+++ php-src/ext/standard/tests/strings/unpack.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php