moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-10 11:35:07 -05:00
Code Issues Releases Wiki Activity

tests/server/tftpd.c: close upload file in case of abort

Browse Source 
Commit c353207 removed the closing right after do_tftp
which covered the case of abort. This handles that case.

Reviewed-by: Jay Satiro
Reviewed-by: Daniel Stenberg

Follow up to #6209
Closes #6234
This commit is contained in:
Marc Hoersken 2020-11-24 20:49:09 +01:00
parent c7b02c5d68
commit 227daceabe
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/server/tftpd.c
View File

@ -1299,6 +1299,7 @@ send_ack:
} }
} while(size == SEGSIZE); } while(size == SEGSIZE);
write_behind(test, pf->f_convert); write_behind(test, pf->f_convert);
/* close the output file as early as possible after upload completion */
if(test->ofile > 0) { if(test->ofile > 0) {
close(test->ofile); close(test->ofile);
test->ofile = 0; test->ofile = 0;
@ -1325,6 +1326,11 @@ send_ack:
(void) swrite(peer, &ackbuf.storage[0], 4); /* resend final ack */ (void) swrite(peer, &ackbuf.storage[0], 4); /* resend final ack */
} }
abort: abort:
/* make sure the output file is closed in case of abort */
if(test->ofile > 0) {
close(test->ofile);
test->ofile = 0;
}
return; return;
} }