commit 8f7fc8dfed9ab6615e4a906aaefdf0eadd31ea28
author Yabin Cui <yabinc@google.com> Thu Nov 13 19:08:50 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 13 19:08:51 2014 +0000
tree c9ae18e00f8673d02be21fc469cbf7acd3f33ccf
parent b0a10b53eeeef6428bd034e3097391e9a7a4788b
parent 8a98535bcb48dfd4bfe3dfddddc82925a2f1502b

Merge "kill HAVE_LOCALTIME_R"

init/builtins.c

diff --git a/init/builtins.c b/init/builtins.c
index c192551..7f4daa7 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -433,6 +433,7 @@
             sprintf(tmp, "/dev/block/loop%d", n);
             loop = open(tmp, mode);
             if (loop < 0) {
+                close(fd);
                 return -1;
             }
 

init/devices.c

diff --git a/init/devices.c b/init/devices.c
index 2fa5c22..a95111a 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -458,7 +458,7 @@
 
     /* skip "/devices/platform/<driver>" */
     parent = strchr(uevent->path + pdev->path_len, '/');
-    if (!*parent)
+    if (!parent)
         goto err;
 
     if (!strncmp(parent, "/usb", 4)) {