From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17326 invoked by alias); 24 Jan 2014 15:44:25 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 17316 invoked by uid 89); 24 Jan 2014 15:44:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 24 Jan 2014 15:44:23 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0OFiMu1027898 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 24 Jan 2014 10:44:22 -0500 Received: from tucnak.zalov.cz (vpn1-6-95.ams2.redhat.com [10.36.6.95]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s0OFiKm8026372 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 24 Jan 2014 10:44:21 -0500 Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.14.7/8.14.7) with ESMTP id s0OFiJFM014256; Fri, 24 Jan 2014 16:44:19 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.14.7/8.14.7/Submit) id s0OFiJsl014255; Fri, 24 Jan 2014 16:44:19 +0100 Date: Fri, 24 Jan 2014 15:44:00 -0000 From: Jakub Jelinek To: Dodji Seketeli Cc: Markus Trippelsdorf , Bernd Edlinger , GCC Patches , Tom Tromey , Manuel =?iso-8859-1?B?TPNwZXotSWLh8WV6?= Subject: Re: [PATCH] preprocessor/58580 - preprocessor goes OOM with warning for zero literals Message-ID: <20140124154419.GQ892@tucnak.redhat.com> Reply-To: Jakub Jelinek References: <87zjpbb5qu.fsf@redhat.com> <20131111142159.GZ27813@tucnak.zalov.cz> <878uwuap4f.fsf@redhat.com> <878uwt63e2.fsf@redhat.com> <20131113081610.GH27813@tucnak.zalov.cz> <87zjp7t73c.fsf@redhat.com> <87vbxcig8t.fsf@redhat.com> <20140124150532.GB396@x4> <87iot9qtff.fsf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87iot9qtff.fsf@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes X-SW-Source: 2014-01/txt/msg01589.txt.bz2 On Fri, Jan 24, 2014 at 04:40:52PM +0100, Dodji Seketeli wrote: > > The patch causes http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59935 . > > The follow-up patch (fp == NULL check) doesn't help. > > I am looking into that, sorry for the inconvenience. I'd say we want something like following. Note that while the c == NULL bailout would be usually sufficient, if you'll do: echo foobar > '' it would still crash. Line 0 is used only for the special locations (command line, built-in macros) and there is no file associated with it anyway. --- gcc/input.c.jj 2014-01-24 16:32:34.000000000 +0100 +++ gcc/input.c 2014-01-24 16:41:42.012671452 +0100 @@ -698,7 +698,13 @@ location_get_source_line (expanded_locat static char *buffer; static ssize_t len; - fcache * c = lookup_or_add_file_to_cache_tab (xloc.file); + if (xloc.line == 0) + return NULL; + + fcache *c = lookup_or_add_file_to_cache_tab (xloc.file); + if (c == NULL) + return NULL; + bool read = read_line_num (c, xloc.line, &buffer, &len); if (read && line_len) Jakub