From 5c7dac8aa1a2ccc42325dd680e515c64a797bef4 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Mon, 23 Jun 2014 18:20:31 +0200 Subject: [PATCH] re PR libgcc/61585 (Subscript-out-of-range in unwind-seh.c?) PR libgcc/61585 * unwind-seh.c (_Unwind_GetGR): Check for proper index range. (_Unwind_SetGR): Likewise. From-SVN: r211900 --- libgcc/ChangeLog | 7 +++++++ libgcc/unwind-seh.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 04c8f73706e..c4a35a896b9 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,10 @@ +2014-06-23 Kai Tietz + + PR libgcc/61585 + * unwind-seh.c (_Unwind_GetGR): Check for proper + index range. + (_Unwind_SetGR): Likewise. + 2014-05-22 Nick Clifton * config/msp430/t-msp430 (HOST_LIBGCC2_CFLAGS): Add diff --git a/libgcc/unwind-seh.c b/libgcc/unwind-seh.c index c8187b37a16..a221d9ffeac 100644 --- a/libgcc/unwind-seh.c +++ b/libgcc/unwind-seh.c @@ -79,7 +79,7 @@ struct _Unwind_Context _Unwind_Word _Unwind_GetGR (struct _Unwind_Context *c, int index) { - if (index < 0 || index > 2) + if (index < 0 || index >= 2) abort (); return c->reg[index]; } @@ -89,7 +89,7 @@ _Unwind_GetGR (struct _Unwind_Context *c, int index) void _Unwind_SetGR (struct _Unwind_Context *c, int index, _Unwind_Word val) { - if (index < 0 || index > 2) + if (index < 0 || index >= 2) abort (); c->reg[index] = val; } -- 2.30.2