Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[pschweitzer] 65142: [NTOSKRNL] Revert r65120... Which was reverting r65119... Which was reverting r65117... Which was reverting r65110... Which was reverting r65107... Which was reverting r65104! ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Oct 31 11:22:26 2014 New Revision: 65142 URL: http://svn.reactos.org/svn/reactos?rev=65142&view=rev Log: [NTOSKRNL] Revert r65120... Which was reverting r65119... Which was reverting r65117... Which was reverting r65110... Which was reverting r65107... Which was reverting r65104! To make it short? Fuck you IopParseDevice() hack! And this time, I hope this is the right one! I couldn't reproduce any of the previous issues in my WC. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Fri Oct 31 11:22:26 2014 @@ -419,7 +419,7 @@ DirectOpen = TRUE; } -#if 1 +#if 0 /* FIXME: Small hack still exists, have to check why... * This is triggered multiple times by usetup and then once per boot. */

9 years, 10 months

[pschweitzer] 65141: [NTOSKRNL] Some fixes and missing implementations in RawFS: - Remove some magic values for VCB state - Add a local VPB in our VCB. This will allow diverting the IO VPB with our...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Oct 31 11:17:43 2014 New Revision: 65141 URL: http://svn.reactos.org/svn/reactos?rev=65141&view=rev Log: [NTOSKRNL] Some fixes and missing implementations in RawFS: - Remove some magic values for VCB state - Add a local VPB in our VCB. This will allow diverting the IO VPB with ours in case of dismount (and thus, will fix dismount) - Implement support for said VPB in both RawCheckForDismount() and RawInitializeVcb() - Now, dismount is handled in RawCheckForDismount() directly, and not in functions calling it - Handle streams in RawClose - Handle VCB being dismounted in RawCreate() - Handle dismount also in RawCleanup() (not only in RawClose()) This fixes volume locking and dismounting in RawFS. And thus, allows FS swap in case of raw volume formating in first stage :-). More to follow! Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Fri Oct 31 11:17:43 2014 @@ -20,6 +20,7 @@ USHORT NodeByteSize; PDEVICE_OBJECT TargetDeviceObject; PVPB Vpb; + PVPB LocalVpb; ULONG VcbState; KMUTEX Mutex; CLONG OpenCount; @@ -34,19 +35,26 @@ VCB Vcb; } VOLUME_DEVICE_OBJECT, *PVOLUME_DEVICE_OBJECT; +#define VCB_STATE_LOCKED 0x00000001 +#define VCB_STATE_DISMOUNTED 0x00000002 + /* GLOBALS *******************************************************************/ PDEVICE_OBJECT RawDiskDeviceObject, RawCdromDeviceObject, RawTapeDeviceObject; /* FUNCTIONS *****************************************************************/ -VOID +NTSTATUS NTAPI RawInitializeVcb(IN OUT PVCB Vcb, IN PDEVICE_OBJECT TargetDeviceObject, IN PVPB Vpb) { - PAGED_CODE(); + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + DPRINT("RawInitializeVcb(%p, %p, %p)\n", Vcb, TargetDeviceObject, Vpb); /* Clear it */ RtlZeroMemory(Vcb, sizeof(VCB)); @@ -57,6 +65,14 @@ /* Initialize the lock */ KeInitializeMutex(&Vcb->Mutex, 0); + + Vcb->LocalVpb = ExAllocatePoolWithTag(NonPagedPool, sizeof(VPB), ' waR'); + if (Vcb->LocalVpb == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + + return Status; } BOOLEAN @@ -68,6 +84,10 @@ PVPB Vpb; BOOLEAN Delete; + DPRINT("RawCheckForDismount(%p, %lu)\n", Vcb, CreateOperation); + + ASSERT(KeReadStateMutant(&Vcb->Mutex) == 0); + /* Lock VPB */ IoAcquireVpbSpinLock(&OldIrql); @@ -75,6 +95,19 @@ Vpb = Vcb->Vpb; if (Vcb->Vpb->ReferenceCount != CreateOperation) { + /* Copy the VPB to our local own to prepare later dismount */ + if (Vcb->LocalVpb != NULL) + { + RtlZeroMemory(Vcb->LocalVpb, sizeof(VPB)); + Vcb->LocalVpb->Type = IO_TYPE_VPB; + Vcb->LocalVpb->Size = sizeof(VPB); + Vcb->LocalVpb->RealDevice = Vcb->Vpb->RealDevice; + Vcb->LocalVpb->DeviceObject = NULL; + Vcb->LocalVpb->Flags = Vcb->Vpb->Flags & VPB_REMOVE_PENDING; + Vcb->Vpb->RealDevice->Vpb = Vcb->LocalVpb; + Vcb->LocalVpb = NULL; + Vcb->Vpb->Flags |= VPB_PERSISTENT; + } /* Don't do anything */ Delete = FALSE; } @@ -93,6 +126,47 @@ /* Release lock and return status */ IoReleaseVpbSpinLock(OldIrql); + + /* If we were to delete, delete volume */ + if (Delete) + { + PVPB DelVpb; + + /* Release our Vcb lock to be able delete us */ + KeReleaseMutex(&Vcb->Mutex, 0); + + /* If we have a local VPB, we'll have to delete it + * but we won't dismount us - something went bad before + */ + if (Vcb->LocalVpb) + { + DelVpb = Vcb->LocalVpb; + } + /* Otherwise, dismount our device if possible */ + else + { + if (Vcb->Vpb->ReferenceCount) + { + ObfDereferenceObject(Vcb->TargetDeviceObject); + IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, + VOLUME_DEVICE_OBJECT, + Vcb)); + return Delete; + } + + DelVpb = Vcb->Vpb; + } + + /* Delete any of the available VPB and dismount */ + ExFreePool(DelVpb); + ObfDereferenceObject(Vcb->TargetDeviceObject); + IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, + VOLUME_DEVICE_OBJECT, + Vcb)); + + return Delete; + } + return Delete; } @@ -103,6 +177,8 @@ IN PVOID Context) { PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("RawCompletionRoutine(%p, %p, %p)\n", DeviceObject, Irp, Context); /* Check if this was a valid sync R/W request */ if (((IoStackLocation->MajorFunction == IRP_MJ_READ) || @@ -128,8 +204,17 @@ IN PIO_STACK_LOCATION IoStackLocation) { NTSTATUS Status; - BOOLEAN Deleted = FALSE; - PAGED_CODE(); + PAGED_CODE(); + + DPRINT("RawClose(%p, %p, %p)\n", Vcb, Irp, IoStackLocation); + + /* If its a stream, not much to do */ + if (IoStackLocation->FileObject->Flags & FO_STREAM_FILE) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; + } /* Make sure we can clean up */ Status = KeWaitForSingleObject(&Vcb->Mutex, @@ -141,16 +226,9 @@ /* Decrease the open count and check if this is a dismount */ Vcb->OpenCount--; - if (!Vcb->OpenCount) Deleted = RawCheckForDismount(Vcb, FALSE); - - /* Check if we should delete the device */ - KeReleaseMutex(&Vcb->Mutex, FALSE); - if (Deleted) - { - /* Delete it */ - IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, - VOLUME_DEVICE_OBJECT, - Vcb)); + if (!Vcb->OpenCount || !RawCheckForDismount(Vcb, FALSE)) + { + KeReleaseMutex(&Vcb->Mutex, FALSE); } /* Complete the request */ @@ -166,10 +244,12 @@ IN PIO_STACK_LOCATION IoStackLocation) { NTSTATUS Status; - BOOLEAN Deleted = FALSE; USHORT ShareAccess; ACCESS_MASK DesiredAccess; - PAGED_CODE(); + BOOLEAN Deleted = FALSE; + PAGED_CODE(); + + DPRINT("RawCreate(%p, %p, %p)\n", Vcb, Irp, IoStackLocation); /* Make sure we can clean up */ Status = KeWaitForSingleObject(&Vcb->Mutex, @@ -186,10 +266,16 @@ (!(IoStackLocation->Parameters.Create.Options & FILE_DIRECTORY_FILE))) { /* Make sure the VCB isn't locked */ - if (Vcb->VcbState & 1) + if (Vcb->VcbState & VCB_STATE_LOCKED) { /* Refuse the operation */ Status = STATUS_ACCESS_DENIED; + Irp->IoStatus.Information = 0; + } + else if (Vcb->VcbState & VCB_STATE_DISMOUNTED) + { + /* Refuse the operation */ + Status = STATUS_VOLUME_DISMOUNTED; Irp->IoStatus.Information = 0; } else @@ -247,23 +333,19 @@ if (!(NT_SUCCESS(Status)) && !(Vcb->OpenCount)) { /* Check if we can dismount the device */ - Deleted = RawCheckForDismount(Vcb, FALSE); - } - - /* Check if we should delete the device */ - KeReleaseMutex(&Vcb->Mutex, FALSE); - if (Deleted) - { - /* Delete it */ - IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, - VOLUME_DEVICE_OBJECT, - Vcb)); + Deleted = RawCheckForDismount(Vcb, TRUE); + } + + /* In case of deletion, the mutex is already released */ + if (!Deleted) + { + KeReleaseMutex(&Vcb->Mutex, FALSE); } /* Complete the request */ - Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_DISK_INCREMENT); - return STATUS_SUCCESS; + return Status; } NTSTATUS @@ -274,6 +356,8 @@ { NTSTATUS Status; PAGED_CODE(); + + DPRINT("RawReadWriteDeviceControl(%p, %p, %p)\n", Vcb, Irp, IoStackLocation); /* Don't do anything if the request was 0 bytes */ if (((IoStackLocation->MajorFunction == IRP_MJ_READ) || @@ -314,6 +398,8 @@ PVOLUME_DEVICE_OBJECT Volume; PFILE_OBJECT FileObject = NULL; PAGED_CODE(); + + DPRINT("RawMountVolume(%p)\n", IoStackLocation); /* Remember our owner */ DeviceObject = IoStackLocation->Parameters.MountVolume.DeviceObject; @@ -336,9 +422,14 @@ AlignmentRequirement); /* Setup the VCB */ - RawInitializeVcb(&Volume->Vcb, - IoStackLocation->Parameters.MountVolume.DeviceObject, - IoStackLocation->Parameters.MountVolume.Vpb); + Status = RawInitializeVcb(&Volume->Vcb, + IoStackLocation->Parameters.MountVolume.DeviceObject, + IoStackLocation->Parameters.MountVolume.Vpb); + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice((PDEVICE_OBJECT)Volume); + return Status; + } /* Set dummy label and serial number */ Volume->Vcb.Vpb->SerialNumber = 0xFFFFFFFF; @@ -390,6 +481,8 @@ { NTSTATUS Status; PAGED_CODE(); + + DPRINT("RawUserFsCtrl(%p, %p)\n", IoStackLocation, Vcb); /* Lock the device */ Status = KeWaitForSingleObject(&Vcb->Mutex, @@ -502,6 +595,8 @@ NTSTATUS Status; PAGED_CODE(); + DPRINT("RawFileSystemControl(%p, %p, %p)\n", Vcb, Irp, IoStackLocation); + /* Check the kinds of FSCTLs that we support */ switch (IoStackLocation->MinorFunction) { @@ -563,6 +658,8 @@ PFILE_POSITION_INFORMATION Buffer; PAGED_CODE(); + DPRINT("RawQueryInformation(%p, %p, %p)\n", Vcb, Irp, IoStackLocation); + /* Get information from the IRP */ Length = &IoStackLocation->Parameters.QueryFile.Length; Buffer = Irp->AssociatedIrp.SystemBuffer; @@ -608,6 +705,8 @@ PDEVICE_OBJECT DeviceObject; PAGED_CODE(); + DPRINT("RawSetInformation(%p, %p, %p)\n", Vcb, Irp, IoStackLocation); + /* Get information from the IRP */ Buffer = Irp->AssociatedIrp.SystemBuffer; @@ -649,6 +748,8 @@ IN OUT PULONG Length) { PAGED_CODE(); + + DPRINT("RawQueryFsVolumeInfo(%p, %p, %p)\n", Vcb, Buffer, Length); /* Clear the buffer and stub it out */ RtlZeroMemory( Buffer, sizeof(FILE_FS_VOLUME_INFORMATION)); @@ -676,6 +777,8 @@ PARTITION_INFORMATION PartitionInformation; BOOLEAN DiskHasPartitions; PAGED_CODE(); + + DPRINT("RawQueryFsSizeInfo(%p, %p, %p)\n", Vcb, Buffer, Length); /* Validate the buffer */ if (*Length < sizeof(FILE_FS_SIZE_INFORMATION)) @@ -806,6 +909,8 @@ { PAGED_CODE(); + DPRINT("RawQueryFsDeviceInfo(%p, %p, %p)\n", Vcb, Buffer, Length); + /* Validate buffer */ if (*Length < sizeof(FILE_FS_DEVICE_INFORMATION)) { @@ -832,6 +937,8 @@ const WCHAR szRawFSName[] = L"RAW"; ULONG ReturnLength; PAGED_CODE(); + + DPRINT("RawQueryFsAttributeInfo(%p, %p, %p)\n", Vcb, Buffer, Length); /* Check if the buffer is large enough for our name ("RAW") */ ReturnLength = FIELD_OFFSET(FILE_FS_ATTRIBUTE_INFORMATION, @@ -859,6 +966,8 @@ ULONG Length; PVOID Buffer; PAGED_CODE(); + + DPRINT("RawQueryVolumeInformation(%p, %p, %p)\n", Vcb, Irp, IoStackLocation); /* Get IRP Data */ Length = IoStackLocation->Parameters.QueryVolume.Length; @@ -915,6 +1024,8 @@ { NTSTATUS Status; PAGED_CODE(); + + DPRINT("RawCleanup(%p, %p, %p)\n", Vcb, Irp, IoStackLocation); /* Make sure we can clean up */ Status = KeWaitForSingleObject(&Vcb->Mutex, @@ -924,8 +1035,16 @@ NULL); ASSERT(NT_SUCCESS(Status)); - /* Remove shared access and complete the request */ + /* Remove shared access */ IoRemoveShareAccess(IoStackLocation->FileObject, &Vcb->ShareAccess); + + /* Check if we're to dismount */ + if (Vcb->VcbState & VCB_STATE_DISMOUNTED) + { + ASSERT(Vcb->OpenCount == 1); + RawCheckForDismount(Vcb, FALSE); + } + KeReleaseMutex(&Vcb->Mutex, FALSE); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_DISK_INCREMENT); @@ -941,6 +1060,8 @@ PIO_STACK_LOCATION IoStackLocation; PVCB Vcb; PAGED_CODE(); + + DPRINT("RawDispatch(%p, %p)\n", DeviceObject, Irp); /* Get the stack location */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp);

