Handle NULL probe, erase and write function pointers in the flashchips table
The read pointer was already checked properly.
Corresponding to flashrom svn r218 and coreboot v2 svn r3273.
Signed-off-by: Peter Stuge <peter@stuge.se>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
diff --git a/flashrom.c b/flashrom.c
index 29c3a58..c7d0bda 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -111,6 +111,11 @@
}
printf_debug("Probing for %s %s, %d KB: ",
flash->vendor, flash->name, flash->total_size);
+ if (!flash->probe) {
+ printf_debug("failed! flashrom has no probe function for this flash chip.\n");
+ flash++;
+ continue;
+ }
size = flash->total_size * 1024;
@@ -425,6 +430,10 @@
if (erase_it) {
printf("Erasing flash chip\n");
+ if (!flash->erase) {
+ fprintf(stderr, "Error: flashrom has no erase function for this flash chip.\n");
+ return 1;
+ }
flash->erase(flash);
exit(0);
} else if (read_it) {
@@ -493,8 +502,13 @@
// ////////////////////////////////////////////////////////////
- if (write_it)
+ if (write_it) {
+ if (!flash->write) {
+ fprintf(stderr, "Error: flashrom has no write function for this flash chip.\n");
+ return 1;
+ }
ret |= flash->write(flash, buf);
+ }
if (verify_it)
ret |= verify_flash(flash, buf);