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

am: 9a35ab6a4f Change-Id: I273dc86e0b0580bef81e272a94043b269d7df402
6 years ago · f707f1bb88
parent 375ac25773 9a35ab6a4f
commit f707f1bb88
1 changed files with 3 additions and 3 deletions
--- a/Utils.cpp
+++ b/Utils.cpp
@ -213,17 +213,17 @@ static status_t readMetadata(const std::string& path, std::string& fsType,
    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;
        }