From ad0aa27a9dfd027ffb62b86dfe8a09feb0fee0d8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 11 Jan 2020 22:53:34 +0100 Subject: curl: remove 'config' field from OutStruct As it was just unnecessary duplicated information already stored in the 'per_transfer' struct and that's around mostly anyway. The duplicated pointer caused problems when the code flow was aborted before the dupe was filled in and could cause a NULL pointer access. Reported-by: Brian Carpenter Fixes #4807 Closes #4810 --- src/tool_cb_prg.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/tool_cb_prg.c') diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c index 505ae751f..9d16ec766 100644 --- a/src/tool_cb_prg.c +++ b/src/tool_cb_prg.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -123,8 +123,7 @@ int tool_progress_cb(void *clientp, struct timeval now = tvnow(); struct per_transfer *per = clientp; - struct OutStruct *outs = &per->outs; - struct OperationConfig *config = outs->config; + struct OperationConfig *config = per->config; struct ProgressData *bar = &per->progressbar; curl_off_t total; curl_off_t point; -- cgit v1.2.3