diff options
| -rw-r--r-- | uclient-fetch.c | 16 | ||||
| -rw-r--r-- | uclient-http.c | 5 |
2 files changed, 15 insertions, 6 deletions
diff --git a/uclient-fetch.c b/uclient-fetch.c index 4c603fb..d9582f5 100644 --- a/uclient-fetch.c +++ b/uclient-fetch.c @@ -254,6 +254,7 @@ static void header_done_cb(struct uclient *cl) static void read_data_cb(struct uclient *cl) { char buf[256]; + ssize_t n; int len; if (!no_output && output_fd < 0) @@ -265,8 +266,11 @@ static void read_data_cb(struct uclient *cl) return; out_bytes += len; - if (!no_output) - write(output_fd, buf, len); + if (!no_output) { + n = write(output_fd, buf, len); + if (n < 0) + return; + } } } @@ -660,9 +664,11 @@ int main(int argc, char **argv) uloop_init(); if (username) { - if (password) - asprintf(&auth_str, "%s:%s", username, password); - else + if (password) { + rc = asprintf(&auth_str, "%s:%s", username, password); + if (rc < 0) + return rc; + } else auth_str = username; } diff --git a/uclient-http.c b/uclient-http.c index 8d26bd4..ac9d50f 100644 --- a/uclient-http.c +++ b/uclient-http.c @@ -379,11 +379,14 @@ get_cnonce(char *dest) { uint32_t val = 0; FILE *f; + size_t n; f = fopen("/dev/urandom", "r"); if (f) { - fread(&val, sizeof(val), 1, f); + n = fread(&val, sizeof(val), 1, f); fclose(f); + if (n != 1) + return; } bin_to_hex(dest, &val, sizeof(val)); |