Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 54040: [NTOSKRNL] - Fix symbolic link creation with a reference string - Audio devices start successfully again (sound still seems to be regressed however)
by cgutman＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: cgutman Date: Fri Oct 7 03:13:58 2011 New Revision: 54040 URL: http://svn.reactos.org/svn/reactos?rev=54040&view=rev Log: [NTOSKRNL] - Fix symbolic link creation with a reference string - Audio devices start successfully again (sound still seems to be regressed however) Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Fri Oct 7 03:13:58 2011 @@ -887,7 +887,7 @@ ULONG StartIndex; OBJECT_ATTRIBUTES ObjectAttributes; ULONG i; - NTSTATUS Status; + NTSTATUS Status, SymLinkStatus; PEXTENDED_DEVOBJ_EXTENSION DeviceObjectExtension; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -1137,25 +1137,19 @@ } RtlAppendUnicodeToString(SymbolicLinkName, L"#"); RtlAppendUnicodeStringToString(SymbolicLinkName, &GuidString); - - if (ReferenceString && ReferenceString->Length) - { - RtlAppendUnicodeToString(SymbolicLinkName, L"\\"); - RtlAppendUnicodeStringToString(SymbolicLinkName, ReferenceString); - } SymbolicLinkName->Buffer[SymbolicLinkName->Length/sizeof(WCHAR)] = L'\0'; - /* Write symbolic link name in registry */ - SymbolicLinkName->Buffer[1] = '\\'; - Status = ZwSetValueKey(SubKey, - &SymbolicLink, - 0, /* TileIndex */ - REG_SZ, - SymbolicLinkName->Buffer, - SymbolicLinkName->Length); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwSetValueKey() failed with status 0x%08lx\n", Status); + /* Create symbolic link */ + DPRINT("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); + SymLinkStatus = IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); + + /* If the symbolic link already exists, return an informational success status */ + if (SymLinkStatus == STATUS_OBJECT_NAME_COLLISION) + SymLinkStatus = STATUS_OBJECT_NAME_EXISTS; + + if (!NT_SUCCESS(SymLinkStatus)) + { + DPRINT1("IoCreateSymbolicLink() failed with status 0x%08lx\n", SymLinkStatus); ZwClose(SubKey); ZwClose(InterfaceKey); ZwClose(ClassKey); @@ -1163,26 +1157,33 @@ ExFreePool(InterfaceKeyName.Buffer); ExFreePool(BaseKeyName.Buffer); ExFreePool(SymbolicLinkName->Buffer); - return Status; + return SymLinkStatus; + } + + if (ReferenceString && ReferenceString->Length) + { + RtlAppendUnicodeToString(SymbolicLinkName, L"\\"); + RtlAppendUnicodeStringToString(SymbolicLinkName, ReferenceString); + } + SymbolicLinkName->Buffer[SymbolicLinkName->Length/sizeof(WCHAR)] = L'\0'; + + /* Write symbolic link name in registry */ + SymbolicLinkName->Buffer[1] = '\\'; + Status = ZwSetValueKey( + SubKey, + &SymbolicLink, + 0, /* TileIndex */ + REG_SZ, + SymbolicLinkName->Buffer, + SymbolicLinkName->Length); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwSetValueKey() failed with status 0x%08lx\n", Status); + ExFreePool(SymbolicLinkName->Buffer); } else { SymbolicLinkName->Buffer[1] = '?'; - } - - /* Create symbolic link */ - DPRINT("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); - Status = IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); - - /* If the symbolic link already exists, return an informational success status */ - if (Status == STATUS_OBJECT_NAME_COLLISION) - Status = STATUS_OBJECT_NAME_EXISTS; - - /* Check if it really failed */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoCreateSymbolicLink() failed with status 0x%08lx\n", Status); - ExFreePool(SymbolicLinkName->Buffer); } ZwClose(SubKey); @@ -1192,7 +1193,7 @@ ExFreePool(InterfaceKeyName.Buffer); ExFreePool(BaseKeyName.Buffer); - return Status; + return NT_SUCCESS(Status) ? SymLinkStatus : Status; } /*++

1 0

[jimtabor] 54039: - Add new CreateWindowEx flags.
by jimtabor＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: jimtabor Date: Fri Oct 7 01:18:29 2011 New Revision: 54039 URL: http://svn.reactos.org/svn/reactos?rev=54039&view=rev Log: - Add new CreateWindowEx flags. Modified: trunk/reactos/include/reactos/undocuser.h Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Fri Oct 7 01:18:29 2011 @@ -54,6 +54,10 @@ #define DCX_KEEPCLIPRGN 0x00040000 #define DCX_KEEPLAYOUT 0x40000000 #define DCX_PROCESSOWNED 0x80000000 + +/* NtUserCreateWindowEx dwFlags bits. */ +#define NUCWE_ANSI 0x00000001 +#define NUCWE_SIDEBYSIDE 0x40000000 /* Caret timer ID */ #define IDCARETTIMER (0xffff)

1 0

[tfaber] 54038: [SETUPAPI] - Implement a FIXME in SetupDiOpenDeviceInfoW
by tfaber＠svn.reactos.org 06 Oct '11

