commit a550ee0df7abe3e090cea2570ec9c302856bc72f
author Johan Harvyl <johan.harvyl@sonymobile.com> Tue Aug 09 19:50:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 09 19:50:15 2016 +0000
tree 1ba2f46b00326f71c9ef9c3ad144aac4153b0dde
parent dc974043460cb5eb7bafa06510d95e203f656af2
parent 8a4333f3b9e512796d3f9488d80a7815c0c29ac5

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

Change-Id: I9225bcbe1ed82a63f70c7c6a984fd043ac77100b

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index a3c4053..88fedc8 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -510,10 +510,12 @@
         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);
+            }
         }
     }