steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check return value of fread and fwrite in image.c

db4
Slava Pestov 2009-04-11 14:28:48 -05:00
parent e2c858da34
commit ef095f5eef
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
vm/image.c
View File

@ -86,7 +86,8 @@ void load_image(F_PARAMETERS *p)
}
F_HEADER h;
fread(&h,sizeof(F_HEADER),1,file);
if(fread(&h,sizeof(F_HEADER),1,file) != 1)
fatal_error("Cannot read image header",0);
if(h.magic != IMAGE_MAGIC)
fatal_error("Bad image: magic number check failed",h.magic);
@ -145,27 +146,19 @@ bool save_image(const F_CHAR *filename)
h.userenv[i] = userenv[i];
}
fwrite(&h,sizeof(F_HEADER),1,file);
bool ok = true;
if(fwrite((void*)tenured->start,h.data_size,1,file) != 1)
if(fwrite(&h,sizeof(F_HEADER),1,file) != 1) ok = false;
if(fwrite((void*)tenured->start,h.data_size,1,file) != 1) ok = false;
if(fwrite(first_block(&code_heap),h.code_size,1,file) != 1) ok = false;
if(fclose(file)) ok = false;
if(!ok)
{
print_string("Save data heap failed: "); print_string(strerror(errno)); nl();
return false;
print_string("save-image failed: "); print_string(strerror(errno)); nl();
}
if(fwrite(first_block(&code_heap),h.code_size,1,file) != 1)
{
print_string("Save code heap failed: "); print_string(strerror(errno)); nl();
return false;
}
if(fclose(file))
{
print_string("Failed to close image file: "); print_string(strerror(errno)); nl();
return false;
}
return true;
return ok;
}
void primitive_save_image(void)