Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 03/03: [RAPPS] Removed redundant static_cast

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81a5b04f6265ef6cfc832… commit 81a5b04f6265ef6cfc83248fa531ff0cad330669 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Fri Oct 27 21:25:24 2017 +0300 [RAPPS] Removed redundant static_cast --- base/applications/rapps/available.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index f7577f0afc..a62cc146c2 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -387,7 +387,7 @@ skip_if_cached: Info->RefreshAppInfo(); if (lpEnumProc) - lpEnumProc(static_cast<CAvailableApplicationInfo*>(Info), m_szAppsPath.GetString()); + lpEnumProc(Info, m_szAppsPath.GetString()); } while (FindNextFileW(hFind, &FindFileData) != 0);

7 years, 1 month

[reactos] 02/03: [RAPPS] Make CConfigParser a temp object.

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e554a359f34e35e403cb0… commit e554a359f34e35e403cb0464032caf4258246771 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Sun Oct 22 00:52:49 2017 +0300 [RAPPS] Make CConfigParser a temp object. --- base/applications/rapps/available.cpp | 15 ++++++++++----- base/applications/rapps/include/available.h | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 8ee80c93db..f7577f0afc 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -19,7 +19,7 @@ // CAvailableApplicationInfo CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam) - : m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE), m_Parser(sFileNameParam) + : m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE) { m_LicenseType = LICENSE_NONE; @@ -39,11 +39,14 @@ VOID CAvailableApplicationInfo::RefreshAppInfo() // Lazily load general info from the file VOID CAvailableApplicationInfo::RetrieveGeneralInfo() { - m_Category = m_Parser.GetInt(L"Category"); + m_Parser = new CConfigParser(m_sFileName); + + m_Category = m_Parser->GetInt(L"Category"); if (!GetString(L"Name", m_szName) || !GetString(L"URLDownload", m_szUrlDownload)) { + delete m_Parser; return; } @@ -64,6 +67,8 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo() { RetrieveInstalledVersion(); } + + delete m_Parser; } VOID CAvailableApplicationInfo::RetrieveInstalledStatus() @@ -87,7 +92,7 @@ VOID CAvailableApplicationInfo::RetrieveLanguages() ATL::CStringW szBuffer; // TODO: Get multiline parameter - if (!m_Parser.GetString(L"Languages", szBuffer)) + if (!m_Parser->GetString(L"Languages", szBuffer)) { m_HasLanguageInfo = FALSE; return; @@ -126,7 +131,7 @@ VOID CAvailableApplicationInfo::RetrieveLanguages() VOID CAvailableApplicationInfo::RetrieveLicenseType() { - INT IntBuffer = m_Parser.GetInt(L"LicenseType"); + INT IntBuffer = m_Parser->GetInt(L"LicenseType"); if (IsLicenseType(IntBuffer)) { @@ -195,7 +200,7 @@ VOID CAvailableApplicationInfo::SetLastWriteTime(FILETIME* ftTime) inline BOOL CAvailableApplicationInfo::GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString) { - if (!m_Parser.GetString(lpKeyName, ReturnedString)) + if (!m_Parser->GetString(lpKeyName, ReturnedString)) { ReturnedString.Empty(); return FALSE; diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index e005250e81..ab95afc3b3 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -64,7 +64,7 @@ private: BOOL m_IsInstalled; BOOL m_HasLanguageInfo; BOOL m_HasInstalledVersion; - CConfigParser m_Parser; + CConfigParser* m_Parser; inline BOOL GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString);

7 years, 1 month

[reactos] 01/03: [RAPPS] Replace pointer array with object array in parts related to app DL.

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9aa1915df6cc4384cf69… commit c9aa1915df6cc4384cf690b016445e8a406a07db Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Sun Oct 22 00:00:50 2017 +0300 [RAPPS] Replace pointer array with object array in parts related to app DL. --- base/applications/rapps/available.cpp | 6 +++--- base/applications/rapps/gui.cpp | 8 ++++---- base/applications/rapps/include/available.h | 3 ++- base/applications/rapps/include/dialogs.h | 2 +- base/applications/rapps/loaddlg.cpp | 9 ++------- base/applications/rapps/unattended.cpp | 2 +- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 6fa51ad820..8ee80c93db 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -411,15 +411,15 @@ CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppNa return NULL; } -ATL::CSimpleArray<CAvailableApplicationInfo*> CAvailableApps::FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const +ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const { - ATL::CSimpleArray<CAvailableApplicationInfo*> result; + ATL::CSimpleArray<CAvailableApplicationInfo> result; for (INT i = 0; i < arrAppsNames.GetSize(); ++i) { CAvailableApplicationInfo* Info = FindInfo(arrAppsNames[i]); if (Info) { - result.Add(Info); + result.Add(*Info); } } return result; diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 368836d7c6..76a5e76d08 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -554,20 +554,20 @@ public: } } - ATL::CSimpleArray<CAvailableApplicationInfo*> GetCheckedItems() + ATL::CSimpleArray<CAvailableApplicationInfo> GetCheckedItems() { if (!bHasCheckboxes) { - return ATL::CSimpleArray<CAvailableApplicationInfo*>(); + return ATL::CSimpleArray<CAvailableApplicationInfo>(); } - ATL::CSimpleArray<CAvailableApplicationInfo*> list; + ATL::CSimpleArray<CAvailableApplicationInfo> list; for (INT i = 0; i >= 0; i = GetNextItem(i, LVNI_ALL)) { if (GetCheckState(i) != FALSE) { CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(i); - list.Add(pAppInfo); + list.Add(*pAppInfo); } } return list; diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index aa1aebda37..e005250e81 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -45,6 +45,7 @@ struct CAvailableApplicationInfo ATL::CStringW m_szSHA1; ATL::CStringW m_szInstalledVersion; + // Create an object from file CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam); // Load all info from the file @@ -100,7 +101,7 @@ public: BOOL Enum(INT EnumType, AVAILENUMPROC lpEnumProc); CAvailableApplicationInfo* FindInfo(const ATL::CStringW& szAppName) const; - ATL::CSimpleArray<CAvailableApplicationInfo*> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; + ATL::CSimpleArray<CAvailableApplicationInfo> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; const ATL::CStringW& GetFolderPath() const; const ATL::CStringW& GetAppPath() const; diff --git a/base/applications/rapps/include/dialogs.h b/base/applications/rapps/include/dialogs.h index 51efdc8b7f..ea607e0385 100644 --- a/base/applications/rapps/include/dialogs.h +++ b/base/applications/rapps/include/dialogs.h @@ -26,7 +26,7 @@ public: DWORD_PTR dwRefData); static DWORD WINAPI ThreadFunc(LPVOID Context); - static BOOL DownloadListOfApplications(const ATL::CSimpleArray<CAvailableApplicationInfo*>& AppsList, BOOL bIsModal = FALSE); + static BOOL DownloadListOfApplications(const ATL::CSimpleArray<CAvailableApplicationInfo>& AppsList, BOOL bIsModal = FALSE); static BOOL DownloadApplication(CAvailableApplicationInfo* pAppInfo, BOOL bIsModal = FALSE); static VOID DownloadApplicationsDB(LPCWSTR lpUrl); static VOID LaunchDownloadDialog(BOOL); diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 6ef55b42c3..346167cd77 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -830,20 +830,15 @@ end: return 0; } -BOOL CDownloadManager::DownloadListOfApplications(const ATL::CSimpleArray<CAvailableApplicationInfo*>& AppsList, BOOL bIsModal) +BOOL CDownloadManager::DownloadListOfApplications(const ATL::CSimpleArray<CAvailableApplicationInfo>& AppsList, BOOL bIsModal) { if (AppsList.GetSize() == 0) - { return FALSE; - } // Initialize shared variables for (INT i = 0; i < AppsList.GetSize(); ++i) { - if (AppsList[i]) - { - AppsToInstallList.Add(*(AppsList[i])); - } + AppsToInstallList.Add(AppsList[i]); // implicit conversion to DownloadInfo } // Create a dialog and issue a download process diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 328dbb5dc9..b785b9a6a3 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -64,7 +64,7 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine) apps.UpdateAppsDB(); apps.Enum(ENUM_ALL_AVAILABLE, NULL); - ATL::CSimpleArray<CAvailableApplicationInfo*> arrAppInfo = apps.FindInfoList(arrNames); + ATL::CSimpleArray<CAvailableApplicationInfo> arrAppInfo = apps.FindInfoList(arrNames); if (arrAppInfo.GetSize() > 0) { CDownloadManager::DownloadListOfApplications(arrAppInfo, TRUE);

7 years, 1 month

[reactos] 01/01: [NTOSKRNL][ROSSYM] ZwReadFile() calls: Use explicit NULL instead of ambiguous 0. CORE-13910

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11baa0d7237df3131b05d… commit 11baa0d7237df3131b05d406473c46bb59f83fb2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Oct 25 13:57:27 2017 +0200 [NTOSKRNL][ROSSYM] ZwReadFile() calls: Use explicit NULL instead of ambiguous 0. CORE-13910 --- ntoskrnl/config/cmwraprs.c | 4 ++-- ntoskrnl/kdbg/kdb_cli.c | 2 +- sdk/lib/rossym/zwfile.c | 4 ++-- sdk/lib/rossym_new/zwfile.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/config/cmwraprs.c b/ntoskrnl/config/cmwraprs.c index a3948b9477..fa864a8fb5 100644 --- a/ntoskrnl/config/cmwraprs.c +++ b/ntoskrnl/config/cmwraprs.c @@ -83,8 +83,8 @@ CmpFileRead(IN PHHIVE RegistryHive, NTSTATUS Status; _FileOffset.QuadPart = *FileOffset; - Status = ZwReadFile(HiveHandle, 0, 0, 0, &IoStatusBlock, - Buffer, (ULONG)BufferLength, &_FileOffset, 0); + Status = ZwReadFile(HiveHandle, NULL, NULL, NULL, &IoStatusBlock, + Buffer, (ULONG)BufferLength, &_FileOffset, NULL); return NT_SUCCESS(Status) ? TRUE : FALSE; } diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 168dca04cd..d5e7fde4d2 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3622,7 +3622,7 @@ KdbpCliInit(VOID) } /* Load file into memory */ - Status = ZwReadFile(hFile, 0, 0, 0, &Iosb, FileBuffer, FileSize, 0, 0); + Status = ZwReadFile(hFile, NULL, NULL, NULL, &Iosb, FileBuffer, FileSize, NULL, NULL); ZwClose(hFile); if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) diff --git a/sdk/lib/rossym/zwfile.c b/sdk/lib/rossym/zwfile.c index f4d7e6bb3e..7711014392 100644 --- a/sdk/lib/rossym/zwfile.c +++ b/sdk/lib/rossym/zwfile.c @@ -19,11 +19,11 @@ RosSymZwReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) IO_STATUS_BLOCK IoStatusBlock; Status = ZwReadFile(*((HANDLE *) FileContext), - 0, 0, 0, + NULL, NULL, NULL, &IoStatusBlock, Buffer, Size, - 0, 0); + NULL, NULL); return NT_SUCCESS(Status) && IoStatusBlock.Information == Size; } diff --git a/sdk/lib/rossym_new/zwfile.c b/sdk/lib/rossym_new/zwfile.c index 99556e4e8c..631979c681 100644 --- a/sdk/lib/rossym_new/zwfile.c +++ b/sdk/lib/rossym_new/zwfile.c @@ -18,11 +18,11 @@ RosSymZwReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) IO_STATUS_BLOCK IoStatusBlock; RosSymStatus = ZwReadFile(*((HANDLE *) FileContext), - 0, 0, 0, + NULL, NULL, NULL, &IoStatusBlock, Buffer, Size, - 0, 0); + NULL, NULL); return NT_SUCCESS(RosSymStatus) && IoStatusBlock.Information == Size; }

