diff mbox

preprocessor/58580 - preprocessor goes OOM with warning for zero literals

Message ID 20140124154419.GQ892@tucnak.redhat.com
State New
Headers show

Commit Message

Jakub Jelinek Jan. 24, 2014, 3:44 p.m. UTC 
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 > '<command-line>'
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.



	Jakub
diff mbox

Patch

--- 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)