06 Oct '11

Author: tfaber Date: Thu Oct 6 22:34:45 2011 New Revision: 54038 URL: http://svn.reactos.org/svn/reactos?rev=54038&view=rev Log: [SETUPAPI] - Implement a FIXME in SetupDiOpenDeviceInfoW Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Thu Oct 6 22:34:45 2011 @@ -4826,10 +4826,10 @@ PLIST_ENTRY ItemList = list->ListHead.Flink; while (ItemList != &list->ListHead) { - // TODO - //if (good one) - // break; - FIXME("not implemented\n"); + deviceInfo = CONTAINING_RECORD(ItemList, struct DeviceInfo, ListEntry); + if (!wcscmp(deviceInfo->instanceId, DeviceInstanceId)) + break; + deviceInfo = NULL; ItemList = ItemList->Flink; }

1 0

[tfaber] 54037: [SETUPAPI] - Do not fail in SetupDiInstallDevice if the inf file already exists. Fixes VirtualBox 4.1.x additions See issue #6522 for more details.
by tfaber＠svn.reactos.org 06 Oct '11

06 Oct '11

Author: tfaber Date: Thu Oct 6 22:33:06 2011 New Revision: 54037 URL: http://svn.reactos.org/svn/reactos?rev=54037&view=rev Log: [SETUPAPI] - Do not fail in SetupDiInstallDevice if the inf file already exists. Fixes VirtualBox 4.1.x additions See issue #6522 for more details. Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Thu Oct 6 22:33:06 2011 @@ -5471,7 +5471,7 @@ NewFileName, MAX_PATH, NULL, NULL); - if (!Result) + if (!Result && GetLastError() != ERROR_FILE_EXISTS) goto cleanup; /* Create a new struct InfFileDetails, and set it to * SelectedDriver->InfFileDetails, to release use of

1 0

[tfaber] 54036: [SETUPAPI] - Correctly interpret the result of compare_files in SetupCopyOEMInfW. Prevents random failures
by tfaber＠svn.reactos.org 06 Oct '11

06 Oct '11

Author: tfaber Date: Thu Oct 6 22:31:29 2011 New Revision: 54036 URL: http://svn.reactos.org/svn/reactos?rev=54036&view=rev Log: [SETUPAPI] - Correctly interpret the result of compare_files in SetupCopyOEMInfW. Prevents random failures Modified: trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Thu Oct 6 22:31:29 2011 @@ -2408,7 +2408,7 @@ { if (GetFileSizeEx(hDestFile, &DestFileSize) && DestFileSize.QuadPart == SourceFileSize.QuadPart - && compare_files(hSourceFile, hDestFile)) + && !compare_files(hSourceFile, hDestFile)) { TRACE("%s already exists as %s\n", debugstr_w(SourceInfFileName), debugstr_w(pFileName));

1 0

[cgutman] 54035: [HALACPI] - Work around a race condition related to devices reported before the I/O subsystem is fully up - Fixes bug #6271
by cgutman＠svn.reactos.org 06 Oct '11

06 Oct '11

Author: cgutman Date: Thu Oct 6 21:50:07 2011 New Revision: 54035 URL: http://svn.reactos.org/svn/reactos?rev=54035&view=rev Log: [HALACPI] - Work around a race condition related to devices reported before the I/O subsystem is fully up - Fixes bug #6271 Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halpnpdd.c… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Thu Oct 6 21:50:07 2011 @@ -50,6 +50,59 @@ /* PRIVATE FUNCTIONS **********************************************************/ +VOID +NTAPI +HalpReportDetectedDevices(IN PDRIVER_OBJECT DriverObject, + IN PVOID Context, + IN ULONG Count) +{ + PFDO_EXTENSION FdoExtension = Context; + PPDO_EXTENSION PdoExtension; + PDEVICE_OBJECT PdoDeviceObject; + NTSTATUS Status; + PDESCRIPTION_HEADER Wdrt; + + /* Create the PDO */ + Status = IoCreateDevice(DriverObject, + sizeof(PDO_EXTENSION), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &PdoDeviceObject); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); + return; + } + + /* Setup the PDO device extension */ + PdoExtension = PdoDeviceObject->DeviceExtension; + PdoExtension->ExtensionType = PdoExtensionType; + PdoExtension->PhysicalDeviceObject = PdoDeviceObject; + PdoExtension->ParentFdoExtension = FdoExtension; + PdoExtension->PdoType = AcpiPdo; + + /* Add the PDO to the head of the list */ + PdoExtension->Next = FdoExtension->ChildPdoList; + FdoExtension->ChildPdoList = PdoExtension; + + /* Initialization is finished */ + PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* Find the ACPI watchdog table */ + Wdrt = HalAcpiGetTable(0, 'TRDW'); + if (Wdrt) + { + /* FIXME: TODO */ + DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); + } + + /* Invalidate device relations since we added a new device */ + IoInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); +} + NTSTATUS NTAPI HalpAddDevice(IN PDRIVER_OBJECT DriverObject, @@ -57,9 +110,7 @@ { NTSTATUS Status; PFDO_EXTENSION FdoExtension; - PPDO_EXTENSION PdoExtension; - PDEVICE_OBJECT DeviceObject, PdoDeviceObject, AttachedDevice; - PDESCRIPTION_HEADER Wdrt; + PDEVICE_OBJECT DeviceObject, AttachedDevice; DPRINT("HAL: PnP Driver ADD!\n"); /* Create the FDO */ @@ -95,49 +146,14 @@ IoDeleteDevice(DeviceObject); return STATUS_NO_SUCH_DEVICE; } - + /* Save the attachment */ FdoExtension->AttachedDeviceObject = AttachedDevice; - - /* Create the PDO */ - Status = IoCreateDevice(DriverObject, - sizeof(PDO_EXTENSION), - NULL, - FILE_DEVICE_BUS_EXTENDER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &PdoDeviceObject); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); - return Status; - } - - /* Setup the PDO device extension */ - PdoExtension = PdoDeviceObject->DeviceExtension; - PdoExtension->ExtensionType = PdoExtensionType; - PdoExtension->PhysicalDeviceObject = PdoDeviceObject; - PdoExtension->ParentFdoExtension = FdoExtension; - PdoExtension->PdoType = AcpiPdo; - - /* Add the PDO to the head of the list */ - PdoExtension->Next = FdoExtension->ChildPdoList; - FdoExtension->ChildPdoList = PdoExtension; - - /* Initialization is finished */ - PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - /* Find the ACPI watchdog table */ - Wdrt = HalAcpiGetTable(0, 'TRDW'); - if (Wdrt) - { - /* FIXME: TODO */ - DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); - } - - /* Invalidate device relations since we added a new device */ - IoInvalidateDeviceRelations(TargetDevice, BusRelations); + + /* Register for reinitialization to report devices later */ + IoRegisterDriverReinitialization(DriverObject, + HalpReportDetectedDevices, + FdoExtension); /* Return status */ DPRINT("Device added %lx\n", Status);

