commit d70ac46e17a0c5844be4b0d447b889b46c33ed4d
author Dan Albert <danalbert@google.com> Tue May 05 01:34:46 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 05 01:34:46 2015 +0000
tree 81e563a1a40af01cda063de4e1ebe66fee09a44c
parent 8090b4ebc6104c726fafc3774d7f4450837c1bd3
parent bb35999e8ca142978ab2c382d182148b2cc1b6da

Merge "Add additional shielding against the ERROR macro."

adb/test_track_devices.cpp

diff --git a/adb/test_track_devices.cpp b/adb/test_track_devices.cpp
index 3e823e9..f78daeb 100644
--- a/adb/test_track_devices.cpp
+++ b/adb/test_track_devices.cpp
@@ -62,7 +62,7 @@
         if (!android::base::ReadFully(s, buffer, len))
             panic("could not read data");
 
-        printf( "received header %.*s (%d bytes):\n%.*s", 4, head, len, len, buffer );
+        printf( "received header %.*s (%d bytes):\n%.*s----\n", 4, head, len, len, buffer );
     }
     close(s);
 }

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index d772383..88d6165 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -58,7 +58,16 @@
 static int insmod(const char *filename, char *options)
 {
     std::string module;
-    if (!read_file(filename, &module)) {
+    char filename_val[PROP_VALUE_MAX];
+    int ret;
+
+    ret = expand_props(filename_val, filename, sizeof(filename_val));
+    if (ret) {
+        ERROR("insmod: cannot expand '%s'\n", filename);
+        return -EINVAL;
+    }
+
+    if (!read_file(filename_val, &module)) {
         return -1;
     }