OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GDB: Fix some null pointer dereferences due to disassembler-options patch. 

gdb/
	* gdbarch.sh (pstring_ptr): New static function.
	(gdbarch_disassembler_options): Use it.
	(gdbarch_verify_disassembler_options): Print valid_disassembler_options,
	not valid_disassembler_option->name.
	* gdbarch.c: Regenerate.
This commit is contained in:
Peter Bergner 2017-03-07 09:49:10 -06:00
parent e45ced6c5e
commit f7bb4e3a0d
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2017-03-07 Peter Bergner <bergner@vnet.ibm.com>
* gdbarch.sh (pstring_ptr): New static function.
(gdbarch_disassembler_options): Use it.
(gdbarch_verify_disassembler_options): Print valid_disassembler_options,
not valid_disassembler_option->name.
* gdbarch.c: Regenerate.
2017-03-07 Peter Bergner <bergner@vnet.ibm.com>
* config/powerpc/ppc64-linux.mh (MH_CFLAGS): Delete.

12
gdb/gdbarch.c
View File

@ -84,6 +84,14 @@ pstring (const char *string)
return string;
}
static char *
pstring_ptr (char **string)
{
if (string == NULL || *string == NULL)
return "(null)";
return *string;
}
/* Helper function to print a list of strings, represented as "const
char *const *". The list is printed comma-separated. */
@ -880,7 +888,7 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
core_addr_to_string_nz (gdbarch->deprecated_function_start_offset));
fprintf_unfiltered (file,
"gdbarch_dump: disassembler_options = %s\n",
pstring (*gdbarch->disassembler_options));
pstring_ptr (gdbarch->disassembler_options));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_displaced_step_copy_insn_p() = %d\n",
gdbarch_displaced_step_copy_insn_p (gdbarch));
@ -1429,7 +1437,7 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
host_address_to_string (gdbarch->unwind_sp));
fprintf_unfiltered (file,
"gdbarch_dump: valid_disassembler_options = %s\n",
host_address_to_string (gdbarch->valid_disassembler_options->name));
host_address_to_string (gdbarch->valid_disassembler_options));
fprintf_unfiltered (file,
"gdbarch_dump: value_from_register = <%s>\n",
host_address_to_string (gdbarch->value_from_register));

12
gdb/gdbarch.sh
View File

@ -1164,8 +1164,8 @@ m:const char *:gnu_triplet_regexp:void:::default_gnu_triplet_regexp::0
m:int:addressable_memory_unit_size:void:::default_addressable_memory_unit_size::0
# Functions for allowing a target to modify its disassembler options.
v:char **:disassembler_options:::0:0::0:pstring (*gdbarch->disassembler_options)
v:const disasm_options_t *:valid_disassembler_options:::0:0::0:host_address_to_string (gdbarch->valid_disassembler_options->name)
v:char **:disassembler_options:::0:0::0:pstring_ptr (gdbarch->disassembler_options)
v:const disasm_options_t *:valid_disassembler_options:::0:0::0:host_address_to_string (gdbarch->valid_disassembler_options)
EOF
}
@ -1678,6 +1678,14 @@ pstring (const char *string)
return string;
}
static char *
pstring_ptr (char **string)
{
if (string == NULL || *string == NULL)
return "(null)";
return *string;
}
/* Helper function to print a list of strings, represented as "const
char *const *". The list is printed comma-separated. */