aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/read.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index b1637a3..d97a4b7 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-19 Nick Clifton <nickc@redhat.com>
+
+ PR 19630
+ * read.c (read_a_source_file): Check for assemble_one returning
+ with input_line_pointer set to NULL.
+
016-02-19 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
* listing.c (rebuffer_line): Change return type to void.
diff --git a/gas/read.c b/gas/read.c
index 22da1df..5e0e3c8 100644
--- a/gas/read.c
+++ b/gas/read.c
@@ -1176,6 +1176,11 @@ read_a_source_file (char *name)
assemble_one (s); /* Assemble 1 instruction. */
+ /* PR 19630: The backend may have set ilp to NULL
+ if it encountered a catastrophic failure. */
+ if (input_line_pointer == NULL)
+ as_fatal (_("unable to continue with assembly."));
+
*input_line_pointer++ = nul_char;
/* We resume loop AFTER the end-of-line from