From c1b6e682ab8a42f040c3a664ad25080779efdf53 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 8 Feb 2007 14:20:56 +0000 Subject: [PATCH] * cp-valprint.c (cp_print_value_fields, cp_print_value): Always initialize tmp_obstack. * p-valprint.c (pascal_object_print_value_fields) (pascal_object_print_value): Likewise. --- gdb/ChangeLog | 8 ++++++++ gdb/cp-valprint.c | 7 +++---- gdb/p-valprint.c | 6 ++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2759f070d70..a2fe880051a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2007-02-08 Mark Kettenis + Daniel Jacobowitz + + * cp-valprint.c (cp_print_value_fields, cp_print_value): Always + initialize tmp_obstack. + * p-valprint.c (pascal_object_print_value_fields) + (pascal_object_print_value): Likewise. + 2007-02-08 Daniel Jacobowitz * features/feature_to_c.sh: Use %s to avoid problems with nawk. diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index b69ab2240eb..49f05609529 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -167,7 +167,6 @@ cp_print_value_fields (struct type *type, struct type *real_type, struct type **dont_print_vb,int dont_print_statmem) { int i, len, n_baseclasses; - struct obstack tmp_obstack; char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack); int fields_seen = 0; @@ -197,12 +196,13 @@ cp_print_value_fields (struct type *type, struct type *real_type, fprintf_filtered (stream, ""); else { + struct obstack tmp_obstack = dont_print_statmem_obstack; + if (dont_print_statmem == 0) { /* If we're at top level, carve out a completely fresh chunk of the obstack and use that until this particular invocation returns. */ - tmp_obstack = dont_print_statmem_obstack; obstack_finish (&dont_print_statmem_obstack); } @@ -426,9 +426,9 @@ cp_print_value (struct type *type, struct type *real_type, struct ui_file *stream, int format, int recurse, enum val_prettyprint pretty, struct type **dont_print_vb) { - struct obstack tmp_obstack; struct type **last_dont_print = (struct type **) obstack_next_free (&dont_print_vb_obstack); + struct obstack tmp_obstack = dont_print_vb_obstack; int i, n_baseclasses = TYPE_N_BASECLASSES (type); int thisoffset; struct type *thistype; @@ -438,7 +438,6 @@ cp_print_value (struct type *type, struct type *real_type, /* If we're at top level, carve out a completely fresh chunk of the obstack and use that until this particular invocation returns. */ - tmp_obstack = dont_print_vb_obstack; /* Bump up the high-water mark. Now alpha is omega. */ obstack_finish (&dont_print_vb_obstack); } diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c index 19556a4bcce..a383371ec3c 100644 --- a/gdb/p-valprint.c +++ b/gdb/p-valprint.c @@ -641,7 +641,6 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, int dont_print_statmem) { int i, len, n_baseclasses; - struct obstack tmp_obstack; char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack); CHECK_TYPEDEF (type); @@ -660,6 +659,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, fprintf_filtered (stream, ""); else { + struct obstack tmp_obstack = dont_print_statmem_obstack; int fields_seen = 0; if (dont_print_statmem == 0) @@ -667,7 +667,6 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, /* If we're at top level, carve out a completely fresh chunk of the obstack and use that until this particular invocation returns. */ - tmp_obstack = dont_print_statmem_obstack; obstack_finish (&dont_print_statmem_obstack); } @@ -810,9 +809,9 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr, enum val_prettyprint pretty, struct type **dont_print_vb) { - struct obstack tmp_obstack; struct type **last_dont_print = (struct type **) obstack_next_free (&dont_print_vb_obstack); + struct obstack tmp_obstack = dont_print_vb_obstack; int i, n_baseclasses = TYPE_N_BASECLASSES (type); if (dont_print_vb == 0) @@ -820,7 +819,6 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr, /* If we're at top level, carve out a completely fresh chunk of the obstack and use that until this particular invocation returns. */ - tmp_obstack = dont_print_vb_obstack; /* Bump up the high-water mark. Now alpha is omega. */ obstack_finish (&dont_print_vb_obstack); } -- 2.30.2