Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[pschweitzer] 62657: [KERNEL32] - Fix buffer overrun - Fix incorrect return check CID #514675 CID #716130 CID #731615

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 14:24:00 2014 New Revision: 62657 URL: http://svn.reactos.org/svn/reactos?rev=62657&view=rev Log: [KERNEL32] - Fix buffer overrun - Fix incorrect return check CID #514675 CID #716130 CID #731615 Modified: trunk/reactos/dll/win32/kernel32/client/compname.c trunk/reactos/dll/win32/kernel32/client/file/copy.c trunk/reactos/dll/win32/kernel32/client/vdm.c Modified: trunk/reactos/dll/win32/kernel32/client/compname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] Sun Apr 6 14:24:00 2014 @@ -301,10 +301,12 @@ GetComputerNameA(LPSTR lpBuffer, LPDWORD lpnSize) { BOOL ret; + ret = GetComputerNameExA(ComputerNameNetBIOS, lpBuffer, lpnSize); - if(!ret && GetLastError() == ERROR_MORE_DATA) - SetLastError(ERROR_BUFFER_OVERFLOW); - return ret; + if (!ret && GetLastError() == ERROR_MORE_DATA) + SetLastError(ERROR_BUFFER_OVERFLOW); + + return ret; } Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] Sun Apr 6 14:24:00 2014 @@ -325,7 +325,7 @@ PUNICODE_STRING lpExistingFileNameW; lpExistingFileNameW = Basep8BitStringToStaticUnicodeString(lpExistingFileName); - if (!lpExistingFileName) + if (!lpExistingFileNameW) { return FALSE; } Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sun Apr 6 14:24:00 2014 @@ -232,7 +232,7 @@ * %s%c : Nothing if DOS VDM, -w if WoW VDM, -ws if separate WoW VDM. */ _snwprintf(CommandLine, - sizeof(CommandLine), + sizeof(CommandLine) / sizeof(CommandLine[0]), L"\"%s\\ntvdm.exe\" -i%lx %s%c", Buffer, DosSeqId, @@ -246,7 +246,7 @@ * %s%c : Nothing if DOS VDM, -w if WoW VDM, -ws if separate WoW VDM. */ _snwprintf(CommandLine, - sizeof(CommandLine), + sizeof(CommandLine) / sizeof(CommandLine[0]), L"\"%s\\ntvdm.exe\" %s%c", Buffer, (BinaryType == BINARY_TYPE_DOS) ? L" " : L"-w",

10 years, 5 months

[pschweitzer] 62656: [SYSDM] Fix memory leaks CID #716341 CID #716342

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 13:50:53 2014 New Revision: 62656 URL: http://svn.reactos.org/svn/reactos?rev=62656&view=rev Log: [SYSDM] Fix memory leaks CID #716341 CID #716342 Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c [iso-8859-1] Sun Apr 6 13:50:53 2014 @@ -199,7 +199,7 @@ lpData = GlobalAlloc(GPTR, (dwMaxValueDataLength + 1) * sizeof(TCHAR)); if (lpData == NULL) { - GlobalFree(lpData); + GlobalFree(lpName); RegCloseKey(hKey); return; } @@ -227,6 +227,7 @@ (LPBYTE)lpData, &dwDataLength)) { + GlobalFree(lpExpandData); GlobalFree(lpName); GlobalFree(lpData); RegCloseKey(hKey);

10 years, 5 months

[pschweitzer] 62655: [INPUT] Fix buffer overrun CID #716118

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 13:42:27 2014 New Revision: 62655 URL: http://svn.reactos.org/svn/reactos?rev=62655&view=rev Log: [INPUT] Fix buffer overrun CID #716118 Modified: trunk/reactos/dll/cpl/input/add.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=62… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Sun Apr 6 13:42:27 2014 @@ -221,7 +221,7 @@ Lcid = _tcstoul(lpLanguage, NULL, 16); - GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang)); + GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang) / sizeof(Lang[0])); Index = (INT)SendMessage(hLangList, CB_ADDSTRING, 0, (LPARAM)Lang);

