diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c731df2529ae..f3ff3d193dc9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-20  Xinliang David Li  <davidxl@google.com>
+
+	* dbgcnt.c (dbg_cnt_set_limit_by_name): Add length check.
+
 2009-07-20  Adam Nemet  <anemet@caviumnetworks.com>
 
 	* config/mips/mips.md (move_type): Add arith.
diff --git a/gcc/dbgcnt.c b/gcc/dbgcnt.c
index 859aabff9d90..0c496b308d69 100644
--- a/gcc/dbgcnt.c
+++ b/gcc/dbgcnt.c
@@ -82,7 +82,8 @@ dbg_cnt_set_limit_by_name (const char *name, int len, int value)
 {
   int i;
   for (i = debug_counter_number_of_counters - 1; i >= 0; i--)
-    if (!strncmp (map[i].name, name, len))
+    if (strncmp (map[i].name, name, len) == 0
+        && map[i].name[len] == '\0')
       break;
 
   if (i < 0)