Skip to content

Fixed segfault if chip was not found in chip config files #1166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nightwalker-87 merged 1 commit into from
Aug 1, 2021
Merged

Fixed segfault if chip was not found in chip config files #1166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/stlink-lib/chipid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,9 @@ struct stlink_chipid_params *stlink_chipid_get_params(uint32_t chipid) {
p2 = stlink_chipid_get_params_old(chipid);

#if 1
if (memcmp (p2, params, sizeof (struct stlink_chipid_params) - sizeof (struct stlink_chipid_params *)) != 0) {
if (params == NULL) {
params = p2;
} else if (memcmp (p2, params, sizeof (struct stlink_chipid_params) - sizeof (struct stlink_chipid_params *)) != 0) {
//fprintf (stderr, "Error, chipid params not identical\n");
//return NULL;
fprintf(stderr, "---------- old ------------\n");
Expand Down