1 0

[pschweitzer] 54034: [REGEXPL] Fix memory leaks Fix broken if condition Use delete[] operator for allocations made with new[] operator Properly check for failed allocations by not throwing exception
by pschweitzer＠svn.reactos.org 06 Oct '11

06 Oct '11

Author: pschweitzer Date: Thu Oct 6 21:36:10 2011 New Revision: 54034 URL: http://svn.reactos.org/svn/reactos?rev=54034&view=rev Log: [REGEXPL] Fix memory leaks Fix broken if condition Use delete[] operator for allocations made with new[] operator Properly check for failed allocations by not throwing exception Modified: trunk/rosapps/applications/sysutils/regexpl/Completion.cpp trunk/rosapps/applications/sysutils/regexpl/Console.cpp trunk/rosapps/applications/sysutils/regexpl/Prompt.cpp trunk/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp trunk/rosapps/applications/sysutils/regexpl/Settings.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp trunk/rosapps/applications/sysutils/regexpl/TextHistory.cpp trunk/rosapps/applications/sysutils/regexpl/ph.h Modified: trunk/rosapps/applications/sysutils/regexpl/Completion.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/Completion.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/Completion.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -49,9 +49,9 @@ size_t s = _tcslen(pszText); if (m_pszText) - delete m_pszText; - - m_pszText = new TCHAR [s+(b?3:1)]; // if we have spaces in unique part, we need 2 addtional chars for " + delete[] m_pszText; + + m_pszText = new (std::nothrow) TCHAR [s+(b?3:1)]; // if we have spaces in unique part, we need 2 addtional chars for " if (!m_pszText) return FALSE; @@ -75,7 +75,7 @@ ~CCompletionMatch() { if (m_pszText) - delete m_pszText; + delete[] m_pszText; } private: @@ -129,20 +129,20 @@ DeleteList(); if (m_pszContext) - delete m_pszContext; + delete[] m_pszContext; if (m_pszBegin) - delete m_pszBegin; + delete[] m_pszBegin; if (m_pszCurrentKey) - delete m_pszCurrentKey; + delete[] m_pszCurrentKey; } void CCompletionList::Invalidate() { if (m_pszCurrentKey) { - delete m_pszCurrentKey; + delete[] m_pszCurrentKey; m_pszCurrentKey = NULL; } } @@ -161,38 +161,48 @@ rblnNew = TRUE; if (m_pszContext) { - delete m_pszContext; + delete[] m_pszContext; m_pszContext = NULL; } if (m_pszBegin) { - delete m_pszBegin; + delete[] m_pszBegin; m_pszBegin = NULL; } if (m_pszCurrentKey) { - delete m_pszCurrentKey; + delete[] m_pszCurrentKey; m_pszCurrentKey = NULL; } size_t s = _tcslen(pszContext); - m_pszContext = new TCHAR[s+1]; + m_pszContext = new (std::nothrow) TCHAR[s+1]; if (!m_pszContext) return FALSE; _tcscpy(m_pszContext,pszContext); s = _tcslen(pszBegin); - m_pszBegin = new TCHAR[s+1]; + m_pszBegin = new (std::nothrow) TCHAR[s+1]; if (!m_pszBegin) + { + delete[] m_pszContext; + m_pszContext = NULL; return FALSE; + } _tcscpy(m_pszBegin,pszBegin); s = _tcslen(pszCurrentKey); - m_pszCurrentKey = new TCHAR[s+1]; + m_pszCurrentKey = new (std::nothrow) TCHAR[s+1]; if (!m_pszCurrentKey) + { + delete[] m_pszContext; + delete[] m_pszBegin; + m_pszContext = NULL; + m_pszBegin = NULL; return FALSE; + } _tcscpy(m_pszCurrentKey,pszCurrentKey); return TRUE; @@ -206,7 +216,7 @@ { if (_tcsnicmp(pszText,m_pszBegin,_tcslen(m_pszBegin)) != 0) return TRUE; - CCompletionMatch *pNode = new CCompletionMatch; + CCompletionMatch *pNode = new (std::nothrow) CCompletionMatch; if (!pNode) return FALSE; if (!pNode->Init(pszText)) @@ -363,7 +373,7 @@ if (nError != ERROR_SUCCESS) return FALSE; - pszSubkeyName = new TCHAR[nKeyNameSize+dwMaxSubkeyNameLength+1]; + pszSubkeyName = new (std::nothrow) TCHAR[nKeyNameSize+dwMaxSubkeyNameLength+1]; if (!pszSubkeyName) goto Abort; @@ -393,7 +403,7 @@ goto Abort; } - pszValueName = new TCHAR[nKeyNameSize+dwMaxValueNameSize+1]; + pszValueName = new (std::nothrow) TCHAR[nKeyNameSize+dwMaxValueNameSize+1]; if (!pszValueName) goto Abort; @@ -415,15 +425,15 @@ } if (pszValueName) - delete pszValueName; + delete[] pszValueName; if (pszSubkeyName) - delete pszSubkeyName; + delete[] pszSubkeyName; return TRUE; Abort: if (pszValueName) - delete pszValueName; + delete[] pszValueName; if (pszSubkeyName) - delete pszSubkeyName; + delete[] pszSubkeyName; return FALSE; } Modified: trunk/rosapps/applications/sysutils/regexpl/Console.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/Console.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/Console.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -71,11 +71,11 @@ CConsole::~CConsole() { if (m_pchBuffer) - delete m_pchBuffer; + delete[] m_pchBuffer; if (m_pchBuffer1) - delete m_pchBuffer1; + delete[] m_pchBuffer1; if (m_pchBuffer2) - delete m_pchBuffer2; + delete[] m_pchBuffer2; if (m_blnOldInputModeSaved) SetConsoleMode(m_hStdIn,m_dwOldInputMode); @@ -946,15 +946,15 @@ if (m_pchBuffer2) delete m_pchBuffer2; m_pchBuffer2 = NULL; - m_pchBuffer = new TCHAR [dwBufferSize]; + m_pchBuffer = new (std::nothrow) TCHAR [dwBufferSize]; if (!m_pchBuffer) goto Abort; m_pchBuffer[dwBufferSize-1] = 0; - m_pchBuffer1 = new TCHAR [dwBufferSize]; + m_pchBuffer1 = new (std::nothrow) TCHAR [dwBufferSize]; if (!m_pchBuffer1) goto Abort; m_pchBuffer1[dwBufferSize-1] = 0; - m_pchBuffer2 = new TCHAR [dwBufferSize]; + m_pchBuffer2 = new (std::nothrow) TCHAR [dwBufferSize]; if (!m_pchBuffer2) goto Abort; m_pchBuffer2[dwBufferSize-1] = 0; @@ -972,13 +972,13 @@ if (m_hStdOut != INVALID_HANDLE_VALUE) VERIFY(CloseHandle(m_hStdOut)); m_hStdOut = INVALID_HANDLE_VALUE; - if (m_pchBuffer) delete m_pchBuffer; + if (m_pchBuffer) delete[] m_pchBuffer; m_pchBuffer = NULL; - if (m_pchBuffer1) delete m_pchBuffer1; + if (m_pchBuffer1) delete[] m_pchBuffer1; m_pchBuffer1 = NULL; - if (m_pchBuffer2) delete m_pchBuffer2; + if (m_pchBuffer2) delete[] m_pchBuffer2; m_pchBuffer2 = NULL; m_dwBufferSize = 0; Modified: trunk/rosapps/applications/sysutils/regexpl/Prompt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/Prompt.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/Prompt.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -32,7 +32,7 @@ CPrompt::CPrompt(CRegistryTree& rTree, HRESULT& rhr):m_rTree(rTree) { - m_pszPrompt = new TCHAR[_tcslen(DEFAULT_PROMPT)+1]; + m_pszPrompt = new (std::nothrow) TCHAR[_tcslen(DEFAULT_PROMPT)+1]; if (!m_pszPrompt) { rhr = E_OUTOFMEMORY; @@ -50,7 +50,7 @@ return E_UNEXPECTED; } - m_pszPrompt = new TCHAR[_tcslen(pszPrompt)+1]; + m_pszPrompt = new (std::nothrow) TCHAR[_tcslen(pszPrompt)+1]; if (!m_pszPrompt) return E_OUTOFMEMORY; @@ -62,7 +62,7 @@ CPrompt::~CPrompt() { if (m_pszPrompt) - delete m_pszPrompt; + delete[] m_pszPrompt; } void CPrompt::ShowPrompt(CConsole &rConsole) Modified: trunk/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -138,7 +138,7 @@ CArgumentParser Parser; - pSettings = new CSettings(); + pSettings = new (std::nothrow) CSettings(); if (!pSettings) { _ftprintf(stderr,_T("Cannot initialize settings. Out of memory.\n")); @@ -152,7 +152,7 @@ goto Abort; } - pPrompt = new CPrompt(Tree,hr); + pPrompt = new (std::nothrow) CPrompt(Tree,hr); if (!pPrompt) { _ftprintf(stderr,_T("Cannot initialize prompt. Out of memory.\n")); Modified: trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -70,7 +70,7 @@ { // copy machine name size_t size = _tcslen(pszMachineName); - m_pszMachineName = new TCHAR [size+2]; + m_pszMachineName = new (std::nothrow) TCHAR [size+2]; if (!m_pszMachineName) return E_OUTOFMEMORY; _tcscpy(m_pszMachineName,pszMachineName); @@ -103,7 +103,7 @@ if (pszPath) size += _tcslen(pszPath); - m_pszKeyName = new TCHAR [size+2]; + m_pszKeyName = new (std::nothrow) TCHAR [size+2]; if (!m_pszKeyName) return E_OUTOFMEMORY; _stprintf(m_pszKeyName,_T("%s%s\\"),pszPath?pszPath:_T(""),pszKeyName); @@ -273,7 +273,7 @@ { const TCHAR *pszKeyName = GetKeyName(); size_t size = _tcslen(pszKeyName) + _tcslen(pszSubkeyName) + 1; - TCHAR *pszSubkeyFullName = new TCHAR [size]; + TCHAR *pszSubkeyFullName = new (std::nothrow) TCHAR [size]; if (!pszSubkeyFullName) { nError = RegCloseKey(hKey); @@ -283,7 +283,7 @@ _tcscpy(pszSubkeyFullName,pszKeyName); _tcscat(pszSubkeyFullName,pszSubkeyName); HRESULT hr = rKey.Init(hKey,GetKeyName(),pszSubkeyName,samDesired); - delete pszSubkeyName; + delete[] pszSubkeyName; if (FAILED(hr)) { nError = RegCloseKey(hKey); Modified: trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -64,7 +64,7 @@ CRegistryTree::~CRegistryTree() { if (m_pszMachineName) - delete m_pszMachineName; + delete[] m_pszMachineName; CNode *pNode; while(m_pCurrentKey->m_pUp) @@ -98,7 +98,7 @@ const TCHAR *pszSeps = _T("\\"); // Make buffer and copy relative path into it. - TCHAR *pszBuffer = new TCHAR[_tcslen(pszRelativePath)+1]; + TCHAR *pszBuffer = new (std::nothrow) TCHAR[_tcslen(pszRelativePath)+1]; if (!pszBuffer) { SetError(ERROR_OUTOFMEMORY); @@ -145,7 +145,7 @@ return TRUE; Abort: - delete pszBuffer; + delete[] pszBuffer; return FALSE; } @@ -179,7 +179,7 @@ { // Delete previous machine name buffer if allocated. if (m_pszMachineName) - delete m_pszMachineName; + delete[] m_pszMachineName; m_pszMachineName = NULL; m_Root.m_Key.InitRoot(); @@ -192,9 +192,9 @@ ASSERT(*pszMachineName); // No machine name. - TCHAR *pszNewMachineName = new TCHAR[_tcslen(pszMachineName)+3]; // two leading backslashes + terminating null - - if (!pszMachineName) + TCHAR *pszNewMachineName = new (std::nothrow) TCHAR[_tcslen(pszMachineName)+3]; // two leading backslashes + terminating null + + if (!pszNewMachineName) { SetError(ERROR_OUTOFMEMORY); return FALSE; @@ -202,7 +202,7 @@ // Delete previous machine name buffer if allocated. if (m_pszMachineName) - delete m_pszMachineName; + delete[] m_pszMachineName; m_pszMachineName = pszNewMachineName; @@ -283,7 +283,7 @@ return FALSE; } - TCHAR *pszSubkeyName = new TCHAR [dwMaxSubkeyNameLength]; + TCHAR *pszSubkeyName = new (std::nothrow) TCHAR [dwMaxSubkeyNameLength]; rKey.InitSubkeyEnumeration(pszSubkeyName, dwMaxSubkeyNameLength); BOOL blnKeyDeleted = FALSE; while ((nError = rKey.GetNextSubkeyName()) == ERROR_SUCCESS) @@ -393,7 +393,7 @@ BOOL CRegistryTree::InternalChangeCurrentKey(const TCHAR *pszSubkeyName, REGSAM DesiredAccess) { size_t size = _tcslen(pszSubkeyName); - TCHAR *pszSubkeyNameBuffer = new TCHAR[size+3]; + TCHAR *pszSubkeyNameBuffer = new (std::nothrow) TCHAR[size+3]; if (!pszSubkeyNameBuffer) { SetError(_T("Cannot open key : %s%s\nError %d (%s)\n"), @@ -409,7 +409,7 @@ if (_tcscmp(pszSubkeyName,_T(".")) == 0) { - delete pszSubkeyNameBuffer; + delete[] pszSubkeyNameBuffer; return TRUE; } @@ -421,7 +421,7 @@ // We are on root ASSERT(m_pCurrentKey->m_pUp == NULL); SetError(_T("Cannot open key. The root is not child.\n")); - delete pszSubkeyNameBuffer; + delete[] pszSubkeyNameBuffer; return FALSE; } @@ -429,13 +429,13 @@ if (!m_pCurrentKey->m_pUp) { SetInternalError(); - delete pszSubkeyNameBuffer; + delete[] pszSubkeyNameBuffer; return FALSE; } CNode *pNode = m_pCurrentKey; m_pCurrentKey = m_pCurrentKey->m_pUp; delete pNode; - delete pszSubkeyNameBuffer; + delete[] pszSubkeyNameBuffer; return TRUE; } @@ -444,20 +444,20 @@ { SetError(_T("Cannot open key : %s%s\nError %d (%s)\n"), GetCurrentPath(),pszSubkeyName,ERROR_OUTOFMEMORY,GetErrorDescription(ERROR_OUTOFMEMORY)); - delete pszSubkeyNameBuffer; + delete[] pszSubkeyNameBuffer; return FALSE; } if (!InternalGetSubkey(pszSubkeyName,DesiredAccess,pNewKey->m_Key)) { delete pNewKey; - delete pszSubkeyNameBuffer; + delete[] pszSubkeyNameBuffer; return FALSE; } pNewKey->m_pUp = m_pCurrentKey; m_pCurrentKey = pNewKey; - delete pszSubkeyNameBuffer; + delete[] pszSubkeyNameBuffer; return TRUE; } @@ -483,7 +483,7 @@ if (nError != ERROR_SUCCESS) goto SkipCaseUpdate; - pszSubkeyNameCaseUpdated = new TCHAR [dwMaxSubkeyNameLength]; + pszSubkeyNameCaseUpdated = new (std::nothrow) TCHAR [dwMaxSubkeyNameLength]; m_pCurrentKey->m_Key.InitSubkeyEnumeration(pszSubkeyNameCaseUpdated, dwMaxSubkeyNameLength); while ((nError = m_pCurrentKey->m_Key.GetNextSubkeyName()) == ERROR_SUCCESS) if (_tcsicmp(pszSubkeyNameCaseUpdated, pszSubkeyName) == 0) @@ -491,7 +491,7 @@ if (nError != ERROR_SUCCESS) { - delete pszSubkeyNameCaseUpdated; + delete[] pszSubkeyNameCaseUpdated; pszSubkeyNameCaseUpdated = NULL; } @@ -513,7 +513,7 @@ goto Abort; } - delete pszSubkeyNameCaseUpdated; + delete[] pszSubkeyNameCaseUpdated; } else { @@ -535,7 +535,7 @@ return TRUE; Abort: if (pszSubkeyNameCaseUpdated) - delete pszSubkeyNameCaseUpdated; + delete[] pszSubkeyNameCaseUpdated; if (hNewKey) { @@ -611,7 +611,7 @@ return FALSE; } - TCHAR *pszShortKeyName = new TCHAR [size+1]; + TCHAR *pszShortKeyName = new (std::nothrow) TCHAR [size+1]; if (!pszShortKeyName) { SetError(ERROR_OUTOFMEMORY); @@ -624,6 +624,7 @@ // change to parent key if (!Tree.InternalChangeCurrentKey(_T(".."),READ_CONTROL)) { + delete[] pszShortKeyName; ASSERT(FALSE); SetInternalError(); return FALSE; @@ -632,10 +633,12 @@ // change back to target key if (!Tree.InternalGetSubkey(pszShortKeyName,DesiredAccess,rKey)) { + delete[] pszShortKeyName; SetError(Tree.GetLastErrorDescription()); return FALSE; } + delete[] pszShortKeyName; return TRUE; } Modified: trunk/rosapps/applications/sysutils/regexpl/Settings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/Settings.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/Settings.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -47,7 +47,7 @@ { if (m_pszPrompt) { - delete m_pszPrompt; + delete[] m_pszPrompt; m_pszPrompt = NULL; } @@ -75,7 +75,7 @@ nError = RegQueryValueEx(hKey,PROMPT_VALUE_NAME,NULL,&dwType,NULL,&dwSize); if (nError == ERROR_SUCCESS && dwType == REG_SZ) { - m_pszPrompt = (TCHAR *) new BYTE[dwSize]; + m_pszPrompt = (TCHAR *) new (std::nothrow) BYTE[dwSize]; if (!m_pszPrompt) { hr = E_OUTOFMEMORY; Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -226,7 +226,7 @@ rConsole.Write(pchSID); rConsole.Write(_T("\n")); } - delete pchSID; + delete[] pchSID; DWORD dwNameBufferLength, dwDomainNameBufferLength; dwNameBufferLength = 1024; dwDomainNameBufferLength = 1024; Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -147,7 +147,7 @@ return 0; } - TCHAR *pszValueName = new TCHAR[dwMaxValueNameLength]; + TCHAR *pszValueName = new (std::nothrow) TCHAR[dwMaxValueNameLength]; if (!pszValueName) { rConsole.Write("Out of memory."); Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -200,7 +200,7 @@ if (nError != ERROR_SUCCESS) throw nError; - TCHAR *pszSubkeyNameBuffer = new TCHAR[dwMaxSubkeyNameLength]; + TCHAR *pszSubkeyNameBuffer = new (std::nothrow) TCHAR[dwMaxSubkeyNameLength]; if (!pszSubkeyNameBuffer) throw ERROR_OUTOFMEMORY; @@ -216,7 +216,7 @@ } } - delete pszSubkeyNameBuffer; + delete[] pszSubkeyNameBuffer; if (nError != ERROR_NO_MORE_ITEMS) throw nError; @@ -226,7 +226,7 @@ if (nError != ERROR_SUCCESS) throw nError; - TCHAR *pchValueNameBuffer = new TCHAR[dwMaxValueNameBufferSize]; + TCHAR *pchValueNameBuffer = new (std::nothrow) TCHAR[dwMaxValueNameBufferSize]; if (!pchValueNameBuffer) throw ERROR_OUTOFMEMORY; @@ -259,7 +259,7 @@ } } - delete pchValueNameBuffer; + delete[] pchValueNameBuffer; if (nError != ERROR_NO_MORE_ITEMS) throw nError; Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -220,7 +220,7 @@ goto Error; } - pSecurityDescriptor = (PISECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; + pSecurityDescriptor = (PISECURITY_DESCRIPTOR) new (std::nothrow) unsigned char [dwSecurityDescriptorLength]; if (!pSecurityDescriptor) { _tcsncpy(pszError_msg,_T("\nOut of memory.\n"),ERROR_MSG_BUFFER_SIZE-1); @@ -292,7 +292,7 @@ BOOL blnRet = GetTextualSid(pSID,NULL,&dwSIDStringSize); ASSERT(!blnRet); ASSERT(GetLastError() == ERROR_INSUFFICIENT_BUFFER); - TCHAR *pszSID = new TCHAR[dwSIDStringSize]; + TCHAR *pszSID = new (std::nothrow) TCHAR[dwSIDStringSize]; if (!pszSID) { @@ -315,24 +315,25 @@ rConsole.Write(pszSID); rConsole.Write(_T("\n")); } - delete pszSID; + delete[] pszSID; TCHAR *pszName, *pszDomainName; DWORD dwNameBufferLength, dwDomainNameBufferLength; dwNameBufferLength = 1024; dwDomainNameBufferLength = 1024; - pszName = new TCHAR [dwNameBufferLength]; + pszName = new (std::nothrow) TCHAR [dwNameBufferLength]; if (!pszName) { _tcsncpy(pszError_msg,_T("\nOut of memory.\n"),ERROR_MSG_BUFFER_SIZE-1); goto Error; } - pszDomainName = new TCHAR [dwDomainNameBufferLength]; + pszDomainName = new (std::nothrow) TCHAR [dwDomainNameBufferLength]; if (!pszDomainName) { _tcsncpy(pszError_msg,_T("\nOut of memory.\n"),ERROR_MSG_BUFFER_SIZE-1); + delete[] pszName; goto Error; } @@ -420,6 +421,9 @@ { rConsole.Write(_T("\t\tKEY_QUERY_VALUE\n")); } + + delete[] pszName; + delete[] pszDomainName; } // for AbortDumpSACL: Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -395,7 +395,7 @@ SkipCommand: if (pDataBuffer) - delete pDataBuffer; + delete[] pDataBuffer; return 0; CommandNAonRoot: Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -415,7 +415,7 @@ SkipValueCommand: if (pDataBuffer) - delete pDataBuffer; + delete[] pDataBuffer; return 0; ValueCommandNAonRoot: rConsole.Write(VALUE_CMD COMMAND_NA_ON_ROOT); Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -43,7 +43,7 @@ void CShellCommandsLinkedList::AddCommand(CShellCommand *pCommand) { // Create new node - SNode *pNewNode = new SNode; + SNode *pNewNode = new (std::nothrow) SNode; if (pNewNode == NULL) return; Modified: trunk/rosapps/applications/sysutils/regexpl/TextHistory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/TextHistory.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/TextHistory.cpp [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -39,7 +39,7 @@ CTextHistory::~CTextHistory() { - if (m_pHistoryBuffer) delete m_pHistoryBuffer; + if (m_pHistoryBuffer) delete[] m_pHistoryBuffer; } BOOL CTextHistory::Init(DWORD dwMaxHistoryLineSize, DWORD dwMaxHistoryLines) @@ -49,13 +49,13 @@ ASSERT(FALSE); return FALSE; } - if (m_pHistoryBuffer) delete m_pHistoryBuffer; + if (m_pHistoryBuffer) delete[] m_pHistoryBuffer; m_dwFirstHistoryIndex = 0; m_dwLastHistoryIndex = 0; m_dwHisoryFull = 0; m_dwMaxHistoryLines = dwMaxHistoryLines; m_dwMaxHistoryLineSize = dwMaxHistoryLineSize; - m_pHistoryBuffer = new TCHAR [m_dwMaxHistoryLines*dwMaxHistoryLineSize]; + m_pHistoryBuffer = new (std::nothrow) TCHAR [m_dwMaxHistoryLines*dwMaxHistoryLineSize]; if (!m_pHistoryBuffer) return FALSE; return TRUE; } Modified: trunk/rosapps/applications/sysutils/regexpl/ph.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ph.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ph.h [iso-8859-1] Thu Oct 6 21:36:10 2011 @@ -27,7 +27,7 @@ #include <winuser.h> #include <winreg.h> -#include <assert.h> +#include <cassert> #define ASSERT assert #ifdef _DEBUG #define VERIFY ASSERT @@ -36,11 +36,12 @@ #endif #include <conio.h> -#include <limits.h> +#include <climits> #include <tchar.h> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <ctype.h> +#include <new> // INHERITED_ACE is from windows 2000 #ifndef INHERITED_ACE

