commit d38ddde18130a3ea3324d14720fdf945522182ca
author Johan Harvyl <johan.harvyl@sonymobile.com> Tue Aug 09 20:04:17 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 09 20:04:17 2016 +0000
tree 6e6a9f673d0a74a7efbf70bfcf2d4a7b67ef45fe
parent 66571856a1d894d695e1583b72cbbc5732d5bc91
parent b33a6f8342b35a514bee6d434f440c65f956d9c7

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

Change-Id: I24871e2d2259cb3444082ae89e4a59979ad5e197

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index cfca9df..725976f 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -526,10 +526,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);
+            }
         }
     }