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

* server.c (handle_query) <qSupported>: Do two passes over the 

qSupported string to avoid nesting strtok.
This commit is contained in:
Pedro Alves 2010-06-01 12:47:33 +00:00
parent 46d00b8af1
commit d149dd1dab
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,8 @@
2010-06-01 Pedro Alves <pedro@codesourcery.com>
* server.c (handle_query) <qSupported>: Do two passes over the
qSupported string to avoid nesting strtok.
2010-05-28 Jan Kratochvil <jan.kratochvil@redhat.com>
* Makefile.in (SFILES): Add $(srcdir)/proc-service.list.

48
gdb/gdbserver/server.c
View File

@ -1346,20 +1346,40 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
feature will follow a ':', and latter features will follow
';'. */
if (*p == ':')
for (p = strtok (p + 1, ";");
p != NULL;
p = strtok (NULL, ";"))
{
if (strcmp (p, "multiprocess+") == 0)
{
/* GDB supports and wants multi-process support if
possible. */
if (target_supports_multi_process ())
multi_process = 1;
}
else
target_process_qsupported (p);
}
{
char **qsupported = NULL;
int count = 0;
int i;
/* Two passes, to avoid nested strtok calls in
target_process_qsupported. */
for (p = strtok (p + 1, ";");
p != NULL;
p = strtok (NULL, ";"))
{
count++;
qsupported = xrealloc (qsupported, count * sizeof (char *));
qsupported[count - 1] = xstrdup (p);
}
for (i = 0; i < count; i++)
{
p = qsupported[i];
if (strcmp (p, "multiprocess+") == 0)
{
/* GDB supports and wants multi-process support if
possible. */
if (target_supports_multi_process ())
multi_process = 1;
}
else
target_process_qsupported (p);
free (p);
}
free (qsupported);
}
sprintf (own_buf, "PacketSize=%x;QPassSignals+", PBUFSIZ - 1);