tony2001 Wed May 21 12:01:55 2008 UTC
Modified files:
/php-src/ext/session mod_files.c
/php-src/ext/sysvmsg sysvmsg.c
Log:
use ZEND_U_CONVERTER() macro to prevent segfaults when the converter is not
set (i.e. NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.117&r2=1.118&diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.117
php-src/ext/session/mod_files.c:1.118
--- php-src/ext/session/mod_files.c:1.117 Mon Dec 31 07:12:14 2007
+++ php-src/ext/session/mod_files.c Wed May 21 12:01:55 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mod_files.c,v 1.117 2007/12/31 07:12:14 sebastian Exp $ */
+/* $Id: mod_files.c,v 1.118 2008/05/21 12:01:55 tony2001 Exp $ */
#include "php.h"
@@ -127,7 +127,7 @@
int newlen;
UErrorCode status = U_ZERO_ERROR;
- zend_convert_encodings(UG(filesystem_encoding_conv),
UG(utf8_conv), &newbuf, &newlen, buf, n, &status);
+
zend_convert_encodings(ZEND_U_CONVERTER(UG(filesystem_encoding_conv)),
UG(utf8_conv), &newbuf, &newlen, buf, n, &status);
if (status != U_ZERO_ERROR) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failure
converting savepath to local filesystem encoding, attempting to use utf8");
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.34&r2=1.35&diff_format=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.34 php-src/ext/sysvmsg/sysvmsg.c:1.35
--- php-src/ext/sysvmsg/sysvmsg.c:1.34 Mon Dec 31 07:12:17 2007
+++ php-src/ext/sysvmsg/sysvmsg.c Wed May 21 12:01:55 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvmsg.c,v 1.34 2007/12/31 07:12:17 sebastian Exp $ */
+/* $Id: sysvmsg.c,v 1.35 2008/05/21 12:01:55 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -137,7 +137,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "sysvmsg support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.34 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.35 $");
php_info_print_table_end();
}
/* }}} */
@@ -413,7 +413,7 @@
char *p = NULL;
switch (Z_TYPE_P(message)) {
case IS_UNICODE:
- if (SUCCESS !=
zend_unicode_to_string(UG(runtime_encoding_conv), &p, &message_len,
Z_USTRVAL_P(message), Z_USTRLEN_P(message) TSRMLS_CC)) {
+ if (SUCCESS !=
zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &p,
&message_len, Z_USTRVAL_P(message), Z_USTRLEN_P(message) TSRMLS_CC)) {
RETURN_FALSE;
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
