diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2020-04-18 15:30:21 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2020-04-18 15:30:21 (GMT) |
| commit | c8092365591d1336c1e03cf42b6bd6ea58a17350 (patch) | |
| tree | e9b0b8a125f89f852108a2fc60a08ad1ff8182f2 | |
| parent | 0794024b412604ae5e5aca0f104b5a8f3ec5412c (diff) | |
Taken into account the potential absence of demangler in the symbol panel.
| -rw-r--r-- | src/format/format.c | 2 | ||||
| -rw-r--r-- | src/gui/panels/symbols.c | 19 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/format/format.c b/src/format/format.c index 2be7d5c..18ddc03 100644 --- a/src/format/format.c +++ b/src/format/format.c @@ -129,6 +129,8 @@ static void g_binary_format_init(GBinFormat *format) format->info = g_preload_info_new(); + format->demangler = NULL; + g_rw_lock_init(&format->syms_lock); #ifndef NDEBUG g_atomic_int_set(&format->sym_locked, 0); diff --git a/src/gui/panels/symbols.c b/src/gui/panels/symbols.c index 809fed8..2cb2b34 100644 --- a/src/gui/panels/symbols.c +++ b/src/gui/panels/symbols.c @@ -61,7 +61,7 @@ struct _GSymbolsPanel GPanelItem parent; /* A laisser en premier */ GLoadedBinary *binary; /* Binaire à prendre en compte */ - const char *sep; /* Délimitateur à utiliser */ + char *sep; /* Délimitateur à utiliser */ size_t count; /* Quantité de symboles utiles */ @@ -658,6 +658,12 @@ static void change_symbols_panel_current_content(GSymbolsPanel *panel, GLoadedCo if (panel->binary != NULL) g_object_unref(G_OBJECT(panel->binary)); + if (panel->sep != NULL) + { + free(panel->sep); + panel->sep = NULL; + } + panel->binary = binary; if (panel->binary != NULL) @@ -676,11 +682,18 @@ static void change_symbols_panel_current_content(GSymbolsPanel *panel, GLoadedCo if (binary != NULL) { format = G_BIN_FORMAT(g_loaded_binary_get_format(binary)); + demangler = g_binary_format_get_demangler(format); - panel->sep = g_compiler_demangler_get_ns_separator(demangler); + if (demangler == NULL) + panel->sep = NULL; + + else + { + panel->sep = strdup(g_compiler_demangler_get_ns_separator(demangler)); + g_object_unref(G_OBJECT(demangler)); + } - g_object_unref(G_OBJECT(demangler)); g_object_unref(G_OBJECT(format)); if (panel->sep == NULL) |