9 years, 10 months

[jgardou] 65140: [FASTFAT] - Fix renaming files in case the target file already exists. - Plug a few reference count leaks on FCBs. CORE-8660 #comment fixed in r65140 #resolve CORE-8633 #comment fi...

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Oct 31 11:04:12 2014 New Revision: 65140 URL: http://svn.reactos.org/svn/reactos?rev=65140&view=rev Log: [FASTFAT] - Fix renaming files in case the target file already exists. - Plug a few reference count leaks on FCBs. CORE-8660 #comment fixed in r65140 #resolve CORE-8633 #comment fixed in r65140 #resolve CORE-4758 #comment fixed in r65140 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Fri Oct 31 11:04:12 2014 @@ -92,6 +92,7 @@ pFcb->FileObject = NULL; CcUninitializeCacheMap(tmpFileObject, NULL, NULL); ObDereferenceObject(tmpFileObject); + vfatReleaseFCB(IrpContext->DeviceExt, pFcb); } CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Fri Oct 31 11:04:12 2014 @@ -365,7 +365,6 @@ DPRINT("'%wZ'\n", &FileObject->RelatedFileObject->FileName); *ParentFcb = FileObject->RelatedFileObject->FsContext; - vfatGrabFCB(DeviceExt, *ParentFcb); } else { Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Fri Oct 31 11:04:12 2014 @@ -396,41 +396,53 @@ /* If it exists */ if (NT_SUCCESS(Status)) { + DPRINT("Target file %wZ exists. FCB Flags %08x\n", NewName, TargetFcb->Flags); /* Check whether we are allowed to replace */ if (ReplaceIfExists) { /* If that's a directory or a read-only file, we're not allowed */ - if (vfatFCBIsDirectory(TargetFcb) || ((*TargetFcb->Attributes & FILE_ATTRIBUTE_READONLY) == FILE_ATTRIBUTE_READONLY)); - { + if (vfatFCBIsDirectory(TargetFcb) || ((*TargetFcb->Attributes & FILE_ATTRIBUTE_READONLY) == FILE_ATTRIBUTE_READONLY)) + { + DPRINT("And this is a readonly file!\n"); vfatReleaseFCB(DeviceExt, *ParentFCB); *ParentFCB = NULL; vfatReleaseFCB(DeviceExt, TargetFcb); return STATUS_OBJECT_NAME_COLLISION; } - /* Attempt to flush (might close the file) */ - if (!MmFlushImageSection(TargetFcb->FileObject->SectionObjectPointer, MmFlushForDelete)) - { + + /* If we still have a file object, close it. */ + if (TargetFcb->FileObject) + { + if (!MmFlushImageSection(TargetFcb->FileObject->SectionObjectPointer, MmFlushForDelete)) + { + DPRINT("MmFlushImageSection failed.\n"); + vfatReleaseFCB(DeviceExt, *ParentFCB); + *ParentFCB = NULL; + vfatReleaseFCB(DeviceExt, TargetFcb); + return STATUS_ACCESS_DENIED; + } + + TargetFcb->FileObject->DeletePending = TRUE; + VfatCloseFile(DeviceExt, TargetFcb->FileObject); + } + + /* If we are here, ensure the file isn't open by anyone! */ + if (TargetFcb->OpenHandleCount != 0) + { + DPRINT("There are still open handles for this file.\n"); vfatReleaseFCB(DeviceExt, *ParentFCB); *ParentFCB = NULL; vfatReleaseFCB(DeviceExt, TargetFcb); return STATUS_ACCESS_DENIED; } - /* If we are, ensure the file isn't open by anyone! */ - if (TargetFcb->OpenHandleCount != 0) - { - vfatReleaseFCB(DeviceExt, *ParentFCB); - *ParentFCB = NULL; - vfatReleaseFCB(DeviceExt, TargetFcb); - return STATUS_ACCESS_DENIED; - } - /* Effectively delete old file to allow renaming */ + DPRINT("Effectively deleting the file.\n"); VfatDelEntry(DeviceExt, TargetFcb, NULL); - vfatGrabFCB(DeviceExt, *ParentFCB); vfatReleaseFCB(DeviceExt, TargetFcb); *Deleted = TRUE; + return STATUS_SUCCESS; } else {

