From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 93631398B0F0; Fri, 9 Jul 2021 12:38:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93631398B0F0 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-2205] [Ada] Fix index range violations in krunch X-Act-Checkin: gcc X-Git-Author: Fedor Rybin X-Git-Refname: refs/heads/master X-Git-Oldrev: e4a6acd67ef7ab110b7f575b22019554819af0cc X-Git-Newrev: 90635a37c2d0e0468c3599398c5f8eeecf596f93 Message-Id: <20210709123858.93631398B0F0@sourceware.org> Date: Fri, 9 Jul 2021 12:38:58 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jul 2021 12:38:58 -0000 https://gcc.gnu.org/g:90635a37c2d0e0468c3599398c5f8eeecf596f93 commit r12-2205-g90635a37c2d0e0468c3599398c5f8eeecf596f93 Author: Fedor Rybin Date: Fri Jun 4 21:01:27 2021 +0300 [Ada] Fix index range violations in krunch gcc/ada/ * krunch.adb: Add safeguards against index range violations. Diff: --- gcc/ada/krunch.adb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gcc/ada/krunch.adb b/gcc/ada/krunch.adb index 4cff3ca13ab..f698d889c22 100644 --- a/gcc/ada/krunch.adb +++ b/gcc/ada/krunch.adb @@ -92,15 +92,16 @@ begin Startloc := 3; Buffer (2 .. Len - 5) := Buffer (7 .. Len); Curlen := Len - 5; - if Buffer (Curlen - 2 .. Curlen) = "128" - or else Buffer (3 .. 9) = "exn_lll" - or else Buffer (3 .. 9) = "exp_lll" - or else Buffer (3 .. 9) = "img_lll" - or else Buffer (3 .. 9) = "val_lll" - or else Buffer (3 .. 9) = "wid_lll" - or else (Buffer (3 .. 6) = "pack" and then Curlen = 10) + if (Curlen >= 3 and then Buffer (Curlen - 2 .. Curlen) = "128") + or else (Len >= 9 and then + (Buffer (3 .. 9) = "exn_lll" + or else Buffer (3 .. 9) = "exp_lll" + or else Buffer (3 .. 9) = "img_lll" + or else Buffer (3 .. 9) = "val_lll" + or else Buffer (3 .. 9) = "wid_lll")) + or else (Curlen = 10 and then Buffer (3 .. 6) = "pack") then - if Buffer (3 .. 15) = "compare_array" then + if Len >= 15 and then Buffer (3 .. 15) = "compare_array" then Buffer (3 .. 4) := "ca"; Buffer (5 .. Curlen - 11) := Buffer (16 .. Curlen); Curlen := Curlen - 11;