diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2010-05-28 18:23:15 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2010-05-28 18:23:15 +0000 |
| commit | ca2a87a0560f483f519406377322ce8138f5432b (patch) | |
| tree | 30e24b31311555cd9fb10a2cd064dabc0491bc92 | |
| parent | 7aa091969e42137104101e96592fda46ffcd0e90 (diff) | |
| download | gdb-ca2a87a0560f483f519406377322ce8138f5432b.zip gdb-ca2a87a0560f483f519406377322ce8138f5432b.tar.gz gdb-ca2a87a0560f483f519406377322ce8138f5432b.tar.bz2 | |
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.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 16 | ||||
| -rw-r--r-- | gdb/linux-nat.c | 14 |
4 files changed, 32 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cf1b585..83da1f4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 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 linux_nat_core_of_thread_1 on TARGET_WAITKIND_EXITED or TARGET_WAITKIND_SIGNALLED. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index e9c960e..16c5149 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -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 diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 4a19db7..4db9711 100644 --- 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 b0f79f1..43370f0 100644 --- 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); |