9 years, 10 months

[jgardou] 65139: [NTOS/SE] - Allocate the new ACL for the token with the right pool. Fixes google chrome BAD_POOL_CALLER bugcheck.

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Oct 31 11:03:56 2014 New Revision: 65139 URL: http://svn.reactos.org/svn/reactos?rev=65139&view=rev Log: [NTOS/SE] - Allocate the new ACL for the token with the right pool. Fixes google chrome BAD_POOL_CALLER bugcheck. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=65… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Fri Oct 31 11:03:56 2014 @@ -1909,8 +1909,20 @@ ExFreePoolWithTag(Token->DefaultDacl, TAG_TOKEN_ACL); } - /* Set the new dacl */ - Token->DefaultDacl = CapturedAcl; + Token->DefaultDacl = ExAllocatePoolWithTag(PagedPool, + CapturedAcl->AclSize, + TAG_TOKEN_ACL); + if (!Token->DefaultDacl) + { + ExFreePoolWithTag(CapturedAcl, TAG_ACL); + Status = STATUS_NO_MEMORY; + } + else + { + /* Set the new dacl */ + RtlCopyMemory(Token->DefaultDacl, CapturedAcl, CapturedAcl->AclSize); + ExFreePoolWithTag(CapturedAcl, TAG_ACL); + } } } else

