From: Volker Lendecke <vl@samba.org>
Date: Sun, 29 Oct 2023 11:10:08 +0000 (+0100)
Subject: smbd: Simplify fsp_fullbasepath()
X-Git-Tag: talloc-2.4.2~830
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=193df617;p=thirdparty%2Fsamba.git

smbd: Simplify fsp_fullbasepath()

Don't call snprintf() if not necessary.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 0c54ca37468..15cc7d82be1 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -2268,17 +2268,10 @@ NTSTATUS fsp_set_smb_fname(struct files_struct *fsp,
 size_t fsp_fullbasepath(struct files_struct *fsp, char *buf, size_t buflen)
 {
 	int len = 0;
-	char tmp_buf[1] = {'\0'};
 
-	/*
-	 * Don't pass NULL buffer to snprintf (to satisfy static checker)
-	 * Some callers will call this function with NULL for buf and
-	 * 0 for buflen in order to get length of fullbasepath (without
-	 * needing to allocate or write to buf)
-	 */
-	if (buf == NULL) {
-		buf = tmp_buf;
-		SMB_ASSERT(buflen==0);
+	if ((buf == NULL) || (buflen == 0)) {
+		return strlen(fsp->conn->connectpath) + 1 +
+		       strlen(fsp->fsp_name->base_name);
 	}
 
 	len = snprintf(buf, buflen, "%s/%s", fsp->conn->connectpath,