adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

samples: flash_shell: Fix overwriting return value

Browse source 
Value of ret has been overwritten by flash_write_protection_set
before it could be returned from do_write_unaligned, which could
lead to reporting success when error code should have been returned.

Fixes #27641, Coverity-CID: 212142
Fixes #27642, Coverity-CID: 212143

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2020-08-18 23:41:27 +00:00 committed by Ioannis Glaropoulos
parent 9ef03bb54c
commit cefebbec39
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
samples/drivers/flash_shell/src/main.c
View file

@ -372,11 +372,11 @@ free_buffers:
k_free(before_data);
k_free(after_data);
ret = flash_write_protection_set(flash_device, true);
if (ret) {
int ret1 = flash_write_protection_set(flash_device, true);
if (ret1) {
PR_ERROR(shell, "Failed to enable flash protection (err: %d)."
"\n", ret);
return ret;
"\n", ret1);
return ret1;
}
return ret;