From df64a42d6d6232af9aac20c7d2aedb4d527eaeef Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Tue, 27 May 2014 00:06:14 +0000 Subject: Fix various tiny problems in verify_range() First of all, fix CID1130010: Resource leak as reported by Stefan Reinauer. Alternatively to Stefan's approach, just move the malloc() out of the scope. Additionally, get rid of an unnecessary exit(1) and correctly return -1 in all error cases as documented. Corresponding to flashrom svn r1800. Signed-off-by: Stefan Tauner Acked-by: Stefan Tauner --- flashrom.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 10e375a..98101b7 100644 --- a/flashrom.c +++ b/flashrom.c @@ -672,20 +672,20 @@ int check_erased_range(struct flashctx *flash, unsigned int start, */ int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len) { - uint8_t *readbuf = malloc(len); - int ret = 0; - if (!len) - goto out_free; + return -1; if (!flash->chip->read) { msg_cerr("ERROR: flashrom has no read function for this flash chip.\n"); - return 1; + return -1; } + + uint8_t *readbuf = malloc(len); if (!readbuf) { msg_gerr("Could not allocate memory!\n"); - exit(1); + return -1; } + int ret = 0; if (start + len > flash->chip->total_size * 1024) { msg_gerr("Error: %s called with start 0x%x + len 0x%x >" @@ -699,7 +699,8 @@ int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int sta if (ret) { msg_gerr("Verification impossible because read failed " "at 0x%x (len 0x%x)\n", start, len); - return ret; + ret = -1; + goto out_free; } ret = compare_range(cmpbuf, readbuf, start, len); -- cgit v1.1