From 03f9c6123ac5c283c4933cd292c68ea55b6b27c1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 5 Mar 2014 14:00:40 +0100 Subject: [PATCH] s3:smbd: simplify maxentries calculation in reply_search() Using helper variables make it much easier to understand. Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison (cherry picked from commit 734e1b65044a33eba01b41695502c2257c1a4d9e) --- source3/smbd/reply.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 91561256589..2dea74daf63 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1697,11 +1697,10 @@ void reply_search(struct smb_request *req) } } else { unsigned int i; - maxentries = MIN( - maxentries, - ((BUFFER_SIZE - - ((uint8 *)smb_buf(req->outbuf) + 3 - req->outbuf)) - /DIR_STRUCT_SIZE)); + size_t hdr_size = ((uint8_t *)smb_buf(req->outbuf) + 3 - req->outbuf); + size_t available_space = BUFFER_SIZE - hdr_size; + + maxentries = MIN(maxentries, available_space/DIR_STRUCT_SIZE); DEBUG(8,("dirpath=<%s> dontdescend=<%s>\n", directory,lp_dontdescend(ctx, SNUM(conn)))); -- 2.11.4.GIT