diff --git a/ChangeLog b/ChangeLog
index 2fe2d6f95c..148081ed3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Aug 30 16:38:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_enc_symname2_p): not depend on nul terminator.
+
 Sun Aug 30 14:11:45 2009  Tanaka Akira  <akr@fsij.org>
 
 	* common.mk: dependencies updated.
diff --git a/parse.y b/parse.y
index 9ebdaeb4b9..0906919b92 100644
--- a/parse.y
+++ b/parse.y
@@ -9351,7 +9351,7 @@ rb_enc_symname2_p(const char *name, int len, rb_encoding *enc)
 	}
 	break;
     }
-    return *m ? Qfalse : Qtrue;
+    return m == e;
 }
 
 static ID