diff options
| author | siddhesh <siddhesh> | 2012-09-14 12:46:55 +0000 |
|---|---|---|
| committer | siddhesh <siddhesh> | 2012-09-14 12:46:55 +0000 |
| commit | 8314f8d6bb0c9ff33fa1b7af10d98cff44f19b27 (patch) | |
| tree | c1512b3d13a732babc6bc55d0bc0aee0ea8be47c | |
| parent | 4c8d1dadd40c73be3b6690a20a83465052743946 (diff) | |
| download | gdb-8314f8d6bb0c9ff33fa1b7af10d98cff44f19b27.tar.gz | |
* valarith.c (value_concat): Replace unsafe ALLOCA with
XMALLOC/XFREE.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/valarith.c | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ecf7d2286b7..beaa8c22587 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-09-14 Siddhesh Poyarekar <siddhesh@redhat.com> + + * valarith.c (value_concat): Replace unsafe ALLOCA with + XMALLOC/XFREE. + 2012-09-14 Pedro Alves <palves@redhat.com> * gdb.1 (SEE ALSO): Expand pointer to GDB's Texinfo manual. diff --git a/gdb/valarith.c b/gdb/valarith.c index 6858d2b6c64..c457f4a6309 100644 --- a/gdb/valarith.c +++ b/gdb/valarith.c @@ -668,9 +668,12 @@ value_concat (struct value *arg1, struct value *arg2) if (TYPE_CODE (type2) == TYPE_CODE_STRING || TYPE_CODE (type2) == TYPE_CODE_CHAR) { + struct cleanup *back_to; + count = longest_to_int (value_as_long (inval1)); inval2len = TYPE_LENGTH (type2); - ptr = (char *) alloca (count * inval2len); + ptr = (char *) xmalloc (count * inval2len); + back_to = make_cleanup (xfree, ptr); if (TYPE_CODE (type2) == TYPE_CODE_CHAR) { char_type = type2; @@ -693,6 +696,7 @@ value_concat (struct value *arg1, struct value *arg2) } } outval = value_string (ptr, count * inval2len, char_type); + do_cleanups (back_to); } else if (TYPE_CODE (type2) == TYPE_CODE_BOOL) { @@ -706,6 +710,8 @@ value_concat (struct value *arg1, struct value *arg2) else if (TYPE_CODE (type1) == TYPE_CODE_STRING || TYPE_CODE (type1) == TYPE_CODE_CHAR) { + struct cleanup *back_to; + /* We have two character strings to concatenate. */ if (TYPE_CODE (type2) != TYPE_CODE_STRING && TYPE_CODE (type2) != TYPE_CODE_CHAR) @@ -714,7 +720,8 @@ value_concat (struct value *arg1, struct value *arg2) } inval1len = TYPE_LENGTH (type1); inval2len = TYPE_LENGTH (type2); - ptr = (char *) alloca (inval1len + inval2len); + ptr = (char *) xmalloc (inval1len + inval2len); + back_to = make_cleanup (xfree, ptr); if (TYPE_CODE (type1) == TYPE_CODE_CHAR) { char_type = type1; @@ -737,6 +744,7 @@ value_concat (struct value *arg1, struct value *arg2) memcpy (ptr + inval1len, value_contents (inval2), inval2len); } outval = value_string (ptr, inval1len + inval2len, char_type); + do_cleanups (back_to); } else if (TYPE_CODE (type1) == TYPE_CODE_BOOL) { |