7 years, 1 month

[reactos] 01/01: [VERSION.CMAKE] Bump the version to 0.4.8-dev

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21f0b163a780c617df33a… commit 21f0b163a780c617df33a7904c6d3c4f0d2158fe Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Oct 27 09:38:34 2017 +0300 [VERSION.CMAKE] Bump the version to 0.4.8-dev --- sdk/include/reactos/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 808fb3b534..2eabee77ba 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -2,7 +2,7 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") -set(KERNEL_VERSION_PATCH_LEVEL "7") +set(KERNEL_VERSION_PATCH_LEVEL "8") set(COPYRIGHT_YEAR "2017") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds

7 years, 1 month

[reactos] 01/01: CONTRIBUTING.md: Add legal notice

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4f0a2390b9af18e28786… commit a4f0a2390b9af18e2878671a2e26a89d979e788e Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Fri Oct 27 01:29:28 2017 +0300 CONTRIBUTING.md: Add legal notice --- CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 17465a2063..028fe8bead 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,6 +6,11 @@ There are several ways to contribute to the development of ReactOS. The most oft - [How To Contribute?](#how-to-contribute?) - [Where To Start?](#where-to-start?) +**Legal notice:** If you have seen Microsoft Windows source code, your contribution won't be accepted because of potential copyright violation. Before contributing, you must affirm that the following is true: +>I hereby swear that I have not used nor seen the source code to any version of the Windows operating system +>nor any Microsoft product that may be related to the proposed project that is under a license incompatible +>with contribution to ReactOS, including but not limited to the leaked Windows 2000 source code and the Windows Research Kernel. + ## What To Do? ### Fix bugs

7 years, 1 month

[reactos] 01/01: [EXPLORER] Update start menu banner to match our new versioning scheme for the master branch

by David Quintana

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0cc70da494d6b6ec9faa… commit f0cc70da494d6b6ec9faa24d97d6455e3a6cb8d0 Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Thu Oct 26 22:33:16 2017 +0200 [EXPLORER] Update start menu banner to match our new versioning scheme for the master branch --- base/shell/explorer/res/bmp/158.bmp | Bin 14966 -> 14968 bytes base/shell/explorer/res/src/start_menu_banner.svg | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/shell/explorer/res/bmp/158.bmp b/base/shell/explorer/res/bmp/158.bmp index 4d1ba6bfd1..7b37574fc6 100644 Binary files a/base/shell/explorer/res/bmp/158.bmp and b/base/shell/explorer/res/bmp/158.bmp differ diff --git a/base/shell/explorer/res/src/start_menu_banner.svg b/base/shell/explorer/res/src/start_menu_banner.svg index 9763223d77..436115a933 100644 --- a/base/shell/explorer/res/src/start_menu_banner.svg +++ b/base/shell/explorer/res/src/start_menu_banner.svg @@ -16,7 +16,7 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="Logo.svg" + sodipodi:docname="start_menu_banner.svg" inkscape:export-filename="F:\reactos\Logo.png" inkscape:export-xdpi="72" inkscape:export-ydpi="72"> @@ -117,7 +117,7 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="2.4967109" - inkscape:cx="-34.214085" + inkscape:cx="-99.099451" inkscape:cy="142.13217" inkscape:document-units="px" inkscape:current-layer="svg2" @@ -136,7 +136,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -171,7 +171,7 @@ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.00007629px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4213">ReactOS</tspan><tspan style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.50006676px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start" - id="tspan4209"> 0.5 - SVN</tspan></tspan></text> + id="tspan4209"> 0.4.8-dev</tspan></tspan></text> <g style="fill:#ffffff;fill-opacity:1" id="layer1-2"

7 years, 1 month

[reactos] 02/02: [NTOSKRNL] Fix out-of-bounds access (CID-1401083) and potencial memory leak in FsRtlIsNameInExpressionPrivate

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=959d9c62018d5c6a73a9d… commit 959d9c62018d5c6a73a9df2747d25dde244b00b9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 22 14:56:52 2017 +0200 [NTOSKRNL] Fix out-of-bounds access (CID-1401083) and potencial memory leak in FsRtlIsNameInExpressionPrivate --- ntoskrnl/fsrtl/name.c | 52 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/ntoskrnl/fsrtl/name.c b/ntoskrnl/fsrtl/name.c index 6700f736f1..fef798cc86 100644 --- a/ntoskrnl/fsrtl/name.c +++ b/ntoskrnl/fsrtl/name.c @@ -26,6 +26,8 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression, USHORT Offset, Position, BackTrackingPosition, OldBackTrackingPosition; USHORT BackTrackingBuffer[16], OldBackTrackingBuffer[16] = {0}; PUSHORT BackTrackingSwap, BackTracking = BackTrackingBuffer, OldBackTracking = OldBackTrackingBuffer; + ULONG BackTrackingBufferSize = RTL_NUMBER_OF(BackTrackingBuffer); + PVOID AllocatedBuffer = NULL; UNICODE_STRING IntExpression; USHORT ExpressionPosition, NamePosition = 0, MatchingChars = 1; BOOLEAN EndOfName = FALSE; @@ -133,22 +135,40 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression, } /* If buffer too small */ - if (BackTrackingPosition > RTL_NUMBER_OF(BackTrackingBuffer) - 1) + if (BackTrackingPosition > BackTrackingBufferSize - 2) { - /* Allocate memory for BackTracking */ - BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length + sizeof(WCHAR)) * sizeof(USHORT), - 'nrSF'); - /* Copy old buffer content */ + /* We should only ever get here once! */ + ASSERT(AllocatedBuffer == NULL); + ASSERT((BackTracking == BackTrackingBuffer) || (BackTracking == OldBackTrackingBuffer)); + ASSERT((OldBackTracking == BackTrackingBuffer) || (OldBackTracking == OldBackTrackingBuffer)); + + /* Calculate buffer size */ + BackTrackingBufferSize = (Expression->Length + 1) * 2; + + /* Allocate memory for both back-tracking buffers */ + AllocatedBuffer = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + 2 * BackTrackingBufferSize * sizeof(USHORT), + 'nrSF'); + if (AllocatedBuffer == NULL) + { + DPRINT1("Failed to allocate BackTracking buffer. BackTrackingBufferSize = =x%lx\n", + BackTrackingBufferSize); + Result = FALSE; + goto Exit; + } + + /* Backtracking is at the start of the buffer */ + BackTracking = AllocatedBuffer; + + /* Copy BackTrackingBuffer content */ RtlCopyMemory(BackTracking, BackTrackingBuffer, RTL_NUMBER_OF(BackTrackingBuffer) * sizeof(USHORT)); - /* Allocate memory for OldBackTracking */ - OldBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length + sizeof(WCHAR)) * sizeof(USHORT), - 'nrSF'); - /* Copy old buffer content */ + /* OldBackTracking is after BackTracking */ + OldBackTracking = &BackTracking[BackTrackingBufferSize]; + + /* Copy OldBackTrackingBuffer content */ RtlCopyMemory(OldBackTracking, OldBackTrackingBuffer, RTL_NUMBER_OF(OldBackTrackingBuffer) * sizeof(USHORT)); @@ -235,11 +255,13 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression, /* Store result value */ Result = MatchingChars > 0 && (OldBackTracking[MatchingChars - 1] == (Expression->Length * 2)); +Exit: + /* Frees the memory if necessary */ - if (BackTracking != BackTrackingBuffer && BackTracking != OldBackTrackingBuffer) - ExFreePoolWithTag(BackTracking, 'nrSF'); - if (OldBackTracking != BackTrackingBuffer && OldBackTracking != OldBackTrackingBuffer) - ExFreePoolWithTag(OldBackTracking, 'nrSF'); + if (AllocatedBuffer != NULL) + { + ExFreePoolWithTag(AllocatedBuffer, 'nrSF'); + } return Result; }

