From: Volker Lendecke <vl@samba.org>
Date: Sun, 25 Jan 2009 19:32:59 +0000 (+0100)
Subject: Make smb_bytes_push_str deal with a NULL buf returning NULL
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=28b7c44de846930e5f7c9aae3a7a423368c03ae1

Make smb_bytes_push_str deal with a NULL buf returning NULL
---

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 7c7582641414..04bbabe0874e 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -783,10 +783,15 @@ int cli_nt_create(struct cli_state *cli, const char *fname, uint32 DesiredAccess
 
 uint8_t *smb_bytes_push_str(uint8_t *buf, bool ucs2, const char *str)
 {
-	size_t buflen = talloc_get_size(buf);
+	size_t buflen;
 	char *converted;
 	size_t converted_size;
 
+	if (buf == NULL) {
+		return NULL;
+	}
+
+	buflen = talloc_get_size(buf);
 	/*
 	 * We're pushing into an SMB buffer, align odd
 	 */