commit 7e51f8d0c460e103660cbfc1d39199935063678e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 01 21:46:05 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 01 21:46:05 2018 +0000
tree 7274e876586bab00aa8abc1ebe38056488856ae5
parent 2403b4d0561c756ed5102aaf6048a80c9993f6f8
parent 0c5a0d65c976977544286254b72239b8b09571ff

[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9

Change-Id: I585336447c06e09b499ad2656b731105f1ebc4c4

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;
         }