Avoid seeking when reading Android timezone identifier 'file'
This commit is contained in:
parent
0029f6cc1d
commit
af08701c10
@ -53,35 +53,42 @@ static UINT64 winpr_windows_gmtime(void)
|
||||
|
||||
static char* winpr_read_unix_timezone_identifier_from_file(FILE* fp)
|
||||
{
|
||||
INT64 length;
|
||||
char* tzid = NULL;
|
||||
|
||||
if (_fseeki64(fp, 0, SEEK_END) != 0)
|
||||
return NULL;
|
||||
|
||||
length = _ftelli64(fp);
|
||||
|
||||
if (_fseeki64(fp, 0, SEEK_SET) != 0)
|
||||
return NULL;
|
||||
|
||||
if (length < 2)
|
||||
return NULL;
|
||||
|
||||
tzid = (char*)malloc((size_t)length + 1);
|
||||
const INT CHUNK_SIZE = 32;
|
||||
INT64 rc, read = 0, length = CHUNK_SIZE;
|
||||
char *tmp, *tzid = NULL;
|
||||
|
||||
tzid = (char*)malloc(length);
|
||||
if (!tzid)
|
||||
return NULL;
|
||||
|
||||
if (fread(tzid, (size_t)length, 1, fp) != 1)
|
||||
do
|
||||
{
|
||||
rc = fread(tzid + read, 1, length - read - 1, fp);
|
||||
read += rc;
|
||||
|
||||
if (read < (length - 1))
|
||||
break;
|
||||
|
||||
length += CHUNK_SIZE;
|
||||
tmp = (char*)realloc(tzid, length);
|
||||
if (!tmp)
|
||||
{
|
||||
free(tzid);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
tzid = tmp;
|
||||
} while (rc > 0);
|
||||
|
||||
if (ferror(fp))
|
||||
{
|
||||
free(tzid);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
tzid[length] = '\0';
|
||||
|
||||
if (tzid[length - 1] == '\n')
|
||||
tzid[length - 1] = '\0';
|
||||
tzid[read] = '\0';
|
||||
if (tzid[read - 1] == '\n')
|
||||
tzid[read - 1] = '\0';
|
||||
|
||||
return tzid;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user