moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00
Code Issues Releases Wiki Activity

examples/http2-down/upload: add error checks

Browse Source 
If `index.html` does not exist in the directory from which the example
is invoked, the fopen(upload, "rb") invocation in `setup` would fail,
returning NULL.  This value is subsequently passed as the FILE* argument
of the `fread` invocation in the `read_callback` function, which is the
actual cause of the crash (apparently `fread` assumes that argument to
be non-null).

In addition, mitigate some possible crashes of similar origin.

Closes #5463
This commit is contained in:
Radoslav Georgiev 2020-05-26 19:42:07 +03:00 committed by Daniel Stenberg
parent 066b303231
commit abfd154efd
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/examples/http2-download.c
View File

@ -26,6 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h>
/* somewhat unix-specific */ /* somewhat unix-specific */
#include <sys/time.h> #include <sys/time.h>
@ -33,6 +34,7 @@
/* curl stuff */ /* curl stuff */
#include <curl/curl.h> #include <curl/curl.h>
#include <curl/mprintf.h>
#ifndef CURLPIPE_MULTIPLEX #ifndef CURLPIPE_MULTIPLEX
/* This little trick will just make sure that we don't enable pipelining for /* This little trick will just make sure that we don't enable pipelining for
@ -146,9 +148,14 @@ static void setup(struct transfer *t, int num)
hnd = t->easy = curl_easy_init(); hnd = t->easy = curl_easy_init();
snprintf(filename, 128, "dl-%d", num); curl_msnprintf(filename, 128, "dl-%d", num);
t->out = fopen(filename, "wb"); t->out = fopen(filename, "wb");
if(!t->out) {
fprintf(stderr, "error: could not open file %s for writing: %s\n",
filename, strerror(errno));
exit(1);
}
/* write to this file */ /* write to this file */
curl_easy_setopt(hnd, CURLOPT_WRITEDATA, t->out); curl_easy_setopt(hnd, CURLOPT_WRITEDATA, t->out);

27
docs/examples/http2-upload.c
View File

@ -28,6 +28,7 @@
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h>
/* somewhat unix-specific */ /* somewhat unix-specific */
#include <sys/time.h> #include <sys/time.h>
@ -35,6 +36,7 @@
/* curl stuff */ /* curl stuff */
#include <curl/curl.h> #include <curl/curl.h>
#include <curl/mprintf.h>
#ifndef CURLPIPE_MULTIPLEX #ifndef CURLPIPE_MULTIPLEX
/* This little trick will just make sure that we don't enable pipelining for /* This little trick will just make sure that we don't enable pipelining for
@ -123,8 +125,8 @@ int my_trace(CURL *handle, curl_infotype type,
} }
secs = epoch_offset + tv.tv_sec; secs = epoch_offset + tv.tv_sec;
now = localtime(&secs); /* not thread safe but we don't care */ now = localtime(&secs); /* not thread safe but we don't care */
snprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d.%06ld", curl_msnprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d.%06ld",
now->tm_hour, now->tm_min, now->tm_sec, (long)tv.tv_usec); now->tm_hour, now->tm_min, now->tm_sec, (long)tv.tv_usec);
switch(type) { switch(type) {
case CURLINFO_TEXT: case CURLINFO_TEXT:
@ -176,16 +178,31 @@ static void setup(struct input *i, int num, const char *upload)
hnd = i->hnd = curl_easy_init(); hnd = i->hnd = curl_easy_init();
i->num = num; i->num = num;
snprintf(filename, 128, "dl-%d", num); curl_msnprintf(filename, 128, "dl-%d", num);
out = fopen(filename, "wb"); out = fopen(filename, "wb");
if(!out) {
fprintf(stderr, "error: could not open file %s for writing: %s\n", upload,
strerror(errno));
exit(1);
}
snprintf(url, 256, "https://localhost:8443/upload-%d", num); curl_msnprintf(url, 256, "https://localhost:8443/upload-%d", num);
/* get the file size of the local file */ /* get the file size of the local file */
stat(upload, &file_info); if(stat(upload, &file_info)) {
fprintf(stderr, "error: could not stat file %s: %s\n", upload,
strerror(errno));
exit(1);
}
uploadsize = file_info.st_size; uploadsize = file_info.st_size;
i->in = fopen(upload, "rb"); i->in = fopen(upload, "rb");
if(!i->in) {
fprintf(stderr, "error: could not open file %s for reading: %s\n", upload,
strerror(errno));
exit(1);
}
/* write to this file */ /* write to this file */
curl_easy_setopt(hnd, CURLOPT_WRITEDATA, out); curl_easy_setopt(hnd, CURLOPT_WRITEDATA, out);