From 7ab62e8bcdee682a53810c00d5739bcf97cf551d Mon Sep 17 00:00:00 2001
From: Dominic Chen <d.c.ddcc@gmail.com>
Date: Thu, 4 Dec 2014 16:56:03 -0500
Subject: [PATCH 1/2] firmware: Fix bug in error checking

---
 firmware/decompress.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/firmware/decompress.c b/firmware/decompress.c
index 65ad2e5..334f667 100644
--- a/firmware/decompress.c
+++ b/firmware/decompress.c
@@ -29,7 +29,7 @@ int main(int argc, char** argv) {
   if (!(ip = fopen(argv[1], "rb"))) {
     printf("Error: Cannot open %s!", argv[1]);
     ret = -1;
-    goto end_fp;
+    goto end_ip;
   }
 
   fseek(ip, 0, SEEK_END);
@@ -77,7 +77,7 @@ int main(int argc, char** argv) {
   if (!(op = fopen(argv[2], "wb"))) {
     printf("Error: Cannot open %s!", argv[2]);
     ret = -1;
-    goto end;
+    goto end_op;
   }
 
   if (fwrite(buf_out, sizeof(*buf_out), OUT_BYTES / sizeof(*buf_out), op) != OUT_BYTES / sizeof(*buf_out)) {
@@ -85,6 +85,7 @@ int main(int argc, char** argv) {
     ret = -1;
   }
 
+end_op:
   fclose(op);
 
 end_inflate:
@@ -96,7 +97,7 @@ end_out:
 end_in:
   free(buf_in);
 
-end_fp:
+end_ip:
   fclose(ip);
 
 end:

From 2242f9f0aee5e0ba3dbcd41912d0c8d4ed0922ad Mon Sep 17 00:00:00 2001
From: Dominic Chen <d.c.ddcc@gmail.com>
Date: Fri, 6 Feb 2015 15:52:57 -0500
Subject: [PATCH 2/2] fix mismatched error handling

---
 firmware/decompress.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/firmware/decompress.c b/firmware/decompress.c
index 334f667..15d343c 100644
--- a/firmware/decompress.c
+++ b/firmware/decompress.c
@@ -29,7 +29,7 @@ int main(int argc, char** argv) {
   if (!(ip = fopen(argv[1], "rb"))) {
     printf("Error: Cannot open %s!", argv[1]);
     ret = -1;
-    goto end_ip;
+    goto end;
   }
 
   fseek(ip, 0, SEEK_END);
@@ -77,7 +77,7 @@ int main(int argc, char** argv) {
   if (!(op = fopen(argv[2], "wb"))) {
     printf("Error: Cannot open %s!", argv[2]);
     ret = -1;
-    goto end_op;
+    goto end_inflate;
   }
 
   if (fwrite(buf_out, sizeof(*buf_out), OUT_BYTES / sizeof(*buf_out), op) != OUT_BYTES / sizeof(*buf_out)) {
@@ -85,7 +85,6 @@ int main(int argc, char** argv) {
     ret = -1;
   }
 
-end_op:
   fclose(op);
 
 end_inflate:
@@ -96,8 +95,6 @@ end_out:
 
 end_in:
   free(buf_in);
-
-end_ip:
   fclose(ip);
 
 end: