From e916025f3247f80ad3e8dbbaf661f313c1dbfe14 Mon Sep 17 00:00:00 2001
From: Patrick Monnerat <patrick@monnerat.net>
Date: Wed, 13 Feb 2019 18:44:17 +0100
Subject: curl: "Dereference of null pointer"

Rephrase to satisfy scan-build.
---
 src/tool_formparse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/tool_formparse.c')

diff --git a/src/tool_formparse.c b/src/tool_formparse.c
index 537c6ca93..bba1d07e7 100644
--- a/src/tool_formparse.c
+++ b/src/tool_formparse.c
@@ -628,7 +628,7 @@ static int get_param_part(struct OperationConfig *config, char endchar,
 }
 #define SET_TOOL_MIME_PTR(m, field, retcode) {                          \
   if(field)                                                             \
-    NULL_CHECK(m->field, strdup(field), retcode);                       \
+    NULL_CHECK((m)->field, strdup(field), retcode);                     \
 }
 
 int formparse(struct OperationConfig *config,
@@ -651,7 +651,7 @@ int formparse(struct OperationConfig *config,
   CURLcode res;
 
   /* Allocate the main mime structure if needed. */
-  if(!*mimepost) {
+  if(!*mimecurrent) {
     NULL_CHECK(*mimepost, tool_mime_new_parts(NULL), 1);
     *mimecurrent = *mimepost;
   }
-- 
cgit v1.2.3