commit b3f51557de211d66392525deb28cb59a12b814da
author Mattias Nissler <mnissler@google.com> Tue Jun 07 21:12:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 07 21:12:39 2016 +0000
tree 220d7123eb3deb36d6a593167417caeb4ecdb04b
parent d3031322f4b6a2bd6becd8571afac6cc4abac039
parent 4df2923f986600b4b5915e3940d70561c79c966c

Merge "fs_mgr: Remove incorrect free() on error paths in load_key()"
am: 35d84096e9

* commit '35d84096e9a53c2d38de92de99271a8a772c186d':
  fs_mgr: Remove incorrect free() on error paths in load_key()

Change-Id: I034339af90249da14ae0ea50f662563fa66f8221

fs_mgr/fs_mgr_verity.cpp

diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index 72554a8..aa32600 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -91,14 +91,12 @@
     FILE* f = fopen(path, "r");
     if (!f) {
         ERROR("Can't open '%s'\n", path);
-        free(key_data);
         return NULL;
     }
 
     if (!fread(key_data, sizeof(key_data), 1, f)) {
         ERROR("Could not read key!\n");
         fclose(f);
-        free(key_data);
         return NULL;
     }
 
@@ -107,7 +105,6 @@
     RSA* key = NULL;
     if (!android_pubkey_decode(key_data, sizeof(key_data), &key)) {
         ERROR("Could not parse key!\n");
-        free(key_data);
         return NULL;
     }