commit f337373cdd37ec94779e134729a7d428e63e2dd0
author Jeff Sharkey <jsharkey@android.com> Fri Jun 01 11:31:39 2018 -0600
committer Ryan Longair <rlongair@google.com> Tue Jun 12 11:21:16 2018 -0700
tree 22e2fe29011aca82ea44d669a653bb576a09702a
parent e74c3ea1e2dfb81eeef00ecc399ef78c37fe7868

Require quotes when searching for blkid keys.

In combination with a blkid change, this prevents the parsing logic
from getting confused by key names appearing inside values.  (The
blkid change suppresses any quotes that appear inside values.)

Bug: 80436257
Test: manual
Change-Id: I9480ef6eb78254b812c671950875d0b8918a27c6
(cherry picked from commit ee5c7318d70f61fc735f64ea28603550af54f8df)

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