[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  6e8c643... s3: Fix a NULL pointer dereference
      from  12dc721... vfs_netatalk: Segfault if hide files or veto files has 
no ".AppleDouble"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 6e8c643688a323c9a68baa9f015cffec65d75115
Author: Volker Lendecke <v...@samba.org>
Date:   Tue Mar 9 11:14:14 2010 +0100

    s3: Fix a NULL pointer dereference
    
    Found by Laurent Gaffie <laurent.gaf...@gmail.com>.
    
    Thanks!
    
    Volker
    (cherry picked from commit 25452a2268ac7013da28125f3df22085139af12d)
    
    Fix bug #7229 (NULL pointer dereference).
    (cherry picked from commit bf40d130a1761daa14ce6a2cf3d02dbd9095c2b5)

-----------------------------------------------------------------------

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 b4976f7..2abea8f 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1604,6 +1604,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;
        }
 
@@ -1631,7 +1640,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