9 years, 10 months

[akhaldi] 65138: [FTP] * Plug a leak. CID 513875. CORE-7975

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 31 10:40:48 2014 New Revision: 65138 URL: http://svn.reactos.org/svn/reactos?rev=65138&view=rev Log: [FTP] * Plug a leak. CID 513875. CORE-7975 Modified: trunk/reactos/base/applications/network/ftp/ftp.c Modified: trunk/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] Fri Oct 31 10:40:48 2014 @@ -674,6 +674,7 @@ null();// (void) signal(SIGPIPE, oldintp); if (!cpend) { code = -1; + (*closefunc)(fin); return; } if (data >= 0) {

9 years, 10 months

[akhaldi] 65137: [LOGOFF] * LocalFree should only be executed if AllocAndLoadString() succeeds. Spotted by Thomas Faber.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 31 10:24:48 2014 New Revision: 65137 URL: http://svn.reactos.org/svn/reactos?rev=65137&view=rev Log: [LOGOFF] * LocalFree should only be executed if AllocAndLoadString() succeeds. Spotted by Thomas Faber. Modified: trunk/reactos/base/applications/logoff/logoff.c Modified: trunk/reactos/base/applications/logoff/logoff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/logoff.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/logoff.c [iso-8859-1] Fri Oct 31 10:24:48 2014 @@ -89,9 +89,10 @@ } default: //Invalid parameter detected - if (AllocAndLoadString(&lpIllegalMsg, GetModuleHandle(NULL), IDS_ILLEGAL_PARAM)) - _putts(lpIllegalMsg); - LocalFree(lpIllegalMsg); + if (AllocAndLoadString(&lpIllegalMsg, GetModuleHandle(NULL), IDS_ILLEGAL_PARAM)) { + _putts(lpIllegalMsg); + LocalFree(lpIllegalMsg); + } return FALSE; } }

