sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

r15610: Fix Coverity #288 - possible null deref.

Browse Source 
Jeremy.
(This used to be commit b108ab7b122cc607f31772614b221379403b211b)
This commit is contained in:
Jeremy Allison 2006-05-15 04:51:46 +00:00 committed by Gerald (Jerry) Carter
parent bb4856b14a
commit f9480025b5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/libsmb/cliconnect.c
View File

@ -922,6 +922,7 @@ BOOL cli_ulogoff(struct cli_state *cli)
/****************************************************************************
Send a tconX.
****************************************************************************/
BOOL cli_send_tconX(struct cli_state *cli,
const char *share, const char *dev, const char *pass, int passlen)
{
@ -936,10 +937,13 @@ BOOL cli_send_tconX(struct cli_state *cli,
if (cli->sec_mode & NEGOTIATE_SECURITY_USER_LEVEL) {
passlen = 1;
pass = "";
} else if (!pass) {
DEBUG(1, ("Server not using user level security and no password supplied.\n"));
return False;
}
if ((cli->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) &&
pass && *pass && passlen != 24) {
*pass && passlen != 24) {
if (!lp_client_lanman_auth()) {
DEBUG(1, ("Server requested LANMAN password (share-level security) but 'client use lanman auth'"
" is disabled\n"));
@ -965,7 +969,9 @@ BOOL cli_send_tconX(struct cli_state *cli,
passlen = clistr_push(cli, pword, pass, sizeof(pword), STR_TERMINATE);
} else {
memcpy(pword, pass, passlen);
if (passlen) {
memcpy(pword, pass, passlen);
}
}
}
@ -980,7 +986,9 @@ BOOL cli_send_tconX(struct cli_state *cli,
SSVAL(cli->outbuf,smb_vwv3,passlen);
p = smb_buf(cli->outbuf);
memcpy(p,pword,passlen);
if (passlen) {
memcpy(p,pword,passlen);
}
p += passlen;
p += clistr_push(cli, p, fullshare, -1, STR_TERMINATE |STR_UPPER);
p += clistr_push(cli, p, dev, -1, STR_TERMINATE |STR_UPPER | STR_ASCII);