Skip to content
Snippets Groups Projects
Commit b5c5630c authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

More detail in error strings in smb_getmsghdr()

parent 2ee37e4e
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #4256 passed
...@@ -1058,9 +1058,9 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) ...@@ -1058,9 +1058,9 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg)
} }
msg->hfield=vp; msg->hfield=vp;
if(smb_fread(smb,&msg->hfield[i],sizeof(hfield_t),smb->shd_fp)!=sizeof(hfield_t)) { if(smb_fread(smb,&msg->hfield[i],sizeof(hfield_t),smb->shd_fp)!=sizeof(hfield_t)) {
smb_freemsgmem(msg);
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%s reading header field", __FUNCTION__); ,"%s reading header field (#%d)", __FUNCTION__, (int)i);
smb_freemsgmem(msg);
return(SMB_ERR_READ); return(SMB_ERR_READ);
} }
l+=sizeof(hfield_t); l+=sizeof(hfield_t);
...@@ -1077,9 +1077,9 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) ...@@ -1077,9 +1077,9 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg)
if(msg->hfield[i].length if(msg->hfield[i].length
&& smb_fread(smb,msg->hfield_dat[i],msg->hfield[i].length,smb->shd_fp) && smb_fread(smb,msg->hfield_dat[i],msg->hfield[i].length,smb->shd_fp)
!=(size_t)msg->hfield[i].length) { !=(size_t)msg->hfield[i].length) {
smb_freemsgmem(msg);
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%s reading header field data", __FUNCTION__); ,"%s reading header (#%d) field data (%d bytes)", __FUNCTION__, (int)i, (int)msg->hfield[i].length);
smb_freemsgmem(msg);
return(SMB_ERR_READ); return(SMB_ERR_READ);
} }
set_convenience_ptr(msg,msg->hfield[i].type,msg->hfield[i].length,msg->hfield_dat[i]); set_convenience_ptr(msg,msg->hfield[i].type,msg->hfield[i].length,msg->hfield_dat[i]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment