X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Funwind-ia64.c;h=f6f73ce83ea895fa95a64b9cc0b05e8d7eeb7c53;hb=2480b6fa946bb2d2dc993b1c4a83a8e1258a75e8;hp=5dcd2a786162ed1b2d702b4cfcede23f3b529b4b;hpb=9f66665ac58ef8ccb2644ceaf7d2f7fefab9f7e6;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/unwind-ia64.c b/binutils/unwind-ia64.c index 5dcd2a7861..f6f73ce83e 100644 --- a/binutils/unwind-ia64.c +++ b/binutils/unwind-ia64.c @@ -1,31 +1,33 @@ /* unwind-ia64.c -- utility routines to dump IA-64 unwind info for readelf. - Copyright 2000, 2001 Free Software Foundation, Inc. - Contributed by David Mosberger-Tang + Copyright (C) 2000-2019 Free Software Foundation, Inc. -This file is part of GNU Binutils. + Contributed by David Mosberger-Tang -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + This file is part of GNU Binutils. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ + +#include "config.h" +#include "sysdep.h" #include "unwind-ia64.h" -#include -#include #if __GNUC__ >= 2 /* Define BFD64 here, even if our default architecture is 32 bit ELF as this will allow us to read in and parse 64bit and 32bit ELF files. - Only do this if we belive that the compiler can support a 64 bit + Only do this if we believe that the compiler can support a 64 bit data type. For now we only rely on GCC being able to do this. */ #define BFD64 #endif @@ -33,26 +35,27 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ static bfd_vma unw_rlen = 0; -static void unw_print_brmask PARAMS ((char *, unsigned int)); -static void unw_print_grmask PARAMS ((char *, unsigned int)); -static void unw_print_frmask PARAMS ((char *, unsigned int)); -static void unw_print_abreg PARAMS ((char *, unsigned int)); -static void unw_print_xyreg PARAMS ((char *, unsigned int, unsigned int)); +static void unw_print_brmask (char *, unsigned int); +static void unw_print_grmask (char *, unsigned int); +static void unw_print_frmask (char *, unsigned int); +static void unw_print_abreg (char *, unsigned int); +static void unw_print_xyreg (char *, unsigned int, unsigned int); static void -unw_print_brmask (cp, mask) - char * cp; - unsigned int mask; +unw_print_brmask (char *cp, unsigned int mask) { - char *sep = ""; + int sep = 0; int i; for (i = 0; mask && (i < 5); ++i) { if (mask & 1) { - cp += sprintf (cp, "%sb%u", sep, i + 1); - sep = ","; + if (sep) + *cp++ = ','; + *cp++ = 'b'; + *cp++ = i + 1 + '0'; + sep = 1; } mask >>= 1; } @@ -60,51 +63,57 @@ unw_print_brmask (cp, mask) } static void -unw_print_grmask (cp, mask) - char * cp; - unsigned int mask; +unw_print_grmask (char *cp, unsigned int mask) { - char *sep = ""; + int sep = 0; int i; - *cp = '\0'; for (i = 0; i < 4; ++i) { if (mask & 1) { - cp += sprintf (cp, "%sr%u", sep, i + 4); - sep = ","; + if (sep) + *cp++ = ','; + *cp++ = 'r'; + *cp++ = i + 4 + '0'; + sep = 1; } mask >>= 1; } + *cp = '\0'; } static void -unw_print_frmask (cp, mask) - char * cp; - unsigned int mask; +unw_print_frmask (char *cp, unsigned int mask) { - char *sep = ""; + int sep = 0; int i; - *cp = '\0'; for (i = 0; i < 20; ++i) { if (mask & 1) { - cp += sprintf (cp, "%sf%u", sep, (i < 4) ? (i + 2) : (i + 12)); - sep = ","; + if (sep) + *cp++ = ','; + *cp++ = 'f'; + if (i < 4) + *cp++ = i + 2 + '0'; + else + { + *cp++ = (i + 2) / 10 + 1 + '0'; + *cp++ = (i + 2) % 10 + '0'; + } + sep = 1; } mask >>= 1; } + *cp = '\0'; } static void -unw_print_abreg (cp, abreg) - char * cp; - unsigned int abreg; +unw_print_abreg (char *cp, unsigned int abreg) { - static const char *special_reg[16] = + static const char * const special_reg[16] = { "pr", "psp", "@priunat", "rp", "ar.bsp", "ar.bspstore", "ar.rnat", "ar.unat", "ar.fpsr", "ar.pfs", "ar.lc", @@ -132,10 +141,7 @@ unw_print_abreg (cp, abreg) } static void -unw_print_xyreg (cp, x, ytreg) - char * cp; - unsigned int x; - unsigned int ytreg; +unw_print_xyreg (char *cp, unsigned int x, unsigned int ytreg) { switch ((x << 1) | ((ytreg >> 7) & 1)) { @@ -167,7 +173,7 @@ unw_print_xyreg (cp, x, ytreg) typedef bfd_vma unw_word; #define UNW_DEC_BAD_CODE(code) \ - printf ("Unknown code 0x%02x\n", code) + printf (_("Unknown code 0x%02x\n"), code) #define UNW_DEC_PROLOGUE(fmt, body, rlen, arg) \ do \ @@ -237,13 +243,13 @@ typedef bfd_vma unw_word; } \ while (0) -#define UNW_DEC_FRGR_MEM(fmt, grmask, frmask, arg) \ +#define UNW_DEC_FRGR_MEM(fmt, grmask, frmask, arg) \ do \ - { \ + { \ char frstr[200], grstr[20]; \ - \ - unw_print_grmask (grstr, grmask); \ - unw_print_frmask (frstr, frmask); \ + \ + unw_print_grmask (grstr, grmask); \ + unw_print_frmask (frstr, frmask); \ printf ("\t%s:frgr_mem(grmask=[%s],frmask=[%s])\n", fmt, grstr, frstr); \ } \ while (0) @@ -298,7 +304,7 @@ typedef bfd_vma unw_word; #define UNW_DEC_ABI(fmt, abi, context, arg) \ do \ { \ - static const char *abiname[] = \ + static const char * const abiname[] = \ { \ "@svr4", "@hpux", "@nt" \ }; \ @@ -342,14 +348,22 @@ typedef bfd_vma unw_word; printf ("\t%s:spill_base(pspoff=0x10-0x%lx)\n", \ fmt, 4*(unsigned long)pspoff) -#define UNW_DEC_SPILL_MASK(fmt, dp, arg) \ - do \ - { \ - static const char * spill_type = "-frb"; \ - unsigned const char * imaskp = dp; \ - unsigned char mask = 0; \ - bfd_vma insn = 0; \ - \ +#define UNW_DEC_SPILL_MASK(fmt, dp, arg, end) \ + do \ + { \ + static const char *spill_type = "-frb"; \ + unsigned const char *imaskp = dp; \ + unsigned char mask = 0; \ + bfd_vma insn = 0; \ + \ + /* PR 18420. */ \ + if ((dp + (unw_rlen / 4)) > end) \ + { \ + printf (_("\nERROR: unwind length too long (0x%lx > 0x%lx)\n\n"), \ + (long) (unw_rlen / 4), (long)(end - dp)); \ + /* FIXME: Should we reset unw_rlen ? */ \ + break; \ + } \ printf ("\t%s:spill_mask(imask=[", fmt); \ for (insn = 0; insn < unw_rlen; ++insn) \ { \ @@ -367,7 +381,7 @@ typedef bfd_vma unw_word; #define UNW_DEC_SPILL_SPREL(fmt, t, abreg, spoff, arg) \ do \ { \ - char regname[10]; \ + char regname[20]; \ \ unw_print_abreg (regname, abreg); \ printf ("\t%s:spill_sprel(reg=%s,t=%lu,spoff=0x%lx)\n", \ @@ -375,13 +389,13 @@ typedef bfd_vma unw_word; } \ while (0) -#define UNW_DEC_SPILL_PSPREL(fmt, t, abreg, pspoff, arg) \ +#define UNW_DEC_SPILL_PSPREL(fmt, t, abreg, pspoff, arg) \ do \ - { \ - char regname[10]; \ - \ - unw_print_abreg (regname, abreg); \ - printf ("\t%s:spill_psprel(reg=%s,t=%lu,pspoff=0x10-0x%lx)\n", \ + { \ + char regname[20]; \ + \ + unw_print_abreg (regname, abreg); \ + printf ("\t%s:spill_psprel(reg=%s,t=%lu,pspoff=0x10-0x%lx)\n", \ fmt, regname, (unsigned long) t, 4*(unsigned long)pspoff); \ } \ while (0) @@ -389,7 +403,7 @@ typedef bfd_vma unw_word; #define UNW_DEC_RESTORE(fmt, t, abreg, arg) \ do \ { \ - char regname[10]; \ + char regname[20]; \ \ unw_print_abreg (regname, abreg); \ printf ("\t%s:restore(t=%lu,reg=%s)\n", \ @@ -400,7 +414,7 @@ typedef bfd_vma unw_word; #define UNW_DEC_SPILL_REG(fmt, t, abreg, x, ytreg, arg) \ do \ { \ - char abregname[10], tregname[10]; \ + char abregname[20], tregname[20]; \ \ unw_print_abreg (abregname, abreg); \ unw_print_xyreg (tregname, x, ytreg); \ @@ -409,12 +423,12 @@ typedef bfd_vma unw_word; } \ while (0) -#define UNW_DEC_SPILL_SPREL_P(fmt, qp, t, abreg, spoff, arg) \ +#define UNW_DEC_SPILL_SPREL_P(fmt, qp, t, abreg, spoff, arg) \ do \ - { \ - char regname[20]; \ - \ - unw_print_abreg (regname, abreg); \ + { \ + char regname[20]; \ + \ + unw_print_abreg (regname, abreg); \ printf ("\t%s:spill_sprel_p(qp=p%u,t=%lu,reg=%s,spoff=0x%lx)\n", \ fmt, qp, (unsigned long) t, regname, 4 * (unsigned long)spoff); \ } \ @@ -526,45 +540,14 @@ typedef bfd_vma unw_word; * UNW_DEC_SPILL_SPREL_P(fmt,qp,t,abreg,pspoff,arg) */ -static unw_word unw_decode_uleb128 PARAMS ((const unsigned char **)); -static const unsigned char *unw_decode_x1 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_x2 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_x3 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_x4 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_r1 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_r2 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_r3 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_p1 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_p2_p5 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_p6 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_p7_p10 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_b1 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_b2 PARAMS ((const unsigned char *, - unsigned int, void *)); -static const unsigned char *unw_decode_b3_x4 PARAMS ((const unsigned char *, - unsigned int, void *)); - static unw_word -unw_decode_uleb128 (dpp) - const unsigned char **dpp; +unw_decode_uleb128 (const unsigned char **dpp, const unsigned char * end) { unsigned shift = 0; unw_word byte, result = 0; const unsigned char *bp = *dpp; - while (1) + while (bp < end) { byte = *bp++; result |= (byte & 0x7f) << shift; @@ -581,17 +564,21 @@ unw_decode_uleb128 (dpp) } static const unsigned char * -unw_decode_x1 (dp, code, arg) - const unsigned char * dp; - unsigned int code ATTRIBUTE_UNUSED; - void * arg ATTRIBUTE_UNUSED; +unw_decode_x1 (const unsigned char *dp, unsigned int code ATTRIBUTE_UNUSED, + void *arg ATTRIBUTE_UNUSED, const unsigned char * end) { unsigned char byte1, abreg; unw_word t, off; + if ((end - dp) < 3) + { + printf (_("\t\n")); + return end; + } + byte1 = *dp++; - t = unw_decode_uleb128 (&dp); - off = unw_decode_uleb128 (&dp); + t = unw_decode_uleb128 (&dp, end); + off = unw_decode_uleb128 (&dp, end); abreg = (byte1 & 0x7f); if (byte1 & 0x80) UNW_DEC_SPILL_SPREL ("X1", t, abreg, off, arg); @@ -601,17 +588,21 @@ unw_decode_x1 (dp, code, arg) } static const unsigned char * -unw_decode_x2 (dp, code, arg) - const unsigned char * dp; - unsigned int code ATTRIBUTE_UNUSED; - void * arg ATTRIBUTE_UNUSED; +unw_decode_x2 (const unsigned char *dp, unsigned int code ATTRIBUTE_UNUSED, + void *arg ATTRIBUTE_UNUSED, const unsigned char * end) { unsigned char byte1, byte2, abreg, x, ytreg; unw_word t; + if ((end - dp) < 3) + { + printf (_("\t\n")); + return end; + } + byte1 = *dp++; byte2 = *dp++; - t = unw_decode_uleb128 (&dp); + t = unw_decode_uleb128 (&dp, end); abreg = (byte1 & 0x7f); ytreg = byte2; x = (byte1 >> 7) & 1; @@ -623,18 +614,22 @@ unw_decode_x2 (dp, code, arg) } static const unsigned char * -unw_decode_x3 (dp, code, arg) - const unsigned char * dp; - unsigned int code ATTRIBUTE_UNUSED; - void * arg ATTRIBUTE_UNUSED; +unw_decode_x3 (const unsigned char *dp, unsigned int code ATTRIBUTE_UNUSED, + void *arg ATTRIBUTE_UNUSED, const unsigned char * end) { unsigned char byte1, byte2, abreg, qp; unw_word t, off; + if ((end - dp) < 4) + { + printf (_("\t\n")); + return end; + } + byte1 = *dp++; byte2 = *dp++; - t = unw_decode_uleb128 (&dp); - off = unw_decode_uleb128 (&dp); + t = unw_decode_uleb128 (&dp, end); + off = unw_decode_uleb128 (&dp, end); qp = (byte1 & 0x3f); abreg = (byte2 & 0x7f); @@ -647,18 +642,22 @@ unw_decode_x3 (dp, code, arg) } static const unsigned char * -unw_decode_x4 (dp, code, arg) - const unsigned char * dp; - unsigned int code ATTRIBUTE_UNUSED; - void * arg ATTRIBUTE_UNUSED; +unw_decode_x4 (const unsigned char *dp, unsigned int code ATTRIBUTE_UNUSED, + void *arg ATTRIBUTE_UNUSED, const unsigned char * end) { unsigned char byte1, byte2, byte3, qp, abreg, x, ytreg; unw_word t; + if ((end - dp) < 4) + { + printf (_("\t\n")); + return end; + } + byte1 = *dp++; byte2 = *dp++; byte3 = *dp++; - t = unw_decode_uleb128 (&dp); + t = unw_decode_uleb128 (&dp, end); qp = (byte1 & 0x3f); abreg = (byte2 & 0x7f); @@ -673,10 +672,8 @@ unw_decode_x4 (dp, code, arg) } static const unsigned char * -unw_decode_r1 (dp, code, arg) - const unsigned char *dp; - unsigned int code; - void *arg; +unw_decode_r1 (const unsigned char *dp, unsigned int code, void *arg, + const unsigned char * end ATTRIBUTE_UNUSED) { int body = (code & 0x20) != 0; unw_word rlen; @@ -687,41 +684,42 @@ unw_decode_r1 (dp, code, arg) } static const unsigned char * -unw_decode_r2 (dp, code, arg) - const unsigned char *dp; - unsigned int code; - void *arg; +unw_decode_r2 (const unsigned char *dp, unsigned int code, void *arg, + const unsigned char * end) { unsigned char byte1, mask, grsave; unw_word rlen; + if ((end - dp) < 2) + { + printf (_("\t\n")); + return end; + } + byte1 = *dp++; mask = ((code & 0x7) << 1) | ((byte1 >> 7) & 1); grsave = (byte1 & 0x7f); - rlen = unw_decode_uleb128 (& dp); + rlen = unw_decode_uleb128 (& dp, end); UNW_DEC_PROLOGUE_GR ("R2", rlen, mask, grsave, arg); return dp; } static const unsigned char * -unw_decode_r3 (dp, code, arg) - const unsigned char *dp; - unsigned int code; - void *arg; +unw_decode_r3 (const unsigned char *dp, unsigned int code, void *arg, + const unsigned char * end) { unw_word rlen; - rlen = unw_decode_uleb128 (& dp); + rlen = unw_decode_uleb128 (& dp, end); UNW_DEC_PROLOGUE ("R3", ((code & 0x3) == 1), rlen, arg); return dp; } static const unsigned char * -unw_decode_p1 (dp, code, arg) - const unsigned char * dp; - unsigned int code; - void * arg ATTRIBUTE_UNUSED; +unw_decode_p1 (const unsigned char *dp, unsigned int code, + void *arg ATTRIBUTE_UNUSED, + const unsigned char * end ATTRIBUTE_UNUSED) { unsigned char brmask = (code & 0x1f); @@ -730,21 +728,36 @@ unw_decode_p1 (dp, code, arg) } static const unsigned char * -unw_decode_p2_p5 (dp, code, arg) - const unsigned char * dp; - unsigned int code; - void * arg ATTRIBUTE_UNUSED; +unw_decode_p2_p5 (const unsigned char *dp, unsigned int code, + void *arg ATTRIBUTE_UNUSED, + const unsigned char * end) { if ((code & 0x10) == 0) { - unsigned char byte1 = *dp++; + unsigned char byte1; + + if ((end - dp) < 1) + { + printf (_("\t\n")); + return end; + } + + byte1 = *dp++; UNW_DEC_BR_GR ("P2", ((code & 0xf) << 1) | ((byte1 >> 7) & 1), (byte1 & 0x7f), arg); } else if ((code & 0x08) == 0) { - unsigned char byte1 = *dp++, r, dst; + unsigned char byte1, r, dst; + + if ((end - dp) < 1) + { + printf (_("\t\n")); + return end; + } + + byte1 = *dp++; r = ((code & 0x7) << 1) | ((byte1 >> 7) & 1); dst = (byte1 & 0x7f); @@ -792,11 +805,16 @@ unw_decode_p2_p5 (dp, code, arg) } } else if ((code & 0x7) == 0) - UNW_DEC_SPILL_MASK ("P4", dp, arg); + UNW_DEC_SPILL_MASK ("P4", dp, arg, end); else if ((code & 0x7) == 1) { unw_word grmask, frmask, byte1, byte2, byte3; + if ((end - dp) < 3) + { + printf (_("\t\n")); + return end; + } byte1 = *dp++; byte2 = *dp++; byte3 = *dp++; @@ -811,10 +829,9 @@ unw_decode_p2_p5 (dp, code, arg) } static const unsigned char * -unw_decode_p6 (dp, code, arg) - const unsigned char * dp; - unsigned int code; - void * arg ATTRIBUTE_UNUSED; +unw_decode_p6 (const unsigned char *dp, unsigned int code, + void *arg ATTRIBUTE_UNUSED, + const unsigned char * end ATTRIBUTE_UNUSED) { int gregs = (code & 0x10) != 0; unsigned char mask = (code & 0x0f); @@ -827,10 +844,8 @@ unw_decode_p6 (dp, code, arg) } static const unsigned char * -unw_decode_p7_p10 (dp, code, arg) - const unsigned char *dp; - unsigned int code; - void *arg; +unw_decode_p7_p10 (const unsigned char *dp, unsigned int code, void *arg, + const unsigned char * end) { unsigned char r, byte1, byte2; unw_word t, size; @@ -838,11 +853,11 @@ unw_decode_p7_p10 (dp, code, arg) if ((code & 0x10) == 0) { r = (code & 0xf); - t = unw_decode_uleb128 (&dp); + t = unw_decode_uleb128 (&dp, end); switch (r) { case 0: - size = unw_decode_uleb128 (&dp); + size = unw_decode_uleb128 (&dp, end); UNW_DEC_MEM_STACK_F ("P7", t, size, arg); break; @@ -902,8 +917,14 @@ unw_decode_p7_p10 (dp, code, arg) { case 0x0: /* p8 */ { + if ((end - dp) < 2) + { + printf (_("\t\n")); + return end; + } + r = *dp++; - t = unw_decode_uleb128 (&dp); + t = unw_decode_uleb128 (&dp, end); switch (r) { case 1: @@ -971,28 +992,40 @@ unw_decode_p7_p10 (dp, code, arg) break; case 0x1: + if ((end - dp) < 2) + { + printf (_("\t\n")); + return end; + } + byte1 = *dp++; byte2 = *dp++; UNW_DEC_GR_GR ("P9", (byte1 & 0xf), (byte2 & 0x7f), arg); break; case 0xf: /* p10 */ + if ((end - dp) < 2) + { + printf (_("\t\n")); + return end; + } + byte1 = *dp++; byte2 = *dp++; UNW_DEC_ABI ("P10", byte1, byte2, arg); break; case 0x9: - return unw_decode_x1 (dp, code, arg); + return unw_decode_x1 (dp, code, arg, end); case 0xa: - return unw_decode_x2 (dp, code, arg); + return unw_decode_x2 (dp, code, arg, end); case 0xb: - return unw_decode_x3 (dp, code, arg); + return unw_decode_x3 (dp, code, arg, end); case 0xc: - return unw_decode_x4 (dp, code, arg); + return unw_decode_x4 (dp, code, arg, end); default: UNW_DEC_BAD_CODE (code); @@ -1003,10 +1036,9 @@ unw_decode_p7_p10 (dp, code, arg) } static const unsigned char * -unw_decode_b1 (dp, code, arg) - const unsigned char * dp; - unsigned int code; - void * arg ATTRIBUTE_UNUSED; +unw_decode_b1 (const unsigned char *dp, unsigned int code, + void *arg ATTRIBUTE_UNUSED, + const unsigned char * end ATTRIBUTE_UNUSED) { unw_word label = (code & 0x1f); @@ -1018,35 +1050,32 @@ unw_decode_b1 (dp, code, arg) } static const unsigned char * -unw_decode_b2 (dp, code, arg) - const unsigned char * dp; - unsigned int code; - void * arg ATTRIBUTE_UNUSED; +unw_decode_b2 (const unsigned char *dp, unsigned int code, + void *arg ATTRIBUTE_UNUSED, + const unsigned char * end) { unw_word t; - t = unw_decode_uleb128 (& dp); + t = unw_decode_uleb128 (& dp, end); UNW_DEC_EPILOGUE ("B2", t, (code & 0x1f), arg); return dp; } static const unsigned char * -unw_decode_b3_x4 (dp, code, arg) - const unsigned char *dp; - unsigned int code; - void *arg; +unw_decode_b3_x4 (const unsigned char *dp, unsigned int code, void *arg, + const unsigned char * end) { unw_word t, ecount, label; if ((code & 0x10) == 0) { - t = unw_decode_uleb128 (&dp); - ecount = unw_decode_uleb128 (&dp); + t = unw_decode_uleb128 (&dp, end); + ecount = unw_decode_uleb128 (&dp, end); UNW_DEC_EPILOGUE ("B3", t, ecount, arg); } else if ((code & 0x07) == 0) { - label = unw_decode_uleb128 (&dp); + label = unw_decode_uleb128 (&dp, end); if ((code & 0x08) != 0) UNW_DEC_COPY_STATE ("B4", label, arg); else @@ -1056,13 +1085,13 @@ unw_decode_b3_x4 (dp, code, arg) switch (code & 0x7) { case 1: - return unw_decode_x1 (dp, code, arg); + return unw_decode_x1 (dp, code, arg, end); case 2: - return unw_decode_x2 (dp, code, arg); + return unw_decode_x2 (dp, code, arg, end); case 3: - return unw_decode_x3 (dp, code, arg); + return unw_decode_x3 (dp, code, arg, end); case 4: - return unw_decode_x4 (dp, code, arg); + return unw_decode_x4 (dp, code, arg, end); default: UNW_DEC_BAD_CODE (code); break; @@ -1071,9 +1100,9 @@ unw_decode_b3_x4 (dp, code, arg) } typedef const unsigned char *(*unw_decoder) - PARAMS ((const unsigned char *, unsigned int, void *)); + (const unsigned char *, unsigned int, void *, const unsigned char *); -static unw_decoder unw_decode_table[2][8] = +static const unw_decoder unw_decode_table[2][8] = { /* prologue table: */ { @@ -1100,15 +1129,19 @@ static unw_decoder unw_decode_table[2][8] = /* Decode one descriptor and return address of next descriptor. */ const unsigned char * -unw_decode (dp, inside_body, ptr_inside_body) - const unsigned char * dp; - int inside_body; - void * ptr_inside_body; +unw_decode (const unsigned char *dp, int inside_body, + void *ptr_inside_body, const unsigned char * end) { unw_decoder decoder; unsigned char code; + if ((end - dp) < 1) + { + printf (_("\t\n")); + return end; + } + code = *dp++; decoder = unw_decode_table[inside_body][code >> 5]; - return (*decoder) (dp, code, ptr_inside_body); + return (*decoder) (dp, code, ptr_inside_body, end); }