Don't use TUI_DISASM_WIN in tui_disasm_window method

[deliverable/binutils-gdb.git] / gdb / source-cache.c

diff --git a/gdb/source-cache.c b/gdb/source-cache.c
index 1ed2601c61459a96e1500abf4302bb07437e49a0..86efe83bf9a5679de9a58e2ff0ebe9a3dc37c11e 100644 (file)
--- a/gdb/source-cache.c
+++ b/gdb/source-cache.c
@@ -49,13 +49,10 @@ bool
 source_cache::get_plain_source_lines (struct symtab *s, int first_line,
                                      int last_line, std::string *lines)
 {
-  scoped_fd desc (open_source_file (s));
+  scoped_fd desc (open_source_file_with_line_charpos (s));
   if (desc.get () < 0)
     return false;
 
-  if (s->line_charpos == 0)
-    find_source_lines (s, desc.get ());
-
   if (first_line < 1 || first_line > s->nlines || last_line < 1)
     return false;
 
@@ -181,7 +178,7 @@ source_cache::get_source_lines (struct symtab *s, int first_line,
     return false;
 
 #ifdef HAVE_SOURCE_HIGHLIGHT
-  if (source_styling && can_emit_style_escape (gdb_stdout))
+  if (source_styling && gdb_stdout->can_emit_style_escape ())
     {
       const char *fullname = symtab_to_fullname (s);
 
@@ -200,11 +197,34 @@ source_cache::get_source_lines (struct symtab *s, int first_line,
          std::ifstream input (fullname);
          if (input.is_open ())
            {
-             srchilite::SourceHighlight highlighter ("esc.outlang");
-             highlighter.setStyleFile("esc.style");
+             /* The global source highlight object, or null if one
+                was never constructed.  This is stored here rather
+                than in the class so that we don't need to include
+                anything or do conditional compilation in
+                source-cache.h.  */
+             static srchilite::SourceHighlight *highlighter;
+
+             if (s->line_charpos == 0)
+               {
+                 scoped_fd desc (open_source_file_with_line_charpos (s));
+                 if (desc.get () < 0)
+                   return false;
+
+                 /* FULLNAME points to a value owned by the symtab
+                    (symtab::fullname).  Calling open_source_file reallocates
+                    that value, so we must refresh FULLNAME to avoid a
+                    use-after-free.  */
+                 fullname = symtab_to_fullname (s);
+               }
+
+             if (highlighter == nullptr)
+               {
+                 highlighter = new srchilite::SourceHighlight ("esc.outlang");
+                 highlighter->setStyleFile ("esc.style");
+               }
 
              std::ostringstream output;
-             highlighter.highlight (input, output, lang_name, fullname);
+             highlighter->highlight (input, output, lang_name, fullname);
 
              source_text result = { fullname, output.str () };
              m_source_map.push_back (std::move (result));