[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Tue Mar 9 14:02:10 MST 2010
The branch, master has been updated
via 25452a2... s3: Fix a NULL pointer dereference
from c05d13d... s4:ldb fix escape parsing
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 25452a2268ac7013da28125f3df22085139af12d
Author: Volker Lendecke <vl at samba.org>
Date: Tue Mar 9 11:14:14 2010 +0100
s3: Fix a NULL pointer dereference
Found by Laurent Gaffie <laurent.gaffie at gmail.com>.
Thanks!
Volker
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/process.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 65bb25d..9a39779 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1810,6 +1810,15 @@ void chain_reply(struct smb_request *req)
*/
if ((req->wct < 2) || (CVAL(req->outbuf, smb_wct) < 2)) {
+ if (req->chain_outbuf == NULL) {
+ req->chain_outbuf = TALLOC_REALLOC_ARRAY(
+ req, req->outbuf, uint8_t,
+ smb_len(req->outbuf) + 4);
+ if (req->chain_outbuf == NULL) {
+ smb_panic("talloc failed");
+ }
+ }
+ req->outbuf = NULL;
goto error;
}
@@ -1837,7 +1846,7 @@ void chain_reply(struct smb_request *req)
req->chain_outbuf = TALLOC_REALLOC_ARRAY(
req, req->outbuf, uint8_t, smb_len(req->outbuf) + 4);
if (req->chain_outbuf == NULL) {
- goto error;
+ smb_panic("talloc failed");
}
req->outbuf = NULL;
} else {
--
Samba Shared Repository
More information about the samba-cvs
mailing list