projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Chevck first for NULL before writing anything to the alloceted structure
[fw/stlink]
/
flash
/
main.c
diff --git
a/flash/main.c
b/flash/main.c
index 8781941cc780a4074917e9685d5ec8ab6ede2a77..9033b17b6069828817cad513a70516108b17a804 100644
(file)
--- a/
flash/main.c
+++ b/
flash/main.c
@@
-48,8
+48,8
@@
static int get_opts(struct opts* o, int ac, char** av)
o->devname = av[1];
i = 1;
}
o->devname = av[1];
i = 1;
}
-
- o->size = strtoul(av[i + 3], NULL, 16);
+ if (ac > 3)
+
o->size = strtoul(av[i + 3], NULL, 16);
}
else if (strcmp(av[0], "write") == 0)
{
}
else if (strcmp(av[0], "write") == 0)
{
@@
-91,14
+91,14
@@
int main(int ac, char** av)
if (o.devname != NULL) /* stlinkv1 */
{
sl = stlink_v1_open(50);
if (o.devname != NULL) /* stlinkv1 */
{
sl = stlink_v1_open(50);
- sl->verbose = 50;
if (sl == NULL) goto on_error;
if (sl == NULL) goto on_error;
+ sl->verbose = 50;
}
else /* stlinkv2 */
{
sl = stlink_open_usb(50);
}
else /* stlinkv2 */
{
sl = stlink_open_usb(50);
- sl->verbose = 50;
if (sl == NULL) goto on_error;
if (sl == NULL) goto on_error;
+ sl->verbose = 50;
}
if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
}
if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)