9 years, 10 months

[akhaldi] 65136: [IPCONFIG] * Plug some leaks. CIDs 716301 => 716305. CORE-7975

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 31 10:20:55 2014 New Revision: 65136 URL: http://svn.reactos.org/svn/reactos?rev=65136&view=rev Log: [IPCONFIG] * Plug some leaks. CIDs 716301 => 716305. CORE-7975 Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] Fri Oct 31 10:20:55 2014 @@ -232,6 +232,7 @@ } if (ConType) CharToOem(ConTypeTmp, ConType); + HeapFree(ProcessHeap, 0, ConTypeTmp); } } } @@ -366,6 +367,7 @@ (PBYTE)lpConDesc, &dwDataSize) != ERROR_SUCCESS) { + HeapFree(ProcessHeap, 0, lpConDesc); lpConDesc = NULL; goto CLEANUP; } @@ -382,9 +384,9 @@ RegCloseKey(hBaseKey); if (hClassKey != NULL) RegCloseKey(hClassKey); - if (lpConDesc != NULL) + if (lpPath != NULL) HeapFree(ProcessHeap, 0, lpPath); - if (lpConDesc != NULL) + if (lpKeyClass != NULL) HeapFree(ProcessHeap, 0, lpKeyClass); return lpConDesc; @@ -714,7 +716,9 @@ Size)) { _tprintf(_T("%s"), lpUsage); - } + } + + HeapFree(ProcessHeap, 0, lpUsage); } }

