Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9

am: a550ee0df7 Change-Id: I291b2cdad02e2cd4b823b0d2c3e74c19f156bb67
2016-08-09 19:55:43 +00:00
parent e6a4195bf7 a550ee0df7
commit b33a6f8342
1 changed files with 6 additions and 4 deletions
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -510,10 +510,12 @@ finish_recovery() {
        if (has_cache) {
            LOGI("Saving locale \"%s\"\n", locale);
            FILE* fp = fopen_path(LOCALE_FILE, "w");
-            fwrite(locale, 1, len, fp);
-            fflush(fp);
-            fsync(fileno(fp));
-            check_and_fclose(fp, LOCALE_FILE);
+            if (fp != NULL) {
+                fwrite(locale, 1, len, fp);
+                fflush(fp);
+                fsync(fileno(fp));
+                check_and_fclose(fp, LOCALE_FILE);
+            }
        }
    }