You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/10/21 03:12:53 UTC

incubator-mynewt-core git commit: boot - Fix mem leak I just created!

Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/develop 22a85a985 -> 0d75df2eb


boot - Fix mem leak I just created!


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/0d75df2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0d75df2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0d75df2e

Branch: refs/heads/develop
Commit: 0d75df2eb036ff1e9ceae0982802366d3b9f4d7d
Parents: 22a85a9
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Oct 20 20:14:02 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Thu Oct 20 20:14:02 2016 -0700

----------------------------------------------------------------------
 boot/bootutil/src/loader.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0d75df2e/boot/bootutil/src/loader.c
----------------------------------------------------------------------
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 425febe..ce3ad5d 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -940,7 +940,7 @@ boot_go(struct boot_rsp *rsp)
     int slot;
     int rc;
 
-    /* The array of slot sectars are defined here so that they don't get
+    /* The array of slot sectors are defined here so that they don't get
      * allocated for non-boot-loader apps.  This is necessary because the gcc
      * option "-fdata-sections" doesn't seem to have any effect for some
      * reason.
@@ -1051,7 +1051,8 @@ split_go(int loader_slot, int split_slot, void **entry)
     /* Determine the sector layout of the image slots and scratch area. */
     rc = boot_read_sectors();
     if (rc != 0) {
-        return rc;
+        rc = SPLIT_GO_ERR;
+        goto done;
     }
 
     rc = boot_read_image_headers();