OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Jan Kratochvil 2010-05-28 18:23:15 +00:00
parent 7aa091969e
commit ca2a87a056
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2010-05-28 Jan Kratochvil <jan.kratochvil@redhat.com>
* linux-nat.c (linux_nat_core_of_thread_1): Fix crash on invalid
CONTENT.
2010-05-28 Jan Kratochvil <jan.kratochvil@redhat.com>
* linux-nat.c (linux_nat_wait_1): Do not call

5
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,8 @@
2010-05-28 Jan Kratochvil <jan.kratochvil@redhat.com>
* linux-low.c (linux_core_of_thread): Fix crash on invalid CONTENT.
New comment.
2010-05-26 Ozkan Sezer <sezeroz@gmail.com>
* gdbreplay.c (remote_open): Check error return from socket() call by

16
gdb/gdbserver/linux-low.c
View File

@ -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);

14
gdb/linux-nat.c
View File

@ -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);