diff --git a/ChangeLog b/ChangeLog
index 877a7dff55..73ab994aa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 17 01:26:09 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (transcode_restartable0): in_pos and out_pos never be
+	  NULL, now.
+
 Fri Oct 17 00:39:19 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* lib/test/unit.rb: sort the order of executing tests.
diff --git a/transcode.c b/transcode.c
index 6ef3544469..5031d49989 100644
--- a/transcode.c
+++ b/transcode.c
@@ -437,19 +437,6 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos,
 
     unsigned char *out_p;
 
-    unsigned char empty_buf;
-    unsigned char *empty_ptr = &empty_buf;
-
-    if (!in_pos) {
-        in_pos = (const unsigned char **)&empty_ptr;
-        in_stop = empty_ptr;
-    }
-
-    if (!out_pos) {
-        out_pos = &empty_ptr;
-        out_stop = empty_ptr;
-    }
-
     in_p = inchar_start = *in_pos;
 
     out_p = *out_pos;