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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  ca293af Fix bug #8341 - libsmbclient segfault when feed the root of a mounted share via an uri
      from  3932178 s3: dbwrap_ctdb.c: Fix bug #8303 #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue

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


- Log -----------------------------------------------------------------
commit ca293af1f06891dfd13171d418047e4fa8c4fc14
Author: Alban Browaeys <prahal at yahoo.com>
Date:   Mon Aug 1 16:40:22 2011 -0700

    Fix bug #8341 - libsmbclient segfault when feed the root of a mounted share via an uri
    
    Fix null deref.
    (cherry picked from commit cf0c36ab9a5129878b92a52d22aa814eaa737a4c)

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

Summary of changes:
 source3/libsmb/clifsinfo.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 94568c9..95973bb 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -472,6 +472,7 @@ NTSTATUS cli_get_posix_fs_info(struct cli_state *cli,
 	uint16 setup[1];
 	uint8_t param[2];
 	uint8_t *rdata = NULL;
+	uint32_t rdata_count;
 	NTSTATUS status;
 
 	SSVAL(setup, 0, TRANSACT2_QFSINFO);
@@ -484,7 +485,7 @@ NTSTATUS cli_get_posix_fs_info(struct cli_state *cli,
 			   NULL,
 			   NULL, 0, NULL, /* rsetup */
 			   NULL, 0, NULL, /* rparam */
-			   &rdata, 56, NULL);
+			   &rdata, 56, &rdata_count);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}


-- 
Samba Shared Repository