commit 98bb129cd30f4c1ec770cb0df5f580c15246a1cb
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 01 21:46:02 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 01 21:46:02 2018 +0000
tree 7274e876586bab00aa8abc1ebe38056488856ae5
parent 2403b4d0561c756ed5102aaf6048a80c9993f6f8
parent ee5c7318d70f61fc735f64ea28603550af54f8df

[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7

Change-Id: If8422cf170db4e05dbe4cf6c1ed4ebf8126b0c71

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 279c990..744ff16 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -211,17 +211,17 @@
     for (auto line : output) {
         // Extract values from blkid output, if defined
         const char* cline = line.c_str();
-        char* start = strstr(cline, "TYPE=");
+        char* start = strstr(cline, "TYPE=\"");
         if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
             fsType = value;
         }
 
-        start = strstr(cline, "UUID=");
+        start = strstr(cline, "UUID=\"");
         if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
             fsUuid = value;
         }
 
-        start = strstr(cline, "LABEL=");
+        start = strstr(cline, "LABEL=\"");
         if (start != nullptr && sscanf(start + 6, "\"%127[^\"]\"", value) == 1) {
             fsLabel = value;
         }