| Original patch from gentoo: gentoo/src/patchsets/gdb/6.8/80_all_gdb-6.5-dwarf-stack-overflow.patch |
| -= BEGIN original header =- |
| http://bugs.gentoo.org/144833 |
| |
| for gdb/ChangeLog: |
| 2006-08-22 Will Drewry <wad@google.com> |
| Tavis Ormandy <taviso@google.com> |
| |
| * dwarf2read.c (decode_locdesc): Enforce location description stack |
| boundaries. |
| * dwarfread.c (locval): Likewise. |
| |
| -= END original header =- |
| diff -durN gdb-6.8.orig/gdb/dwarf2read.c gdb-6.8/gdb/dwarf2read.c |
| --- gdb-6.8.orig/gdb/dwarf2read.c 2008-03-10 15:18:10.000000000 +0100 |
| +++ gdb-6.8/gdb/dwarf2read.c 2008-06-17 16:07:31.000000000 +0200 |
| @@ -9124,8 +9124,7 @@ |
| callers will only want a very basic result and this can become a |
| complaint. |
| |
| - Note that stack[0] is unused except as a default error return. |
| - Note that stack overflow is not yet handled. */ |
| + Note that stack[0] is unused except as a default error return. */ |
| |
| static CORE_ADDR |
| decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu) |
| @@ -9142,7 +9141,7 @@ |
| |
| i = 0; |
| stacki = 0; |
| - stack[stacki] = 0; |
| + stack[++stacki] = 0; |
| |
| while (i < size) |
| { |
| @@ -9324,6 +9323,16 @@ |
| dwarf_stack_op_name (op)); |
| return (stack[stacki]); |
| } |
| + /* Enforce maximum stack depth of size-1 to avoid ++stacki writing |
| + outside of the allocated space. Also enforce minimum > 0. |
| + -- wad@google.com 14 Aug 2006 */ |
| + if (stacki >= sizeof (stack) / sizeof (*stack) - 1) |
| + internal_error (__FILE__, __LINE__, |
| + _("location description stack too deep: %d"), |
| + stacki); |
| + if (stacki <= 0) |
| + internal_error (__FILE__, __LINE__, |
| + _("location description stack too shallow")); |
| } |
| return (stack[stacki]); |
| } |
