sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

r21229: Don't indirect through a potentially null pointer :-).

Browse Source 
Jeremy.
(This used to be commit 6723f9d85ccb4883f15658aceb021b4c4a752edf)
This commit is contained in:
Jeremy Allison 2007-02-08 00:41:57 +00:00 committed by Gerald (Jerry) Carter
parent 50b3dbef68
commit b32efe921f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/smbd/trans2.c
View File

@ -2868,7 +2868,8 @@ static BOOL marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_
Store the FILE_UNIX_BASIC info.
****************************************************************************/
static char *store_file_unix_basic(char *pdata,
static char *store_file_unix_basic(connection_struct *conn,
char *pdata,
files_struct *fsp,
SMB_STRUCT_STAT *psbuf)
{
@ -2878,7 +2879,7 @@ static char *store_file_unix_basic(char *pdata,
SOFF_T(pdata,0,get_file_size(*psbuf)); /* File size 64 Bit */
pdata += 8;
SOFF_T(pdata,0,get_allocation_size(fsp->conn,fsp,psbuf)); /* Number of bytes used on disk - 64 Bit */
SOFF_T(pdata,0,get_allocation_size(conn,fsp,psbuf)); /* Number of bytes used on disk - 64 Bit */
pdata += 8;
put_long_date_timespec(pdata,get_ctimespec(psbuf)); /* Creation Time 64 Bit */
@ -3524,7 +3525,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
case SMB_QUERY_FILE_UNIX_BASIC:
pdata = store_file_unix_basic(pdata, fsp, &sbuf);
pdata = store_file_unix_basic(conn, pdata, fsp, &sbuf);
data_size = PTR_DIFF(pdata,(*ppdata));
{
@ -4932,7 +4933,7 @@ static NTSTATUS smb_posix_mkdir(connection_struct *conn,
if (info_level_return == SMB_QUERY_FILE_UNIX_BASIC) {
SSVAL(pdata,4,SMB_QUERY_FILE_UNIX_BASIC);
SSVAL(pdata,6,0); /* Padding. */
store_file_unix_basic(pdata + 8, fsp, psbuf);
store_file_unix_basic(conn, pdata + 8, fsp, psbuf);
} else {
SSVAL(pdata,4,SMB_NO_INFO_LEVEL_RETURNED);
SSVAL(pdata,6,0); /* Padding. */
@ -5098,7 +5099,7 @@ static NTSTATUS smb_posix_open(connection_struct *conn,
if (info_level_return == SMB_QUERY_FILE_UNIX_BASIC) {
SSVAL(pdata,4,SMB_QUERY_FILE_UNIX_BASIC);
SSVAL(pdata,6,0); /* padding. */
store_file_unix_basic(pdata + 8, fsp, psbuf);
store_file_unix_basic(conn, pdata + 8, fsp, psbuf);
} else {
SSVAL(pdata,4,SMB_NO_INFO_LEVEL_RETURNED);
SSVAL(pdata,6,0); /* padding. */