From e7da50fa4b4f770240feda51ba60f6255073e54f Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Fri, 2 Mar 2018 10:46:32 +0000 Subject: [PATCH] [ARM] Fix NULL dereference of march_ext_opt Commit 4d354d8b8932d450c77fd52f3501662827523014 introduced a NULL pointer dereference by replacing a pointer assignment by a pointer dereference assignment without adding a NULL pointer check. This patch fixes it. 2018-03-02 Thomas Preud'homme gas/ * config/tc-arm.c (md_begin): Add NULL pointer check before dereferencing march_ext_opt. --- gas/ChangeLog | 5 +++++ gas/config/tc-arm.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 46711fd5fe..d8f5892711 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2018-03-02 Thomas Preud'homme + + * config/tc-arm.c (md_begin): Add NULL pointer check before + dereferencing march_ext_opt. + 2018-03-01 Thomas Preud'homme * config/tc-arm.c (cpu_variant, arm_arch_used, thumb_arch_used, diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index ac403cc74e..eda9890921 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -25407,7 +25407,7 @@ md_begin (void) from the processor. */ if (mcpu_fpu_opt) selected_fpu = *mcpu_fpu_opt; - else + else if (march_fpu_opt) selected_fpu = *march_fpu_opt; #else selected_fpu = fpu_default;