denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imc-os: Correctly check return value of ftell(2)

Browse Source
This commit is contained in:
Tobias Brunner
2016-03-11 15:23:17 +01:00
parent 755d076fec
commit 8c3bcebaa6
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/imc/imc_os_info.c
+9 -1
View File
@@ -383,6 +383,7 @@ static bool extract_platform_info(os_type_t *type, chunk_t *name,
FILE *file; FILE *file;
u_char buf[BUF_LEN], *pos = buf; u_char buf[BUF_LEN], *pos = buf;
int len = BUF_LEN - 1; int len = BUF_LEN - 1;
long file_len;
os_type_t os_type = OS_TYPE_UNKNOWN; os_type_t os_type = OS_TYPE_UNKNOWN;
chunk_t os_name = chunk_empty; chunk_t os_name = chunk_empty;
chunk_t os_version = chunk_empty; chunk_t os_version = chunk_empty;
@@ -425,7 +426,14 @@ static bool extract_platform_info(os_type_t *type, chunk_t *name,
/* read release file into buffer */ /* read release file into buffer */
fseek(file, 0, SEEK_END); fseek(file, 0, SEEK_END);
len = min(ftell(file), len); file_len = ftell(file);
if (file_len < 0)
{
DBG1(DBG_IMC, "failed to determine size of \"%s\"", releases[i]);
fclose(file);
return FALSE;
}
len = min(file_len, len);
rewind(file); rewind(file);
buf[len] = '\0'; buf[len] = '\0';
if (fread(buf, 1, len, file) != len) if (fread(buf, 1, len, file) != len)