diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/server.c | 2 | ||||
| -rw-r--r-- | gdb/solib-target.c | 18 |
4 files changed, 25 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 55b7d4f0905..83845f4c809 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2015-06-10 Jan Kratochvil <jan.kratochvil@redhat.com> + + * solib-target.c (library_list_start_list): Do not dereference + variable version in its initialization. Make the VERSION check handle + NULL. + (library_list_attributes): Make "version" GDB_XML_AF_OPTIONAL. + 2015-06-10 Gary Benson <gbenson@redhat.com> * NEWS: Announce support for direct access of executable and diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 5c3e44f720e..5d5f0a435af 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2015-06-10 Jan Kratochvil <jan.kratochvil@redhat.com> + + * server.c (handle_qxfer_libraries): Set `version' attribute for + <library-list>. + 2015-06-10 Gary Benson <gbenson@redhat.com> * target.h (struct target_ops) <multifs_open>: New field. diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 70fbefbd65d..01b9c962635 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -1291,7 +1291,7 @@ handle_qxfer_libraries (const char *annex, if (document == NULL) return -1; - strcpy (document, "<library-list>\n"); + strcpy (document, "<library-list version=\"1.0\">\n"); p = document + strlen (document); for_each_inferior_with_data (&all_dlls, emit_dll_description, &p); diff --git a/gdb/solib-target.c b/gdb/solib-target.c index bd8f58ad8c7..891e5729ab1 100644 --- a/gdb/solib-target.c +++ b/gdb/solib-target.c @@ -146,12 +146,18 @@ library_list_start_list (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - char *version = xml_find_attribute (attributes, "version")->value; + struct gdb_xml_value *version = xml_find_attribute (attributes, "version"); - if (strcmp (version, "1.0") != 0) - gdb_xml_error (parser, - _("Library list has unsupported version \"%s\""), - version); + /* #FIXED attribute may be omitted, Expat returns NULL in such case. */ + if (version) + { + const char *string = version->value; + + if (strcmp (string, "1.0") != 0) + gdb_xml_error (parser, + _("Library list has unsupported version \"%s\""), + version); + } } /* Discard the constructed library list. */ @@ -210,7 +216,7 @@ static const struct gdb_xml_element library_list_children[] = { }; static const struct gdb_xml_attribute library_list_attributes[] = { - { "version", GDB_XML_AF_NONE, NULL, NULL }, + { "version", GDB_XML_AF_OPTIONAL, NULL, NULL }, { NULL, GDB_XML_AF_NONE, NULL, NULL } }; |