summaryrefslogtreecommitdiff
path: root/source3/libsmb/clierror.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-08-28 01:56:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:54 -0500
commit6ee700bd65ea12bf172fce42adf332f6e30ab626 (patch)
tree8b99969c1ddb95af0457f89dacb724660dd099ff /source3/libsmb/clierror.c
parentfb0ed72caaf7cce0421008f1cddab1dbd4362214 (diff)
downloadsamba-6ee700bd65ea12bf172fce42adf332f6e30ab626.tar.gz
samba-6ee700bd65ea12bf172fce42adf332f6e30ab626.tar.bz2
samba-6ee700bd65ea12bf172fce42adf332f6e30ab626.zip
r17863: Fix unneeded NULL check on pointer parameters causing the
Stanford checker to flag null deref. Jeremy. (This used to be commit b7fc023e9025127855fab71002d556e5f84e00b4)
Diffstat (limited to 'source3/libsmb/clierror.c')
-rw-r--r--source3/libsmb/clierror.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index b84a8ee70f..44573bd29b 100644
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -201,8 +201,6 @@ NTSTATUS cli_nt_error(struct cli_state *cli)
void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode)
{
int flgs2;
- char rcls;
- int code;
if(!cli->initialised) {
return;
@@ -223,11 +221,8 @@ void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode)
return;
}
- rcls = CVAL(cli->inbuf,smb_rcls);
- code = SVAL(cli->inbuf,smb_err);
-
- if (eclass) *eclass = rcls;
- if (ecode) *ecode = code;
+ *eclass = CVAL(cli->inbuf,smb_rcls);
+ *ecode = SVAL(cli->inbuf,smb_err);
}
/* Return a UNIX errno from a NT status code */