diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-03-07 19:52:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:11:02 -0500 |
| commit | 33c9fbab1278302dde1b0daf7ce6ac3462dc930c (patch) | |
| tree | 56340562932b898aafae4cf2b1746f7c49680208 /source3 | |
| parent | 4357ef3bd6d8f7c6b865dabe7de38e55027be029 (diff) | |
| download | samba-33c9fbab1278302dde1b0daf7ce6ac3462dc930c.tar.gz samba-33c9fbab1278302dde1b0daf7ce6ac3462dc930c.tar.bz2 samba-33c9fbab1278302dde1b0daf7ce6ac3462dc930c.zip | |
r13980: Fix Coverity bug # 63. Jeremy, could you take a look at this?
Thanks,
Volker
(This used to be commit 49043a756dfa6a973d5605f42068df351a4a9ab5)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/ipc.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c index 86c6d056a0..77746cb12f 100644 --- a/source3/smbd/ipc.c +++ b/source3/smbd/ipc.c @@ -380,7 +380,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int unsigned int dscnt = SVAL(inbuf,smb_vwv11); unsigned int dsoff = SVAL(inbuf,smb_vwv12); unsigned int suwcnt = CVAL(inbuf,smb_vwv13); - fstring local_machine_name; + char *local_machine_name; START_PROFILE(SMBtrans); memset(name, '\0',sizeof(name)); @@ -542,11 +542,22 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int * WinCE wierdness.... */ - fstrcpy( local_machine_name, get_local_machine_name() ); + asprintf(&local_machine_name, "\\%s\\", get_local_machine_name()); - if (name[0] == '\\' && (StrnCaseCmp(&name[1],local_machine_name, strlen(local_machine_name)) == 0) && - (name[strlen(local_machine_name)+1] == '\\')) - name_offset = strlen(local_machine_name)+1; + if (local_machine_name == NULL) { + srv_signing_trans_stop(); + SAFE_FREE(data); + SAFE_FREE(params); + SAFE_FREE(setup); + END_PROFILE(SMBtrans); + return ERROR_NT(NT_STATUS_NO_MEMORY); + } + + if (strnequal(name, local_machine_name, strlen(local_machine_name))) { + name_offset = strlen(local_machine_name)-1; + } + + SAFE_FREE(local_machine_name); if (strnequal(&name[name_offset], "\\PIPE", strlen("\\PIPE"))) { name_offset += strlen("\\PIPE"); |