svn: /php/php-src/ branches/PHP_5_3/ext/phar/stream.c trunk/ext/phar/stream.c
| From: | Pierre Joye | Date: | Fri, 20 Aug 2010 16:37:33 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/phar/stream.c trunk/ext/phar/stream.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63342@lists.php.net to get a copy of this message | ||
pajoye Fri, 20 Aug 2010 16:37:33 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302565
Log:
- fix string validation, MOPS-2010-24
Changed paths:
U php/php-src/branches/PHP_5_3/ext/phar/stream.c
U php/php-src/trunk/ext/phar/stream.c
Modified: php/php-src/branches/PHP_5_3/ext/phar/stream.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/stream.c 2010-08-20 15:44:57 UTC (rev 302564)
+++ php/php-src/branches/PHP_5_3/ext/phar/stream.c 2010-08-20 16:37:33 UTC (rev 302565)
@@ -470,7 +470,7 @@
if (stream->mode[0] == 'w' || (stream->mode[0] == 'r' &&
stream->mode[1] == '+')) {
ret = phar_flush(((phar_entry_data *)stream->abstract)->phar, 0, 0, 0, &error
TSRMLS_CC);
if (error) {
- php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS TSRMLS_CC, error);
+ php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS TSRMLS_CC, "%s",
error);
efree(error);
}
return ret;
Modified: php/php-src/trunk/ext/phar/stream.c
===================================================================
--- php/php-src/trunk/ext/phar/stream.c 2010-08-20 15:44:57 UTC (rev 302564)
+++ php/php-src/trunk/ext/phar/stream.c 2010-08-20 16:37:33 UTC (rev 302565)
@@ -470,7 +470,7 @@
if (stream->mode[0] == 'w' || (stream->mode[0] == 'r' &&
stream->mode[1] == '+')) {
ret = phar_flush(((phar_entry_data *)stream->abstract)->phar, 0, 0, 0, &error
TSRMLS_CC);
if (error) {
- php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS TSRMLS_CC, error);
+ php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS TSRMLS_CC, "%s",
error);
efree(error);
}
return ret;