The branch, master has been updated via dee721af72e torture: Fix CID 1452288 Null pointer dereferences (NULL_RETURNS) via 77ae0429c91 lib: CID 1452289: API usage errors (USE_AFTER_FREE) via f1b749eebda smbd: Fix CID 1452290 Null pointer dereferences (REVERSE_INULL) via 02eb2c92252 smbd: Fix CID 1452291 Null pointer dereferences (NULL_RETURNS) via a3dad84630e librpc: Fix CID 1452292 Null pointer dereferences (REVERSE_INULL) from f2472f48f53 s3/pdb: fix debug message typos
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit dee721af72ec68f45c7a230ea0c1a0a3ebe1c7f6 Author: Volker Lendecke <v...@samba.org> Date: Wed Aug 14 08:41:03 2019 +0200 torture: Fix CID 1452288 Null pointer dereferences (NULL_RETURNS) Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Wed Aug 14 08:59:23 UTC 2019 on sn-devel-184 commit 77ae0429c91c03163eaf7545888a7ca7d76ace11 Author: Volker Lendecke <v...@samba.org> Date: Wed Aug 14 08:39:10 2019 +0200 lib: CID 1452289: API usage errors (USE_AFTER_FREE) Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> commit f1b749eebda720ecf97ed6016faeba7116e99996 Author: Volker Lendecke <v...@samba.org> Date: Wed Aug 14 08:37:00 2019 +0200 smbd: Fix CID 1452290 Null pointer dereferences (REVERSE_INULL) Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> commit 02eb2c9225287ac1fed740f68e014aff52ab5fc9 Author: Volker Lendecke <v...@samba.org> Date: Wed Aug 14 08:36:00 2019 +0200 smbd: Fix CID 1452291 Null pointer dereferences (NULL_RETURNS) Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> commit a3dad84630e58d380f5c735123fba7f67ce1d180 Author: Volker Lendecke <v...@samba.org> Date: Wed Aug 14 08:34:18 2019 +0200 librpc: Fix CID 1452292 Null pointer dereferences (REVERSE_INULL) Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/util/tiniparser.c | 1 - source3/smbd/dir.c | 3 ++- source3/smbd/dosmode.c | 2 +- source4/librpc/rpc/dcerpc_roh.c | 2 +- source4/torture/local/mdspkt.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/tiniparser.c b/lib/util/tiniparser.c index dbd1c058b0d..428ccff8a63 100644 --- a/lib/util/tiniparser.c +++ b/lib/util/tiniparser.c @@ -328,7 +328,6 @@ struct tiniparser_dictionary *tiniparser_load_stream(FILE *fp) d = malloc(sizeof(struct tiniparser_dictionary)); if (d == NULL) { - fclose(fp); return NULL; } d->section_list = NULL; diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 521cb60324e..f60812fd8c9 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -333,11 +333,12 @@ done: void dptr_CloseDir(files_struct *fsp) { - struct smbd_server_connection *sconn = fsp->dptr->conn->sconn; + struct smbd_server_connection *sconn = NULL; if (fsp->dptr == NULL) { return; } + sconn = fsp->dptr->conn->sconn; /* * The destructor for the struct smb_Dir (fsp->dptr->dir_hnd) diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index bdcdda69ac8..173b90d2cd0 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -922,7 +922,7 @@ static void dos_mode_at_vfs_get_dosmode_done(struct tevent_req *subreq) NULL, &state->smb_fname->st, 0); - if (tevent_req_nomem(path, req)) { + if (tevent_req_nomem(smb_path, req)) { return; } diff --git a/source4/librpc/rpc/dcerpc_roh.c b/source4/librpc/rpc/dcerpc_roh.c index 33baa52c618..3aa7551034a 100644 --- a/source4/librpc/rpc/dcerpc_roh.c +++ b/source4/librpc/rpc/dcerpc_roh.c @@ -609,7 +609,7 @@ static ssize_t tstream_roh_pending_bytes(struct tstream_context *stream) tstream = http_conn_tstream( ctx->roh_conn->default_channel_out->http_conn); - if (stream == NULL) { + if (tstream == NULL) { errno = ENOTCONN; return -1; } diff --git a/source4/torture/local/mdspkt.c b/source4/torture/local/mdspkt.c index a73c176e746..dd9c391e9e7 100644 --- a/source4/torture/local/mdspkt.c +++ b/source4/torture/local/mdspkt.c @@ -72,7 +72,7 @@ static bool test_mdspkt_empty_cnid_fm(struct torture_context *tctx) torture_assert_goto(tctx, ret, ret, done, "sl_unpack failed\n"); cnids = dalloc_get(d, "DALLOC_CTX", 0, "sl_cnids_t", 1); - torture_assert_not_null_goto(tctx, d, ret, done, + torture_assert_not_null_goto(tctx, cnids, ret, done, "dalloc_get cnids failed\n"); ncnids = dalloc_size(cnids->ca_cnids); -- Samba Shared Repository