10 years, 5 months

[pschweitzer] 62654: [DESK] Fix leaks CID #716336 CID #716337

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 13:38:06 2014 New Revision: 62654 URL: http://svn.reactos.org/svn/reactos?rev=62654&view=rev Log: [DESK] Fix leaks CID #716336 CID #716337 Modified: trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sun Apr 6 13:38:06 2014 @@ -288,7 +288,7 @@ } if(!FindNextFile(hFind, &fd)) - hFind = INVALID_HANDLE_VALUE; + break; } token = _tcstok(NULL, separators); Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Sun Apr 6 13:38:06 2014 @@ -65,7 +65,10 @@ (LPBYTE)lpBuf, &BufSize); if (Ret != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, lpBuf); lpBuf = NULL; + } } }

10 years, 5 months

[pschweitzer] 62653: [ACCESS] Don't leak memory CID #716335

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 13:25:28 2014 New Revision: 62653 URL: http://svn.reactos.org/svn/reactos?rev=62653&view=rev Log: [ACCESS] Don't leak memory CID #716335 Modified: trunk/reactos/dll/cpl/access/access.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/access.c [iso-8859-1] Sun Apr 6 13:25:28 2014 @@ -184,7 +184,10 @@ return 0; if (!ReadSettings(pGlobalData)) + { + HeapFree(GetProcessHeap(), 0, pGlobalData); return 0; + } ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER);

10 years, 5 months

[pschweitzer] 62652: [FREELDR] Don't call strlen to get max len of an uninit string CID #731721 CID #731722

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 13:22:21 2014 New Revision: 62652 URL: http://svn.reactos.org/svn/reactos?rev=62652&view=rev Log: [FREELDR] Don't call strlen to get max len of an uninit string CID #731721 CID #731722 Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Sun Apr 6 13:22:21 2014 @@ -114,7 +114,7 @@ { /* This is a floppy */ - if (Size <= sizeof(Path) + 7 + strlen(Device)) + if (Size <= sizeof(Path) + 7 + sizeof(Device)) { return FALSE; } @@ -142,7 +142,7 @@ FrldrBootPartition = BootPartition; - if (Size <= sizeof(Path) + 18 + strlen(Device) + strlen(Partition)) + if (Size <= sizeof(Path) + 18 + sizeof(Device) + sizeof(Partition)) { return FALSE; } @@ -165,7 +165,7 @@ { /* This is a CD-ROM drive */ - if (Size <= sizeof(Path) + 7 + strlen(Device)) + if (Size <= sizeof(Path) + 7 + sizeof(Device)) { return FALSE; }

10 years, 5 months

[khornicek] 62651: [WIN32K] - Fix a possible out of bounds read. CID 731665

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Apr 6 13:09:04 2014 New Revision: 62651 URL: http://svn.reactos.org/svn/reactos?rev=62651&view=rev Log: [WIN32K] - Fix a possible out of bounds read. CID 731665 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun Apr 6 13:09:04 2014 @@ -533,19 +533,19 @@ switch (Flags) { case TCI_SRCFONTSIG: - while (0 == (*Src >> Index & 0x0001) && Index < MAXTCIINDEX) + while (Index < MAXTCIINDEX && 0 == (*Src >> Index & 0x0001)) { Index++; } break; case TCI_SRCCODEPAGE: - while ( *Src != FontTci[Index].ciACP && Index < MAXTCIINDEX) + while (Index < MAXTCIINDEX && *Src != FontTci[Index].ciACP) { Index++; } break; case TCI_SRCCHARSET: - while ( *Src != FontTci[Index].ciCharset && Index < MAXTCIINDEX) + while (Index < MAXTCIINDEX && *Src != FontTci[Index].ciCharset) { Index++; }

