commit f707f1bb8845386d23f0abb8ae11ca497b2cbc88
author Jeff Sharkey <jsharkey@android.com> Fri Jun 01 15:19:33 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 01 15:19:33 2018 -0700
tree 428976287e6f40a0acfbacf08b85d440a4f56eb9
parent 375ac25773d0ea48b4ae63378cca4891c926627d
parent 9a35ab6a4f0cbc47ff389f0c632218a39bf49a45

Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407
am: 9a35ab6a4f

Change-Id: I273dc86e0b0580bef81e272a94043b269d7df402

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 2b8d0a5..a965181 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -213,17 +213,17 @@
     for (const auto& line : output) {
         // Extract values from blkid output, if defined
         const char* cline = line.c_str();
-        const char* start = strstr(cline, "TYPE=");
+        const 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;
         }