From 9b5b4bed1778d16680d97b73a4555568d956e588 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 6 Feb 2019 16:17:59 +0100 Subject: [PATCH 1/2] pull: fix invalid error check This fixes a bug introduced by 0d94088e4e9e00f5ca9afdb8e68c94558fe23268. --- src/import/pull-job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/import/pull-job.c b/src/import/pull-job.c index a44e0a7eda..6881bd627f 100644 --- a/src/import/pull-job.c +++ b/src/import/pull-job.c @@ -537,7 +537,7 @@ int pull_job_new(PullJob **ret, const char *url, CurlGlue *glue, void *userdata) assert(ret); u = strdup(url); - if (u) + if (!u) return -ENOMEM; j = new(PullJob, 1); From 67577508d8de4169f3d62c23da0016a481ac096d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 6 Feb 2019 16:18:58 +0100 Subject: [PATCH 2/2] curl-util: fix use after free This fixes a bug introduced by c3e658004a66115fa09abcf602d573e65e577aa9. --- src/import/curl-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/import/curl-util.c b/src/import/curl-util.c index 360628fe44..7db03b2919 100644 --- a/src/import/curl-util.c +++ b/src/import/curl-util.c @@ -291,7 +291,7 @@ int curl_glue_make(CURL **ret, const char *url, void *userdata) { if (curl_easy_setopt(c, CURLOPT_FOLLOWLOCATION, 1L) != CURLE_OK) return -EIO; - *ret = c; + *ret = TAKE_PTR(c); return 0; }