10 years, 5 months

[pschweitzer] 62650: [RUNDLL32] Fix resource leak CID #716331

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 13:01:41 2014 New Revision: 62650 URL: http://svn.reactos.org/svn/reactos?rev=62650&view=rev Log: [RUNDLL32] Fix resource leak CID #716331 Modified: trunk/reactos/base/system/rundll32/rundll32.c Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] Sun Apr 6 13:01:41 2014 @@ -428,6 +428,7 @@ if (!RegisterBlankClass(hInstance, hPrevInstance)) { + FreeLibrary(hDll); return 0; } // Create a window so we can pass a window handle to

10 years, 5 months

[pschweitzer] 62649: [FORMAT] - Check LoadLibrary() return - In case it doesn't match, free library CID #716330

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 12:59:01 2014 New Revision: 62649 URL: http://svn.reactos.org/svn/reactos?rev=62649&view=rev Log: [FORMAT] - Check LoadLibrary() return - In case it doesn't match, free library CID #716330 Modified: trunk/reactos/base/system/format/format.c Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Sun Apr 6 12:59:01 2014 @@ -238,20 +238,24 @@ BOOLEAN LoadFMIFSEntryPoints() { HMODULE hFmifs = LoadLibrary( _T("fmifs.dll") ); + if (hFmifs == NULL) { + return FALSE; + } + if( !(void*) GetProcAddress( hFmifs, "FormatEx" ) ) { - + FreeLibrary(hFmifs); return FALSE; } if( !((void *) GetProcAddress( hFmifs, "EnableVolumeCompression" )) ) { - + FreeLibrary(hFmifs); return FALSE; } if( !((void *) GetProcAddress( hFmifs, "QueryAvailableFileSystemFormat" )) ) { - + FreeLibrary(hFmifs); return FALSE; }

10 years, 5 months

[pschweitzer] 62648: [TCPSVCS] - Fix buffer overrun - Fix memory leak - Properly init memory CID #511073 CID #1102322 CID #1102405

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 12:44:10 2014 New Revision: 62648 URL: http://svn.reactos.org/svn/reactos?rev=62648&view=rev Log: [TCPSVCS] - Fix buffer overrun - Fix memory leak - Properly init memory CID #511073 CID #1102322 CID #1102405 Modified: trunk/reactos/base/services/tcpsvcs/qotd.c trunk/reactos/base/services/tcpsvcs/skelserver.c Modified: trunk/reactos/base/services/tcpsvcs/qotd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/qotd… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/qotd.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/qotd.c [iso-8859-1] Sun Apr 6 12:44:10 2014 @@ -58,7 +58,7 @@ else { DWORD dwSize = GetFileSize(hFile, NULL); - lpQuotes = (LPSTR)HeapAlloc(GetProcessHeap(), 0, dwSize); + lpQuotes = (LPSTR)HeapAlloc(GetProcessHeap(), 0, dwSize + 1); if (!lpQuotes) { CloseHandle(hFile); @@ -75,7 +75,10 @@ lpQuotes[dwSize] = 0; if (dwBytesRead != dwSize) + { + HeapFree(GetProcessHeap(), 0, lpQuotes); return FALSE; + } lpStr = lpQuotes; while (*lpStr) @@ -120,6 +123,7 @@ } } + HeapFree(GetProcessHeap(), 0, lpQuotes); return TRUE; } Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/skel… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/skelserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/skelserver.c [iso-8859-1] Sun Apr 6 12:44:10 2014 @@ -21,6 +21,7 @@ sock = socket(AF_INET, SOCK_STREAM, 0); if (sock != INVALID_SOCKET) { + ZeroMemory(&server, sizeof(SOCKADDR_IN)); server.sin_family = AF_INET; server.sin_addr.s_addr = htonl(INADDR_ANY); server.sin_port = Port;

10 years, 5 months

← Newer
1
...
41
42
43
44
45
46
47
...
50
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 April 2014