From patchwork Mon Aug 12 09:02:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1145569 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-506664-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="SJW5y8LS"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 466VY91NFlz9sN1 for ; Mon, 12 Aug 2019 19:14:53 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=HHumi8lBKCDXEOtxxfH+6uDTBbfeFp4Y1ugem0wlaTZ4XPgVyr /YFyJD0DDF/cZPpHbZfNGkP3QYX2tadTMz1CA4qt0SHvrM4chqtotB4AfEXTK2wu LejYCpOqrshq5YFb9Ju5zqK5AHil9bdlbNjk+fwEwd4cgqpmI6XCLs+LY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=dSAvL2/yRxvyxjDF8ENxu7K1jv8=; b=SJW5y8LS2EBhAJM7/c8u HbKB2DDHJcv2+ZRjCM4Jib+dh701sjhdrZ2gcezw0ZJofSeQFHqBFlhL6CdnB68t /EZMkawhfmHbR6/7SZRQY6CjlasaalQ7osecpq0XYmHzi7LRZCjze0sSRnA3rYbg LYdJIq2qjYircr7S/1me1bs= Received: (qmail 114988 invoked by alias); 12 Aug 2019 09:10:25 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 49581 invoked by uid 89); 12 Aug 2019 09:02:59 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy=HX-Languages-Length:693 X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (209.51.188.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 12 Aug 2019 09:02:56 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hx6EA-0005tI-17 for gcc-patches@gcc.gnu.org; Mon, 12 Aug 2019 05:02:54 -0400 Received: from rock.gnat.com ([205.232.38.15]:51708) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hx6E9-0005sy-T4 for gcc-patches@gcc.gnu.org; Mon, 12 Aug 2019 05:02:53 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id A3D6C11647A; Mon, 12 Aug 2019 05:02:51 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id c+nno351Y9Gx; Mon, 12 Aug 2019 05:02:51 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 92CDC560CC; Mon, 12 Aug 2019 05:02:51 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 91AEA6AF; Mon, 12 Aug 2019 05:02:51 -0400 (EDT) Date: Mon, 12 Aug 2019 05:02:51 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Bob Duff Subject: [Ada] Prevent crash in Put_Scaled Message-ID: <20190812090251.GA22658@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 205.232.38.15 X-IsSubscribed: yes This patch fixes a bug in Put_Scaled, which causes a crash when checks are on. Tested on x86_64-pc-linux-gnu, committed on trunk 2019-08-12 Bob Duff gcc/ada/ * libgnat/a-tifiio.adb (Put_Scaled): Prevent AA from being negative, since Field is range 0 .. something. --- gcc/ada/libgnat/a-tifiio.adb +++ gcc/ada/libgnat/a-tifiio.adb @@ -560,7 +560,7 @@ package body Ada.Text_IO.Fixed_IO is E : Integer) is pragma Assert (E >= -Max_Digits); - AA : constant Field := E + A; + AA : constant Field := Integer'Max (E + A, 0); N : constant Natural := (AA + Max_Digits - 1) / Max_Digits + 1; Q : array (0 .. N - 1) of Int64 := (others => 0);