From fba62c0966cf67ae7af93fdab0cd5bd1d1532b6f Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sat, 3 Nov 2001 18:04:01 +0000
Subject: [PATCH] Updated last_error entry for smb_getmsgtxt() if no VALID data
 fields exist for message.

---
 src/smblib/smbtxt.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/smblib/smbtxt.c b/src/smblib/smbtxt.c
index 78a30d1083..996396bc00 100644
--- a/src/smblib/smbtxt.c
+++ b/src/smblib/smbtxt.c
@@ -52,14 +52,10 @@ char HUGE16*  SMBCALL smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
 	char	HUGE16* lzhbuf;
 	char	HUGE16* p;
 	ushort	xlat;
-	int 	i,lzh;
+	uint 	i;
+	int		lzh;	/* BOOL */
 	long	l=0,lzhlen,length;
 
-	if(!msg->hdr.total_dfields) {
-		sprintf(smb->last_error,"no data fields");
-		return(NULL);
-	}
-
 	for(i=0;i<msg->hdr.total_dfields;i++) {
 		if(!(msg->dfield[i].type==TEXT_BODY
 			|| (mode&GETMSGTXT_TAILS && msg->dfield[i].type==TEXT_TAIL))
@@ -123,6 +119,10 @@ char HUGE16*  SMBCALL smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, ulong mode)
 		l++;
 		*(buf+l)=0; 
 	}
+
+	if(buf==NULL) 
+		sprintf(smb->last_error,"no data fields");
+
 	return(buf);
 }
 
-- 
GitLab