7 years, 1 month

[reactos] 01/02: [NTOSKRNL] Fix our-of-bounds access and memory leak (CID-1401178, 1401177) in FsRtlIsDbcsInExpression

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=561f18afeae0040c79918… commit 561f18afeae0040c7991810c6e9ab3cb58fddf84 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Oct 11 14:20:57 2017 +0200 [NTOSKRNL] Fix our-of-bounds access and memory leak (CID-1401178, 1401177) in FsRtlIsDbcsInExpression --- ntoskrnl/fsrtl/dbcsname.c | 52 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/ntoskrnl/fsrtl/dbcsname.c b/ntoskrnl/fsrtl/dbcsname.c index ccaaa9b37c..306c5474b2 100644 --- a/ntoskrnl/fsrtl/dbcsname.c +++ b/ntoskrnl/fsrtl/dbcsname.c @@ -163,6 +163,8 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, USHORT Offset, Position, BackTrackingPosition, OldBackTrackingPosition; USHORT BackTrackingBuffer[16], OldBackTrackingBuffer[16] = {0}; PUSHORT BackTrackingSwap, BackTracking = BackTrackingBuffer, OldBackTracking = OldBackTrackingBuffer; + ULONG BackTrackingBufferSize = RTL_NUMBER_OF(BackTrackingBuffer); + PVOID AllocatedBuffer = NULL; USHORT ExpressionPosition, NamePosition = 0, MatchingChars = 1; USHORT NameChar = 0, ExpressionChar; BOOLEAN EndOfName = FALSE; @@ -281,22 +283,40 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, } /* If buffer too small */ - if (BackTrackingPosition > RTL_NUMBER_OF(BackTrackingBuffer) - 1) + if (BackTrackingPosition > BackTrackingBufferSize - 2) { - /* Allocate memory for BackTracking */ - BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length + 1) * sizeof(USHORT) * 2, - 'nrSF'); - /* Copy old buffer content */ + /* We should only ever get here once! */ + ASSERT(AllocatedBuffer == NULL); + ASSERT((BackTracking == BackTrackingBuffer) || (BackTracking == OldBackTrackingBuffer)); + ASSERT((OldBackTracking == BackTrackingBuffer) || (OldBackTracking == OldBackTrackingBuffer)); + + /* Calculate buffer size */ + BackTrackingBufferSize = (Expression->Length + 1) * 2; + + /* Allocate memory for both back-tracking buffers */ + AllocatedBuffer = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + 2 * BackTrackingBufferSize * sizeof(USHORT), + 'nrSF'); + if (AllocatedBuffer == NULL) + { + DPRINT1("Failed to allocate BackTracking buffer. BackTrackingBufferSize = =x%lx\n", + BackTrackingBufferSize); + Result = FALSE; + goto Exit; + } + + /* Backtracking is at the start of the buffer */ + BackTracking = AllocatedBuffer; + + /* Copy BackTrackingBuffer content */ RtlCopyMemory(BackTracking, BackTrackingBuffer, RTL_NUMBER_OF(BackTrackingBuffer) * sizeof(USHORT)); - /* Allocate memory for OldBackTracking */ - OldBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length + 1) * sizeof(USHORT) * 2, - 'nrSF'); - /* Copy old buffer content */ + /* OldBackTracking is after BackTracking */ + OldBackTracking = &BackTracking[BackTrackingBufferSize]; + + /* Copy OldBackTrackingBuffer content */ RtlCopyMemory(OldBackTracking, OldBackTrackingBuffer, RTL_NUMBER_OF(OldBackTrackingBuffer) * sizeof(USHORT)); @@ -404,11 +424,13 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, /* Store result value */ Result = (OldBackTracking[MatchingChars - 1] == Expression->Length * 2); +Exit: + /* Frees the memory if necessary */ - if (BackTracking != BackTrackingBuffer && BackTracking != OldBackTrackingBuffer) - ExFreePoolWithTag(BackTracking, 'nrSF'); - if (OldBackTracking != BackTrackingBuffer && OldBackTracking != OldBackTrackingBuffer) - ExFreePoolWithTag(OldBackTracking, 'nrSF'); + if (AllocatedBuffer != NULL) + { + ExFreePoolWithTag(AllocatedBuffer, 'nrSF'); + } return Result; }

7 years, 1 month

[reactos] 01/01: [SHELL32] CDefView: Fix a leak of an HMENU. This fix is thanks to Joachim Henze who found the bug and quickly found the guilty revision. CORE-13911

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d310df0dd24ebda3b2cc7… commit d310df0dd24ebda3b2cc74ffd5214303143884bf Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Oct 26 21:39:32 2017 +0300 [SHELL32] CDefView: Fix a leak of an HMENU. This fix is thanks to Joachim Henze who found the bug and quickly found the guilty revision. CORE-13911 --- dll/win32/shell32/CDefView.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index b31044df07..f846cc1fd4 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -2161,6 +2161,12 @@ HRESULT WINAPI CDefView::DestroyViewWindow() m_hAccel = NULL; } + if (m_hMenuArrangeModes) + { + DestroyMenu(m_hMenuArrangeModes); + m_hMenuArrangeModes = NULL; + } + if (m_hMenuViewModes) { DestroyMenu(m_hMenuViewModes);

7 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
28
Older →

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 2017