1 0

[pschweitzer] 54033: [PEDUMP] Fix memory & resource leaks
by pschweitzer＠svn.reactos.org 06 Oct '11

06 Oct '11

Author: pschweitzer Date: Thu Oct 6 20:45:06 2011 New Revision: 54033 URL: http://svn.reactos.org/svn/reactos?rev=54033&view=rev Log: [PEDUMP] Fix memory & resource leaks Modified: trunk/rosapps/applications/sysutils/pedump/pedump.c Modified: trunk/rosapps/applications/sysutils/pedump/pedump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/pedu… ============================================================================== --- trunk/rosapps/applications/sysutils/pedump/pedump.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/pedump/pedump.c [iso-8859-1] Thu Oct 6 20:45:06 2011 @@ -4014,6 +4014,7 @@ "%s: can not allocate memory.\n", argv[0] ); + fclose(my_fp); exit (0); } /* @@ -4022,6 +4023,7 @@ printf ("\n\nDump of file: %s\n\n", argv[1]); n = fread (lpFile, fsize, 1, my_fp); + fclose(my_fp); if (n == -1) { @@ -4030,6 +4032,7 @@ argv[0], argv[1] ); + free(lpFile); exit (0); } @@ -4045,6 +4048,7 @@ "%s: This file is not in PE format; it looks like in DOS format.\n", argv[0] ); + free(lpFile); exit (0); } } @@ -4055,6 +4059,7 @@ argv[0], dosHdr.e_magic ); + free(lpFile); exit (0); } @@ -4067,6 +4072,7 @@ argv[0], fileType ); + free(lpFile); exit (0); } @@ -4087,7 +4093,10 @@ entryPoint = poh->AddressOfEntryPoint; if (psh == NULL) + { + free(lpFile); return 0; + } /* store section headers */

