From f64e2f4045485f99b4ce6649fdab874dacccd5a6 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 19 Sep 2019 19:49:39 +0200 Subject: [PATCH] [gdb] Catch exception when constructing the highlighter Currently in source_cache::ensure we catch the exception that triggers when highlighter->highlight is called: ... try { std::istringstream input (contents); std::ostringstream output; highlighter->highlight (input, output, lang_name, fullname); ... and the file used earlier in the construction of the highlighter: ... highlighter = new srchilite::SourceHighlight ("esc.outlang"); ... is missing. The fact that this exception triggers when highlighter->highlight is called is an implementation artefact of libsource-highlight.so though, and this could be different for older or newer versions. Make things more robust by also catching exceptions thrown during construction of the highlighter. This makes the handling on master equivalent with what has been committed for 8.3.1. Tested on x86_64-linux. gdb/ChangeLog: 2019-09-19 Tom de Vries PR gdb/25009 * source-cache.c (source_cache::ensure): Catch exception thrown during construction of the highlighter. --- gdb/ChangeLog | 6 ++++++ gdb/source-cache.c | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7057e37e8da..39f917b1867 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-09-19 Tom de Vries + + PR gdb/25009 + * source-cache.c (source_cache::ensure): Catch exception thrown during + construction of the highlighter. + 2019-09-18 Alan Modra * aarch64-linux-tdep.c, * arm-tdep.c, * auto-load.c, diff --git a/gdb/source-cache.c b/gdb/source-cache.c index 7a52ce9458e..1fe6da81326 100644 --- a/gdb/source-cache.c +++ b/gdb/source-cache.c @@ -190,14 +190,14 @@ source_cache::ensure (struct symtab *s) conditional compilation in source-cache.h. */ static srchilite::SourceHighlight *highlighter; - if (highlighter == nullptr) - { - highlighter = new srchilite::SourceHighlight ("esc.outlang"); - highlighter->setStyleFile ("esc.style"); - } - try { + if (highlighter == nullptr) + { + highlighter = new srchilite::SourceHighlight ("esc.outlang"); + highlighter->setStyleFile ("esc.style"); + } + std::istringstream input (contents); std::ostringstream output; highlighter->highlight (input, output, lang_name, fullname); -- 2.30.2