commit a7946bf9c6b08b378814c1503e11ce698335ec80
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 01 21:46:11 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 01 21:46:11 2018 +0000
tree 6b8403bf29bda37dc6d0942072b5cba1dfb45a17
parent c3c04acae68fade4b57b1f61a8f4f8c863154122
parent 4de0e883d0da7c9a7e00d169038758afd26ef66f

[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad am: 5716ee6d7a am: 4de0e883d0

Change-Id: I66ce047987d59d1344cd46e14e07ae0d3cb4bf9a

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 014055b..43014bd 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;
         }