summaryrefslogtreecommitdiffstats
path: root/buspirate_spi.c
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2014-04-26 16:12:45 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2014-04-26 16:12:45 +0000
commit1838591b684b515962b941018288366eb7276a2b (patch)
treed8118a4e310604b1c154bf9dd01225eb44d59d7a /buspirate_spi.c
parent907c3eb800a04c6266d1dae519cba2ba46de8f49 (diff)
downloadast2050-flashrom-1838591b684b515962b941018288366eb7276a2b.zip
ast2050-flashrom-1838591b684b515962b941018288366eb7276a2b.tar.gz
CID1130006: Memory leaks in buspirate_spi_init()
The one in the error case of register_shutdown() was discovered while reviewing the other one found by Coverity and fixed by Stefan Reinauer. Corresponding to flashrom svn r1778. Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'buspirate_spi.c')
-rw-r--r--buspirate_spi.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/buspirate_spi.c b/buspirate_spi.c
index 9d229f4..f0e84bc 100644
--- a/buspirate_spi.c
+++ b/buspirate_spi.c
@@ -250,6 +250,7 @@ int buspirate_spi_init(void)
if (!bp_commbuf) {
bp_commbufsize = 0;
msg_perr("Out of memory!\n");
+ free(dev);
return ERROR_OOM;
}
bp_commbufsize = DEFAULT_BUFSIZE;
@@ -263,8 +264,12 @@ int buspirate_spi_init(void)
return ret;
}
- if (register_shutdown(buspirate_spi_shutdown, NULL))
+ if (register_shutdown(buspirate_spi_shutdown, NULL) != 0) {
+ bp_commbufsize = 0;
+ free(bp_commbuf);
+ bp_commbuf = NULL;
return 1;
+ }
/* This is the brute force version, but it should work.
* It is likely to fail if a previous flashrom run was aborted during a write with the new SPI commands
OpenPOWER on IntegriCloud