9 years, 10 months

[akhaldi] 65135: [FINGER] * Addendum to r37084. * Really fixes CIDs 500624 and 500625 which were marked as fixed. CORE-7975

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 31 09:53:18 2014 New Revision: 65135 URL: http://svn.reactos.org/svn/reactos?rev=65135&view=rev Log: [FINGER] * Addendum to r37084. * Really fixes CIDs 500624 and 500625 which were marked as fixed. CORE-7975 Modified: trunk/reactos/base/applications/network/finger/finger.c Modified: trunk/reactos/base/applications/network/finger/finger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/finger/finger.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/finger/finger.c [iso-8859-1] Fri Oct 31 09:53:18 2014 @@ -151,6 +151,8 @@ /* Tell the user that we couldn't find a usable */ /* WinSock DLL. */ fprintf(stderr, "WSAStartup failed\n"); + free(nargv); + free(used); return; }

9 years, 10 months

[akhaldi] 65134: [FINGER] * Plug a leak. CID 1102406. CORE-7975

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 31 09:43:48 2014 New Revision: 65134 URL: http://svn.reactos.org/svn/reactos?rev=65134&view=rev Log: [FINGER] * Plug a leak. CID 1102406. CORE-7975 Modified: trunk/reactos/base/applications/network/finger/net.c Modified: trunk/reactos/base/applications/network/finger/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/finger/net.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/finger/net.c [iso-8859-1] Fri Oct 31 09:43:48 2014 @@ -128,4 +128,5 @@ if (lastc != '\n') putchar('\n'); putchar('\n'); + (void)closesocket(s); }

9 years, 10 months

[akhaldi] 65133: [LOGOFF] * Plug some leaks. CIDs 716284 and 716285. CORE-7975

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 31 09:22:59 2014 New Revision: 65133 URL: http://svn.reactos.org/svn/reactos?rev=65133&view=rev Log: [LOGOFF] * Plug some leaks. CIDs 716284 and 716285. CORE-7975 Modified: trunk/reactos/base/applications/logoff/logoff.c Modified: trunk/reactos/base/applications/logoff/logoff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/logoff.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/logoff.c [iso-8859-1] Fri Oct 31 09:22:59 2014 @@ -30,6 +30,7 @@ if (AllocAndLoadString(&lpUsage, GetModuleHandle(NULL), IDS_USAGE)) { _putts(lpUsage); + LocalFree(lpUsage); } } @@ -90,6 +91,7 @@ //Invalid parameter detected if (AllocAndLoadString(&lpIllegalMsg, GetModuleHandle(NULL), IDS_ILLEGAL_PARAM)) _putts(lpIllegalMsg); + LocalFree(lpIllegalMsg); return FALSE; } }

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014