Ensured all labels get an initialized address in buffer views.

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 578c99a..cd855bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+16-04-22  Cyrille Bagard <nocbos@gmail.com>
+
+	* src/analysis/disass/output.c:
+	Ensure all labels get an initialized address in buffer views.
+
 16-04-21  Cyrille Bagard <nocbos@gmail.com>
 
 	* src/arch/arm/v7/arm.c:
diff --git a/src/analysis/disass/output.c b/src/analysis/disass/output.c
index d8097cf..0ff6148 100644
--- a/src/analysis/disass/output.c
+++ b/src/analysis/disass/output.c
@@ -235,8 +235,6 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA
 
                     g_code_buffer_append_new_line(buffer, line);
 
-                    init_mrange(&range, get_mrange_addr(g_binary_symbol_get_range(symbols[sym_index])), 0);
-
                     line = g_code_buffer_prepare_new_line(buffer, &range);
                     g_buffer_line_add_flag(line, BLF_IS_LABEL);
                     g_buffer_line_fill_mrange(line, msize, msize);
@@ -251,6 +249,8 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA
 
                 if (label != NULL)
                 {
+                    init_mrange(&range, get_mrange_addr(g_binary_symbol_get_range(symbols[sym_index])), 0);
+
                     line = g_code_buffer_prepare_new_line(buffer, &range);
                     g_buffer_line_add_flag(line, BLF_IS_LABEL);
                     g_buffer_line_fill_mrange(line, msize, msize);