mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 17:52:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

deal with ftell errors and short reads (coverity 1230589 1230588)

Browse Source
This commit is contained in:
Vincent Sanders 2014-08-18 17:28:06 +01:00
parent ee3247f532
commit 20f99a8e96
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/viewdata.c
View File

@ -460,6 +460,7 @@ window_init_fname(const char *title,
nserror ret; nserror ret;
FILE *f; FILE *f;
char *ndata; char *ndata;
long tell_len;
size_t ndata_len; size_t ndata_len;
f = fopen(filename, "r"); f = fopen(filename, "r");
@ -471,17 +472,21 @@ window_init_fname(const char *title,
return NSERROR_BAD_SIZE; return NSERROR_BAD_SIZE;
} }
ndata_len = ftell(f); tell_len = ftell(f);
if (tell_len == -1) {
fclose(f);
return NSERROR_BAD_SIZE;
}
if (fseek(f, 0, SEEK_SET) != 0) { if (fseek(f, 0, SEEK_SET) != 0) {
fclose(f); fclose(f);
return NSERROR_BAD_SIZE; return NSERROR_BAD_SIZE;
} }
ndata = malloc(ndata_len); ndata = malloc(tell_len);
fread(ndata, 1, ndata_len, f);
ndata_len = fread(ndata, 1, tell_len, f);
fclose(f); fclose(f);
ret = window_init(title, leafname, ndata, ndata_len); ret = window_init(title, leafname, ndata, ndata_len);