Avoid a crash in g_convert () if iconv_open () fails.

0ee4f2db · Zoltan Varga · 44d00f87 · 0ee4f2db
隐藏空白更改
内联并排

Showing with 4 addition and 2 deletion

eglib/src/gunicode.c eglib/src/gunicode.c +4 -2

未找到文件。
--- a/eglib/src/gunicode.c
+++ b/eglib/src/gunicode.c
@@ -217,8 +217,10 @@ g_convert (const gchar *str, gssize len,
 	
 	convertor = iconv_open (to_codeset, from_codeset);
 	if (convertor == (iconv_t) -1){
-		*bytes_written = 0;
-		*bytes_read = 0;
+		if (bytes_written)
+			*bytes_written = 0;
+		if (bytes_read)
+			*bytes_read = 0;
 		return NULL;
 	}