Author: jra Date: 2007-04-23 21:40:54 +0000 (Mon, 23 Apr 2007) New Revision: 22493
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22493 Log: Fix horrible memory corruption bug with CIFS POSIX open/mkidr. Found by SteveF + valgrind :-). Jerry - essential for rc3. Jeremy. Modified: branches/SAMBA_3_0/source/smbd/trans2.c branches/SAMBA_3_0_25/source/smbd/trans2.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/trans2.c =================================================================== --- branches/SAMBA_3_0/source/smbd/trans2.c 2007-04-23 21:07:05 UTC (rev 22492) +++ branches/SAMBA_3_0/source/smbd/trans2.c 2007-04-23 21:40:54 UTC (rev 22493) @@ -5434,6 +5434,7 @@ *pdata_return_size = 0; return NT_STATUS_NO_MEMORY; } + pdata = *ppdata; SSVAL(pdata,0,NO_OPLOCK_RETURN); SSVAL(pdata,2,0); /* No fnum. */ @@ -5610,6 +5611,7 @@ *pdata_return_size = 0; return NT_STATUS_NO_MEMORY; } + pdata = *ppdata; if (extended_oplock_granted) { if (flags & REQUEST_BATCH_OPLOCK) { Modified: branches/SAMBA_3_0_25/source/smbd/trans2.c =================================================================== --- branches/SAMBA_3_0_25/source/smbd/trans2.c 2007-04-23 21:07:05 UTC (rev 22492) +++ branches/SAMBA_3_0_25/source/smbd/trans2.c 2007-04-23 21:40:54 UTC (rev 22493) @@ -5382,6 +5382,7 @@ *pdata_return_size = 0; return NT_STATUS_NO_MEMORY; } + pdata = *ppdata; SSVAL(pdata,0,NO_OPLOCK_RETURN); SSVAL(pdata,2,0); /* No fnum. */ @@ -5558,6 +5559,7 @@ *pdata_return_size = 0; return NT_STATUS_NO_MEMORY; } + pdata = *ppdata; if (extended_oplock_granted) { if (flags & REQUEST_BATCH_OPLOCK) {
