picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

journal-upload: check for overflow 

CID 1394386
This commit is contained in:
Lennart Poettering 2018-10-12 18:59:23 +02:00
parent 0b2c35b812
commit c504106c35
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/journal-remote/journal-upload.c
View File

@ -280,8 +280,7 @@ int start_upload(Uploader *u,
static size_t fd_input_callback(void *buf, size_t size, size_t nmemb, void *userp) {
Uploader *u = userp;
ssize_t r;
ssize_t n;
assert(u);
assert(nmemb < SSIZE_MAX / size);
@ -289,21 +288,22 @@ static size_t fd_input_callback(void *buf, size_t size, size_t nmemb, void *user
if (u->input < 0)
return 0;
r = read(u->input, buf, size * nmemb);
log_debug("%s: allowed %zu, read %zd", __func__, size*nmemb, r);
assert(!size_multiply_overflow(size, nmemb));
if (r > 0)
return r;
n = read(u->input, buf, size * nmemb);
log_debug("%s: allowed %zu, read %zd", __func__, size*nmemb, n);
if (n > 0)
return n;
u->uploading = false;
if (r == 0) {
log_debug("Reached EOF");
close_fd_input(u);
return 0;
} else {
if (n < 0) {
log_error_errno(errno, "Aborting transfer after read error on input: %m.");
return CURL_READFUNC_ABORT;
}
log_debug("Reached EOF");
close_fd_input(u);
return 0;
}
static void close_fd_input(Uploader *u) {