[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Mon Aug 30 15:07:06 MDT 2010
The branch, master has been updated
via 6beb556 s3: Fix a segfault in the printer code using create_conn_struct
from b4610cd s4:lib/messaging: add some const to messaging_send()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6beb5563f3464cf32109c9069b39a5cf71134321
Author: Volker Lendecke <vl at samba.org>
Date: Mon Aug 30 15:22:29 2010 +0200
s3: Fix a segfault in the printer code using create_conn_struct
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/conn.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index eaaddab..fffb5bf 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -321,7 +321,13 @@ void conn_free(connection_struct *conn)
DLIST_REMOVE(conn->sconn->smb1.tcons.Connections, conn);
- bitmap_clear(conn->sconn->smb1.tcons.bmap, conn->cnum);
+ if (conn->sconn->smb1.tcons.bmap != NULL) {
+ /*
+ * Can be NULL for fake connections created by
+ * create_conn_struct()
+ */
+ bitmap_clear(conn->sconn->smb1.tcons.bmap, conn->cnum);
+ }
SMB_ASSERT(conn->sconn->smb1.tcons.num_open > 0);
conn->sconn->smb1.tcons.num_open--;
--
Samba Shared Repository
More information about the samba-cvs
mailing list