upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix #831: workaround for spurious fread_chk warning against petal.c

Browse source 
git-svn-id: file:///svn/unbound/trunk@3851 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-09-09 05:55:16 +00:00
parent 843300dec5
commit 2db3851430
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
9 September 2016: Wouter
- Fix #831: workaround for spurious fread_chk warning against petal.c
5 September 2016: Ralph 5 September 2016: Ralph
- Take configured minimum TTL into consideration when reducing TTL - Take configured minimum TTL into consideration when reducing TTL
to original TTL from RRSIG. to original TTL from RRSIG.

10
testcode/petal.c
View file

@ -429,6 +429,7 @@ static void
provide_file_chunked(SSL* ssl, char* fname) provide_file_chunked(SSL* ssl, char* fname)
{ {
char buf[16384]; char buf[16384];
char* tmpbuf = NULL;
char* at = buf; char* at = buf;
size_t avail = sizeof(buf); size_t avail = sizeof(buf);
size_t r; size_t r;
@ -471,9 +472,13 @@ provide_file_chunked(SSL* ssl, char* fname)
} }
do { 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)*/ /* 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 */ /* prepare chunk */
snprintf(at, avail, "%x\r\n", (unsigned)red); snprintf(at, avail, "%x\r\n", (unsigned)red);
r = strlen(at); r = strlen(at);
@ -514,6 +519,7 @@ provide_file_chunked(SSL* ssl, char* fname)
avail = sizeof(buf); avail = sizeof(buf);
} while(in && !feof(in) && !ferror(in)); } while(in && !feof(in) && !ferror(in));
free(tmpbuf);
if(in) fclose(in); if(in) fclose(in);
} }