mirror of
https://github.com/NLnetLabs/unbound.git
synced 2025-12-20 23:00:56 -05:00
- Fix #831: workaround for spurious fread_chk warning against petal.c
git-svn-id: file:///svn/unbound/trunk@3851 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
parent
843300dec5
commit
2db3851430
2 changed files with 11 additions and 2 deletions
|
|
@ -1,3 +1,6 @@
|
|||
9 September 2016: Wouter
|
||||
- Fix #831: workaround for spurious fread_chk warning against petal.c
|
||||
|
||||
5 September 2016: Ralph
|
||||
- Take configured minimum TTL into consideration when reducing TTL
|
||||
to original TTL from RRSIG.
|
||||
|
|
|
|||
|
|
@ -429,6 +429,7 @@ static void
|
|||
provide_file_chunked(SSL* ssl, char* fname)
|
||||
{
|
||||
char buf[16384];
|
||||
char* tmpbuf = NULL;
|
||||
char* at = buf;
|
||||
size_t avail = sizeof(buf);
|
||||
size_t r;
|
||||
|
|
@ -471,9 +472,13 @@ provide_file_chunked(SSL* ssl, char* fname)
|
|||
}
|
||||
|
||||
do {
|
||||
char tmpbuf[sizeof(buf)];
|
||||
size_t red;
|
||||
free(tmpbuf);
|
||||
tmpbuf = malloc(avail-16);
|
||||
if(!tmpbuf)
|
||||
break;
|
||||
/* read chunk; space-16 for xxxxCRLF..CRLF0CRLFCRLF (3 spare)*/
|
||||
size_t red = in?fread(tmpbuf, 1, avail-16, in):0;
|
||||
red = in?fread(tmpbuf, 1, avail-16, in):0;
|
||||
/* prepare chunk */
|
||||
snprintf(at, avail, "%x\r\n", (unsigned)red);
|
||||
r = strlen(at);
|
||||
|
|
@ -514,6 +519,7 @@ provide_file_chunked(SSL* ssl, char* fname)
|
|||
avail = sizeof(buf);
|
||||
} while(in && !feof(in) && !ferror(in));
|
||||
|
||||
free(tmpbuf);
|
||||
if(in) fclose(in);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue