generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

formdata: ack read callback abort

Browse Source 
When doing a multipart formpost with a read callback, and that callback
returns CURL_READFUNC_ABORT, that return code must be properly
propagated back and handled accordingly. Previously it would be handled
as a zero byte read which would cause a hang!

Added test case 587 to verify. It uses the lib554.c source code with a
small ifdef.

Reported by: Anton Bychkov
Bug: http://curl.haxx.se/mail/lib-2011-10/0097.html
This commit is contained in:
Daniel Stenberg
2011-10-16 01:07:29 +02:00
parent ff03ee2a3c
commit 840eff44f2
4 changed files with 75 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/formdata.c
View File

@@ -855,10 +855,11 @@ int curl_formget(struct curl_httppost *form, void *arg,
do {
nread = readfromfile(&temp, buffer, sizeof(buffer));
if((nread == (size_t) -1) || (nread != append(arg, buffer, nread))) {
if(temp.fp) {
if((nread == (size_t) -1) ||
(nread > sizeof(buffer)) ||
(nread != append(arg, buffer, nread))) {
if(temp.fp)
fclose(temp.fp);
}
Curl_formclean(&data);
return -1;
}
@@ -1269,6 +1270,13 @@ int Curl_FormInit(struct Form *form, struct FormData *formdata )
return 0;
}
/*
* readfromfile()
*
* The read callback that this function may use can return a value larger than
* 'size' (which then this function returns) that indicates a problem and it
* must be properly dealt with
*/
static size_t readfromfile(struct Form *form, char *buffer,
size_t size)
{
@@ -1280,11 +1288,6 @@ static size_t readfromfile(struct Form *form, char *buffer,
return 0;
else
nread = form->fread_func(buffer, 1, size, form->data->line);
if(nread > size)
/* the read callback can return a value larger than the buffer but
treat any such as no data in this case */
nread = 0;
}
else {
if(!form->fp) {