From 7660768942ff6e239d3f51f402af9e04f4960810 Mon Sep 17 00:00:00 2001
From: Peter Harliman Liem <peter.harliman@gmail.com>
Date: Tue, 25 Oct 2016 23:47:55 +0800
Subject: [PATCH] Fix leak and style in map_write.c (#658)

Fix potential leak, wrong text in log, and restyle
to a cleaner exit path
---
 tests/regress/map_write.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/tests/regress/map_write.c b/tests/regress/map_write.c
index 7d64cda8..124e2d82 100644
--- a/tests/regress/map_write.c
+++ b/tests/regress/map_write.c
@@ -8,20 +8,20 @@
 
 int main()
 {
-    uc_engine *uc;
-    uint8_t *buf, *buf2;
+    uc_engine *uc = NULL;
+    uint8_t *buf = NULL, *buf2 = NULL;
     int i;
     uc_err err;
 
     err = uc_open (UC_ARCH_X86, UC_MODE_64, &uc);
     if (err) {
         printf ("uc_open %d\n", err);
-        return 1;
+        goto exit;
     }
     err = uc_mem_map (uc, ADDR, SIZE, UC_PROT_ALL);
     if (err) {
         printf ("uc_mem_map %d\n", err);
-        return 1;
+        goto exit;
     }
     buf = calloc (SIZE*2, 1);
     buf2 = calloc (SIZE, 1);
@@ -31,20 +31,24 @@ int main()
     /* crash here */
     err = uc_mem_write (uc, ADDR, buf, SIZE+OVERFLOW); 
     if (err) {
-        printf ("uc_mem_map %d\n", err);
-        return 1;
+        printf ("uc_mem_write %d\n", err);
+        goto exit;
     }
     err = uc_mem_read (uc, ADDR+10, buf2, 4);
     if (err) {
-        printf ("uc_mem_map %d\n", err);
-        return 1;
+        printf ("uc_mem_read %d\n", err);
+        goto exit;
     }
     if (buf2[0] != 0xa) {
         printf ("mem contents are wrong\n");
-        return 1;
+        goto exit;
     }
     printf ("OK\n");
+
+exit:
+    if (uc)
+        uc_close (uc);
     free (buf);
     free (buf2);
-    return 0;
+    return err ? 1 : 0;
 }