am 6bcd362e: Handle missing UUID/LABEL from blkid.

* commit '6bcd362edd1f0ad97807276ff7f9f16991df99a4': Handle missing UUID/LABEL from blkid.
11 years ago · 86697c72ae
parent 3aefb598e4 6bcd362edd
commit 86697c72ae
1 changed files with 4 additions and 4 deletions
--- a/Volume.cpp
+++ b/Volume.cpp
@ -668,15 +668,15 @@ int Volume::extractMetadata(const char* devicePath) {
    if (fgets(line, sizeof(line), fp) != NULL) {
        ALOGD("blkid identified as %s", line);

-        char* start = strstr(line, "UUID=") + 5;
-        if (sscanf(start, "\"%127[^\"]\"", value) == 1) {
+        char* start = strstr(line, "UUID=");
+        if (start != NULL && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
            setUuid(value);
        } else {
            setUuid(NULL);
        }

-        start = strstr(line, "LABEL=") + 6;
-        if (sscanf(start, "\"%127[^\"]\"", value) == 1) {
+        start = strstr(line, "LABEL=");
+        if (start != NULL && sscanf(start + 6, "\"%127[^\"]\"", value) == 1) {
            setUserLabel(value);
        } else {
            setUserLabel(NULL);