From: Volker Lendecke <vl@samba.org>
Date: Fri, 16 Dec 2022 13:12:57 +0000 (+0100)
Subject: smbd: Use MIN() instead of explicit if-statement
X-Git-Tag: tdb-1.4.13~127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0adbd5fd2c0a0e48e4ea2a0a6b00c857b3076f6c;p=thirdparty%2Fsamba.git

smbd: Use MIN() instead of explicit if-statement

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/smb1_trans2.c b/source3/smbd/smb1_trans2.c
index 47a408d5075..8301e7f60a9 100644
--- a/source3/smbd/smb1_trans2.c
+++ b/source3/smbd/smb1_trans2.c
@@ -5550,10 +5550,10 @@ void reply_transs2(struct smb_request *req)
 	/* Revise state->total_param and state->total_data in case they have
 	   changed downwards */
 
-	if (SVAL(req->vwv+0, 0) < state->total_param)
-		state->total_param = SVAL(req->vwv+0, 0);
-	if (SVAL(req->vwv+1, 0) < state->total_data)
-		state->total_data = SVAL(req->vwv+1, 0);
+	state->total_param = MIN(PULL_LE_U16(req->vwv + 0, 0),
+				 state->total_param);
+	state->total_data = MIN(PULL_LE_U16(req->vwv + 1, 0),
+				state->total_data);
 
 	pcnt = SVAL(req->vwv+2, 0);
 	poff = SVAL(req->vwv+3, 0);