romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-30 10:17:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

rustls: make read_file_into not reject good files

Browse source 
For files with sizes using an exact multiple of 256 bytes, the final
successful read(s) filled the buffer(s) and the subsequent fread
returned 0 for EOF, which caused read_file_into to fail.

Now, it needs to return 0 and not be EOF to be an error.

Follow-up to dd95a49d49

Pointed out by ZeroPath
Closes #19104
This commit is contained in:
Daniel Stenberg 2025-10-17 17:05:08 +02:00
parent 373855a4da
commit e9455ea523
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/vtls/rustls.c
View file

@ -404,8 +404,8 @@ read_file_into(const char *filename,
for(;;) {
uint8_t buf[256];
const size_t rr = fread(buf, 1, sizeof(buf), f);
if(rr == 0 ||
CURLE_OK != curlx_dyn_addn(out, buf, rr)) {
if((!rr && !feof(f)) ||
curlx_dyn_addn(out, buf, rr)) {
curlx_fclose(f);
return 0;
}