drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-05-24 22:32:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

tpws : better gzip checking. fixing missing fclose

Browse Source
This commit is contained in:
bolvan
2019-05-10 08:47:23 +03:00
parent f8dd9f3d23
commit 5dd7834314
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tpws/gzip.c
View File

@@ -77,5 +77,7 @@ zerr:
bool is_gzip(FILE* F)
{
unsigned char magic[2];
return !fseek(F,0,SEEK_SET) && fread(magic, 1, 2, F)==2 && magic[0]==0x1F && magic[1]==0x8B;
bool b = !fseek(F,0,SEEK_SET) && fread(magic, 1, 2, F)==2 && magic[0]==0x1F && magic[1]==0x8B;
fseek(F,0,SEEK_SET);
return b;
}

48
tpws/hostlist.c
View File

@@ -41,40 +41,37 @@ bool LoadHostList(strpool **hostlist, char *filename)
fprintf(stderr, "Could not open %s\n", filename);
return false;
}
if ((r=z_readfile(F,&zbuf,&zsize))==Z_OK)
if (is_gzip(F))
{
printf("zlib compression detected. uncompressed size : %zu\n", zsize);
r = z_readfile(F,&zbuf,&zsize);
fclose(F);
p = zbuf;
e = zbuf + zsize;
while(p<e)
if (r==Z_OK)
{
if (!addpool(hostlist,&p,e))
printf("zlib compression detected. uncompressed size : %zu\n", zsize);
p = zbuf;
e = zbuf + zsize;
while(p<e)
{
fprintf(stderr, "Not enough memory to store host list : %s\n", filename);
free(zbuf);
return false;
if (!addpool(hostlist,&p,e))
{
fprintf(stderr, "Not enough memory to store host list : %s\n", filename);
free(zbuf);
return false;
}
ct++;
}
ct++;
free(zbuf);
}
else
{
fprintf(stderr, "zlib decompression failed : result %d\n",r);
return false;
}
free(zbuf);
}
else if (r!=Z_DATA_ERROR)
{
fprintf(stderr, "zlib decompression failed : result %d\n",r);
return false;
}
else
{
if (is_gzip(F))
{
fprintf(stderr, "hostlist is gzip but is broken : %s\n",filename);
return false;
}
fseek(F,0,SEEK_SET);
printf("loading plain text list\n",r);
while (fgets(s, 256, F))
@@ -90,6 +87,7 @@ bool LoadHostList(strpool **hostlist, char *filename)
}
fclose(F);
}
printf("Loaded %d hosts from %s\n", ct, filename);
return true;
}