diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 22563e5c40..6ec1704c41 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* server.c (handle_query): Correct length check.
+
 2008-02-14  Pedro Alves  <pedro_alves@portugalmail.pt>
 
 	* win32-low.c (do_initial_child_stuff): Add process handle
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index bcb440c21f..79bde643bd 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -649,7 +649,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
       char *mon = malloc (PBUFSIZ);
       int len = strlen (own_buf + 6);
 
-      if ((len % 1) != 0 || unhexify (mon, own_buf + 6, len / 2) != len / 2)
+      if ((len % 2) != 0 || unhexify (mon, own_buf + 6, len / 2) != len / 2)
 	{
 	  write_enn (own_buf);
 	  free (mon);