summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/nkf/nkf-utf8/nkf.c10
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 80901b5c2f..392f3678f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 28 15:41:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
+ variables. fixed: [ruby-list:40445]
+
Tue Dec 28 15:25:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 5fa1956bf9..2db2500454 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -1303,6 +1303,10 @@ struct input_code * find_inputcode_byfunc(iconv_func)
return 0;
}
+#ifdef CHECK_OPTION
+static int (*iconv_for_check)() = 0;
+#endif
+
#ifdef ANSI_C_PROTOTYPE
void set_iconv(int f, int (*iconv_func)(int c2,int c1,int c0))
#else
@@ -1311,9 +1315,6 @@ void set_iconv(f, iconv_func)
int (*iconv_func)();
#endif
{
-#ifdef CHECK_OPTION
- static int (*iconv_for_check)() = 0;
-#endif
#ifdef INPUT_CODE_FIX
if (f || !input_f)
#endif
@@ -4292,6 +4293,9 @@ reinit()
broken_counter = 0;
broken_last = 0;
z_prev2=0,z_prev1=0;
+#ifdef CHECK_OPTION
+ iconv_for_check = 0;
+#endif
}
#endif