diff options
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbserver/server.c | 15 |
2 files changed, 13 insertions, 8 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 0af0bb8..f050bfa 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2013-05-24 Pedro Alves <palves@redhat.com> + + * server.c (handle_v_cont) <vCont;r>: Use unpack_varlen_hex + instead of strchr/decode_address. Error if the range isn't split + with a ','. Don't assume there's be a ':' in the action. + 2013-05-23 Yao Qi <yao@codesourcery.com> Pedro Alves <palves@redhat.com> diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 1083aa9..d9daf84 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -2069,17 +2069,16 @@ handle_v_cont (char *own_buf) } else if (p[0] == 'r') { - char *p1; + ULONGEST addr; - p = p + 1; - p1 = strchr (p, ','); - decode_address (&resume_info[i].step_range_start, p, p1 - p); + p = unpack_varlen_hex (p + 1, &addr); + resume_info[i].step_range_start = addr; - p = p1 + 1; - p1 = strchr (p, ':'); - decode_address (&resume_info[i].step_range_end, p, p1 - p); + if (*p != ',') + goto err; - p = p1; + p = unpack_varlen_hex (p + 1, &addr); + resume_info[i].step_range_end = addr; } else { |