From 005304aae36522a90bbe169faea36db559d0f3d6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 6 Dec 2016 15:31:14 +0000 Subject: [PATCH] Stop the assembler from running out of memory when asked to generate a huge number of spaces. PR gas/20901 * read.c (s_space): Place an upper limit on the number of spaces generated. --- gas/ChangeLog | 4 ++++ gas/read.c | 19 ++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index bb6beb8e3c..781e975920 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,9 @@ 2016-12-06 Nick Clifton + PR gas/20901 + * read.c (s_space): Place an upper limit on the number of spaces + generated. + PR gas/20896 * testsuite/gas/mmix/err-byte1.s: Adjust expected warning messages to account for patch to next_char_of_string. diff --git a/gas/read.c b/gas/read.c index 0cc0d2062e..08b8846f15 100644 --- a/gas/read.c +++ b/gas/read.c @@ -3394,11 +3394,20 @@ s_space (int mult) { offsetT i; - if (mult == 0) - mult = 1; - bytes = mult * exp.X_add_number; - for (i = 0; i < exp.X_add_number; i++) - emit_expr (&val, mult); + /* PR 20901: Check for excessive values. + FIXME: 1<<10 is an arbitrary limit. Maybe use maxpagesize instead ? */ + if (exp.X_add_number < 0 || exp.X_add_number > (1 << 10)) + as_bad (_("size value for s_space directive too large: %lx"), + (long) exp.X_add_number); + else + { + if (mult == 0) + mult = 1; + bytes = mult * exp.X_add_number; + + for (i = 0; i < exp.X_add_number; i++) + emit_expr (&val, mult); + } } } else -- 2.34.1