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

* p-lang.c (is_pascal_string_type): Avoid crashes on structures 

having fields without names.
This commit is contained in:
Pierre Muller 2010-10-14 15:18:54 +00:00
parent f8a5c26697
commit 5c3da5ea2e
2 changed files with 10 additions and 1 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-10-14 Pierre Muller <muller@ics.u-strasbg.fr>
* p-lang.c (is_pascal_string_type): Avoid crashes on structures
having fields without names.
2010-10-13 Tom Tromey <tromey@redhat.com>
* language.h (LA_PRINT_ARRAY_INDEX): Fix argument name.

6
gdb/p-lang.c
View File

@ -105,8 +105,10 @@ is_pascal_string_type (struct type *type,int *length_pos,
{
/* Old Borland type pascal strings from Free Pascal Compiler. */
/* Two fields: length and st. */
if (TYPE_NFIELDS (type) == 2
if (TYPE_NFIELDS (type) == 2
&& TYPE_FIELDS (type) [0].name
&& strcmp (TYPE_FIELDS (type)[0].name, "length") == 0
&& TYPE_FIELDS (type) [1].name
&& strcmp (TYPE_FIELDS (type)[1].name, "st") == 0)
{
if (length_pos)
@ -124,7 +126,9 @@ is_pascal_string_type (struct type *type,int *length_pos,
/* GNU pascal strings. */
/* Three fields: Capacity, length and schema$ or _p_schema. */
if (TYPE_NFIELDS (type) == 3
&& TYPE_FIELDS (type) [0].name
&& strcmp (TYPE_FIELDS (type)[0].name, "Capacity") == 0
&& TYPE_FIELDS (type) [1].name
&& strcmp (TYPE_FIELDS (type)[1].name, "length") == 0)
{
if (length_pos)