espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 19:50:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid undefined behavior in gdbscm_make_breakpoint

Browse Source 
Running gdb.guile/scm-breakpoint.exp against an --enable-ubsan build,
we see:

 UNRESOLVED: gdb.guile/scm-breakpoint.exp: test_watchpoints: create a breakpoint with an invalid type number
 ...
 guile (define wp2 (make-breakpoint "result" #:wp-class WP_WRITE #:type 999))
 ../../src/gdb/guile/scm-breakpoint.c:377:11: runtime error: load of value 999, which is not a valid value for type 'bptype'
 ERROR: GDB process no longer exists

Fix this by parsing the user/guile input as plain int, and cast to
internal type only after we know we have a number that would be valid.

Change-Id: I03578d07db00be01b610a8f5ce72e5521aea6a4b
This commit is contained in:
Pedro Alves
2022-04-01 14:31:18 +01:00
parent d4da1b2c1b
commit 4994e74b7a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/guile/scm-breakpoint.c
View File

@ -353,8 +353,8 @@ gdbscm_make_breakpoint (SCM location_scm, SCM rest)
char *location;
int type_arg_pos = -1, access_type_arg_pos = -1,
internal_arg_pos = -1, temporary_arg_pos = -1;
enum bptype type = bp_breakpoint;
enum target_hw_bp_type access_type = hw_write;
int type = bp_breakpoint;
int access_type = hw_write;
int internal = 0;
int temporary = 0;
SCM result;
@ -403,7 +403,7 @@ gdbscm_make_breakpoint (SCM location_scm, SCM rest)
case bp_access_watchpoint:
case bp_catchpoint:
{
const char *type_name = bpscm_type_to_string (type);
const char *type_name = bpscm_type_to_string ((enum bptype) type);
gdbscm_misc_error (FUNC_NAME, type_arg_pos,
gdbscm_scm_from_c_string (type_name),
_("unsupported breakpoint type"));
@ -417,8 +417,8 @@ gdbscm_make_breakpoint (SCM location_scm, SCM rest)
bp_smob->is_scheme_bkpt = 1;
bp_smob->spec.location = location;
bp_smob->spec.type = type;
bp_smob->spec.access_type = access_type;
bp_smob->spec.type = (enum bptype) type;
bp_smob->spec.access_type = (enum target_hw_bp_type) access_type;
bp_smob->spec.is_internal = internal;
bp_smob->spec.is_temporary = temporary;