From f31104cf3b63a058b63f8b9aed89c1901d5d9acd Mon Sep 17 00:00:00 2001 From: Peter Stuge Date: Mon, 28 Apr 2008 14:47:30 +0000 Subject: 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 Acked-by: Stefan Reinauer --- flashrom.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 29c3a587..c7d0bdac 100644 --- a/flashrom.c +++ b/flashrom.c @@ -111,6 +111,11 @@ struct flashchip *probe_flash(struct flashchip *flash) } 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 @@ int main(int argc, char *argv[]) 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 @@ int main(int argc, char *argv[]) // //////////////////////////////////////////////////////////// - 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); -- cgit v1.2.3