tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: 35d84096e9

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

Change-Id: I034339af90249da14ae0ea50f662563fa66f8221
This commit is contained in:
Mattias Nissler 2016-06-07 21:12:39 +00:00 committed by android-build-merger
commit 6f29ec0197
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs_mgr/fs_mgr_verity.cpp
View file

@ -91,14 +91,12 @@ static RSA *load_key(const char *path)
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 @@ static RSA *load_key(const char *path)
RSA* key = NULL;
if (!android_pubkey_decode(key_data, sizeof(key_data), &key)) {
ERROR("Could not parse key!\n");
free(key_data);
return NULL;
}