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

Merge "Don't abort on read_file if the file is missing." into klp-dev

Browse source
This commit is contained in:
Michael Runge 2013-12-20 19:33:05 +00:00 committed by Android (Google) Code Review
commit f9dd42de60
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
updater/install.c
View file

@ -1353,7 +1353,6 @@ Value* Sha1CheckFn(const char* name, State* state, int argc, Expr* argv[]) {
} }
if (args[0]->size < 0) { if (args[0]->size < 0) {
printf("%s(): no file contents received", name);
return StringValue(strdup("")); return StringValue(strdup(""));
} }
uint8_t digest[SHA_DIGEST_SIZE]; uint8_t digest[SHA_DIGEST_SIZE];
@ -1406,12 +1405,11 @@ Value* ReadFileFn(const char* name, State* state, int argc, Expr* argv[]) {
FileContents fc; FileContents fc;
if (LoadFileContents(filename, &fc, RETOUCH_DONT_MASK) != 0) { if (LoadFileContents(filename, &fc, RETOUCH_DONT_MASK) != 0) {
ErrorAbort(state, "%s() loading \"%s\" failed: %s",
name, filename, strerror(errno));
free(filename); free(filename);
free(v); v->size = -1;
v->data = NULL;
free(fc.data); free(fc.data);
return NULL; return v;
} }
v->size = fc.size; v->size = fc.size;