From patchwork Wed Jun 13 19:43:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Kargl X-Patchwork-Id: 929067 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-479659-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=troutmask.apl.washington.edu Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="DCNgjhbF"; 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 415cdM522Xz9s01 for ; Thu, 14 Jun 2018 05:44:06 +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:subject:message-id:reply-to:mime-version:content-type; q=dns; s=default; b=UVzQJgT+4uUzqYC1jo5jklXAvLxj9Ua51BQxCS/TL0U CHfTvzrcQmwejQBJ+T4FzdfkkrRE+zFJtxlKVkakUuVytbGepS3Nzntu4nJoXGl3 jcxytKiH+HJUsKgqR0AIvc6xjkTHbY3mqXzVoccv/gENWbOQzabaO35nWOGSGHJQ = 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:subject:message-id:reply-to:mime-version:content-type; s=default; bh=enfv6aJ1APEwbYYmcl4LKOBtH8Y=; b=DCNgjhbF9P6XSrQyO UtgcAe06tAPbU/VPNtbZkZfMiKEKM7+e7veNE9ZQQNZaExZZJyOuR19O+WlvoqrP srrUBz4Gfy2qR5rc+Atm053QjGKecdhdS6luqYfzo30buqmj/pkmtOEzZyuNECQR 1+c69/RQzxqvWaYt6r47eaN5JU= Received: (qmail 105913 invoked by alias); 13 Jun 2018 19:43:53 -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 105870 invoked by uid 89); 13 Jun 2018 19:43:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-9.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 spammy=Incompatible X-Spam-User: qpsmtpd, 2 recipients X-HELO: troutmask.apl.washington.edu Received: from troutmask.apl.washington.edu (HELO troutmask.apl.washington.edu) (128.95.76.21) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 13 Jun 2018 19:43:50 +0000 Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.15.2/8.15.2) with ESMTPS id w5DJhmFf036561 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 13 Jun 2018 12:43:48 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.15.2/8.15.2/Submit) id w5DJhmAA036560; Wed, 13 Jun 2018 12:43:48 -0700 (PDT) (envelope-from sgk) Date: Wed, 13 Jun 2018 12:43:48 -0700 From: Steve Kargl To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [Committed] PR fortran/86110 -- Avoid NULL pointer dereference Message-ID: <20180613194348.GA36553@troutmask.apl.washington.edu> Reply-To: sgk@troutmask.apl.washington.edu MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.2 (2017-12-15) Committed as obviously. 2018-06-13 Steven G. Kargl PR fortran/86110 * array.c (gfc_resolve_character_array_constructor): Avoid NULL pointer dereference. 2018-06-13 Steven G. Kargl PR fortran/86110 * gfortran.dg/pr86110.f90: New test. Index: gcc/fortran/array.c =================================================================== --- gcc/fortran/array.c (revision 261521) +++ gcc/fortran/array.c (working copy) @@ -2040,7 +2040,9 @@ got_charlen: gfc_ref *ref; for (ref = p->expr->ref; ref; ref = ref->next) if (ref->type == REF_SUBSTRING + && ref->u.ss.start && ref->u.ss.start->expr_type == EXPR_CONSTANT + && ref->u.ss.end && ref->u.ss.end->expr_type == EXPR_CONSTANT) break; Index: gcc/testsuite/gfortran.dg/pr86110.f90 =================================================================== --- gcc/testsuite/gfortran.dg/pr86110.f90 (nonexistent) +++ gcc/testsuite/gfortran.dg/pr86110.f90 (working copy) @@ -0,0 +1,7 @@ +! { dg-do compile } +! PR fortran/86110 +program p + character(:), allocatable :: x, y + x = 'abc' + y = [x(:)] ! { dg-error "Incompatible ranks 0 and 1" } +end