Author: vlendec Date: 2007-08-06 21:03:03 +0000 (Mon, 06 Aug 2007) New Revision: 24254
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24254 Log: Fix a segfault in r24102 The really pure bugfix would have replaced pparam by *pparam, but we pulled the fid anyway. Metze, in line 2421 the FSP_BELONGS_CONN is commented out, is that intended? The FSCTL_CREATE_OR_GET_OBJECT_ID ioctl did not have it. Volker Modified: branches/SAMBA_3_2/source/smbd/nttrans.c Changeset: Modified: branches/SAMBA_3_2/source/smbd/nttrans.c =================================================================== --- branches/SAMBA_3_2/source/smbd/nttrans.c 2007-08-06 18:54:26 UTC (rev 24253) +++ branches/SAMBA_3_2/source/smbd/nttrans.c 2007-08-06 21:03:03 UTC (rev 24254) @@ -2415,7 +2415,7 @@ DEBUG(10,("call_nt_transact_ioctl: function[0x%08X] FID[0x%04X] isFSctl[0x%02X] compfilter[0x%02X]\n", function, fidnum, isFSctl, compfilter)); - fsp=file_fsp(SVAL(ppsetup, 4)); + fsp=file_fsp(fidnum); /* this check is done in each implemented function case for now because I don't want to break anything... --metze FSP_BELONGS_CONN(fsp,conn);*/ @@ -2441,6 +2441,8 @@ DEBUG(10,("FSCTL_CREATE_OR_GET_OBJECT_ID: called on FID[0x%04X]\n",fidnum)); + FSP_BELONGS_CONN(fsp, conn); + data_count = 64; pdata = nttrans_realloc(ppdata, data_count); if (pdata == NULL) {
