From: Andreas Schneider <asn@samba.org>
Date: Mon, 9 Dec 2019 09:47:46 +0000 (+0100)
Subject: s3:lib: Move NULL check before messaging_dgm_out_rearm_idle_timer()
X-Git-Tag: ldb-2.1.0~368
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adfdcc4791b9a5706c48789bfbb46f256ee10538;p=thirdparty%2Fsamba.git

s3:lib: Move NULL check before messaging_dgm_out_rearm_idle_timer()

We dereference out in messaging_dgm_out_rearm_idle_timer().

Found by covscan.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/lib/messages_dgm.c b/source3/lib/messages_dgm.c
index 11cb6969e73..661e032b908 100644
--- a/source3/lib/messages_dgm.c
+++ b/source3/lib/messages_dgm.c
@@ -322,7 +322,6 @@ static int messaging_dgm_out_get(struct messaging_dgm_context *ctx, pid_t pid,
 		}
 	}
 
-	messaging_dgm_out_rearm_idle_timer(out);
 	/*
 	 * shouldn't be possible, should be set if messaging_dgm_out_create
 	 * succeeded. This check is to satisfy static checker
@@ -330,6 +329,7 @@ static int messaging_dgm_out_get(struct messaging_dgm_context *ctx, pid_t pid,
 	if (out == NULL) {
 		return EINVAL;
 	}
+	messaging_dgm_out_rearm_idle_timer(out);
 
 	*pout = out;
 	return 0;