gdb/

	* linux-nat.c (linux_nat_core_of_thread_1): Fix crash on invalid
	CONTENT.

gdb/gdbserver/
	* linux-low.c (linux_core_of_thread): Fix crash on invalid CONTENT.
	New comment.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cf1b5851020990a3efd3de3c77a1a7a0fbd26e8d..83da1f4d5ef2cd8cb08f0a4c8f8e134269b06d2f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-28  Jan Kratochvil  <[email protected]>
+
+       * linux-nat.c (linux_nat_core_of_thread_1): Fix crash on invalid
+       CONTENT.
+
 2010-05-28  Jan Kratochvil  <[email protected]>
 
        * linux-nat.c (linux_nat_wait_1): Do not call

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index e9c960e9eba2d94c99d0d12725c0848d6ab335d3..16c5149210e1db2d38bdd1d6c644d4b7e106dfb9 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-28  Jan Kratochvil  <[email protected]>
+
+       * linux-low.c (linux_core_of_thread): Fix crash on invalid CONTENT.
+       New comment.
+
 2010-05-26  Ozkan Sezer  <[email protected]>
 
        * gdbreplay.c (remote_open): Check error return from socket() call by

diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 4a19db7400886757623238ea9bb62621bc383ab0..4db9711efa6592b4beab17d25ec360136abd767d 100644 (file)
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -4346,13 +4346,21 @@ linux_core_of_thread (ptid_t ptid)
     }
 
   p = strchr (content, '(');
-  p = strchr (p, ')') + 2; /* skip ")" and a whitespace. */
 
-  p = strtok_r (p, " ", &ts);
-  for (i = 0; i != 36; ++i)
+  /* Skip ")".  */
+  if (p != NULL)
+    p = strchr (p, ')');
+  if (p != NULL)
+    p++;
+
+  /* If the first field after program name has index 0, then core number is
+     the field with index 36.  There's no constant for that anywhere.  */
+  if (p != NULL)
+    p = strtok_r (p, " ", &ts);
+  for (i = 0; p != NULL && i != 36; ++i)
     p = strtok_r (NULL, " ", &ts);
 
-  if (sscanf (p, "%d", &core) == 0)
+  if (p == NULL || sscanf (p, "%d", &core) == 0)
     core = -1;
 
   free (content);

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index b0f79f108bd51fba57e640bec30675445bf4535e..43370f0f80c7beec9a4b93d70ae110efa0e726c6 100644 (file)
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -5509,15 +5509,21 @@ linux_nat_core_of_thread_1 (ptid_t ptid)
   make_cleanup (xfree, content);
 
   p = strchr (content, '(');
-  p = strchr (p, ')') + 2; /* skip ")" and a whitespace. */
+
+  /* Skip ")".  */
+  if (p != NULL)
+    p = strchr (p, ')');
+  if (p != NULL)
+    p++;
 
   /* If the first field after program name has index 0, then core number is
      the field with index 36.  There's no constant for that anywhere.  */
-  p = strtok_r (p, " ", &ts);
-  for (i = 0; i != 36; ++i)
+  if (p != NULL)
+    p = strtok_r (p, " ", &ts);
+  for (i = 0; p != NULL && i != 36; ++i)
     p = strtok_r (NULL, " ", &ts);
 
-  if (sscanf (p, "%d", &core) == 0)
+  if (p == NULL || sscanf (p, "%d", &core) == 0)
     core = -1;
 
   do_cleanups (back_to);