moriyoshi Wed Nov 6 11:29:17 2002 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Fixed segfaults in case the specified encoding is not acceptable to iconv.
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.61 php4/ext/iconv/iconv.c:1.62
--- php4/ext/iconv/iconv.c:1.61 Wed Oct 30 14:21:56 2002
+++ php4/ext/iconv/iconv.c Wed Nov 6 11:29:16 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.61 2002/10/30 19:21:56 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.62 2002/11/06 16:29:16 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -251,8 +251,10 @@
if (cd == (iconv_t)(-1)) {
if (errno == EINVAL) {
+ *out = NULL;
return PHP_ICONV_ERR_WRONG_CHARSET;
} else {
+ *out = NULL;
return PHP_ICONV_ERR_CONVERTER;
}
}
@@ -263,11 +265,11 @@
out_buf = (char *) emalloc(bsz+1);
out_p = out_buf;
- while(in_left > 0) {
+ while (in_left > 0) {
result = icv(cd, (const char **) &in_p, &in_left, (char **) &out_p,
&out_left);
out_size = bsz - out_left;
- if( result == (size_t)(-1) ) {
- if( errno == E2BIG && in_left > 0 ) {
+ if (result == (size_t)(-1)) {
+ if (errno == E2BIG && in_left > 0) {
/* converted string is longer than out buffer */
bsz += in_len;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
