commit 462324b655083efb96765b02cf1a0708cf9c079e
author Johan Harvyl <johan.harvyl@sonymobile.com> Tue Aug 09 20:07:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 09 20:07:26 2016 +0000
tree af202fc35500ecc8837b023c6ee3b6224ebda7f1
parent 2d7ff437ae77527c0af4aaead2878bf2e05b51c0
parent d38ddde18130a3ea3324d14720fdf945522182ca

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

Change-Id: I8f21fc8895f5bc2bb714ce64aad137052e825464

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);
+            }
         }
     }