1 0

[pschweitzer] 54032: [MAN] Fix memory leaks
by pschweitzer＠svn.reactos.org 06 Oct '11

06 Oct '11

Author: pschweitzer Date: Thu Oct 6 20:35:52 2011 New Revision: 54032 URL: http://svn.reactos.org/svn/reactos?rev=54032&view=rev Log: [MAN] Fix memory leaks Modified: trunk/rosapps/applications/sysutils/man/man.c Modified: trunk/rosapps/applications/sysutils/man/man.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/man/… ============================================================================== --- trunk/rosapps/applications/sysutils/man/man.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/man/man.c [iso-8859-1] Thu Oct 6 20:35:52 2011 @@ -62,8 +62,8 @@ else retval=-1; - strcpy(manpath_local, manpath); - return retval; + free(manpath_local); + return retval; } int @@ -142,14 +142,12 @@ void text_outp(char *cur_string) { - char TagFlag=0; int symbol=0; if(cur_string[0]=='.') while(cur_string[symbol]!=' ') symbol++; - if(symbol) TagFlag=1; for(;cur_string[symbol]!='\n'; symbol++) putchar(cur_string[symbol]); @@ -212,6 +210,9 @@ else text_outp(cur_string); // print plane text th_outp(cur_string, THtag); /* END of TAGs processing */ + free(cur_string); + free(THtag); + return 0; }

1 0

[pschweitzer] 54031: [FRAGINATOR] Use vector<>::empty() instead of vector<>::size() to check for vector emptyness
by pschweitzer＠svn.reactos.org 06 Oct '11

06 Oct '11

Author: pschweitzer Date: Thu Oct 6 20:24:19 2011 New Revision: 54031 URL: http://svn.reactos.org/svn/reactos?rev=54031&view=rev Log: [FRAGINATOR] Use vector<>::empty() instead of vector<>::size() to check for vector emptyness Modified: trunk/rosapps/applications/fraginator/Defragment.cpp Modified: trunk/rosapps/applications/fraginator/Defragment.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/De… ============================================================================== --- trunk/rosapps/applications/fraginator/Defragment.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/Defragment.cpp [iso-8859-1] Thu Oct 6 20:24:19 2011 @@ -328,7 +328,7 @@ continue; // Can't defrag 0 byte files :) - if (Info.Fragments.size() == 0) + if (Info.Fragments.empty()) continue; // If doing fast defrag, skip non-fragmented files

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs