Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 54620: [TCPIP] - Fix IPPacket double free in IPSendDatagram failure case
by cgutman＠svn.reactos.org 08 Dec '11

08 Dec '11

Author: cgutman Date: Thu Dec 8 21:21:25 2011 New Revision: 54620 URL: http://svn.reactos.org/svn/reactos?rev=54620&view=rev Log: [TCPIP] - Fix IPPacket double free in IPSendDatagram failure case Modified: trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/tcp/if.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Thu Dec 8 21:21:25 2011 @@ -23,29 +23,6 @@ return STATUS_SUCCESS; } - -VOID SendICMPComplete( - PVOID Context, - PNDIS_PACKET Packet, - NDIS_STATUS NdisStatus) -/* - * FUNCTION: ICMP datagram transmit completion handler - * ARGUMENTS: - * Context = Pointer to context infomation (IP_PACKET) - * Packet = Pointer to NDIS packet - * NdisStatus = Status of transmit operation - * NOTES: - * This routine is called by IP when a ICMP send completes - */ -{ - TI_DbgPrint(DEBUG_ICMP, ("Freeing NDIS packet (%X).\n", Packet)); - - /* Free packet */ - FreeNdisPacket(Packet); - - TI_DbgPrint(DEBUG_ICMP, ("Done\n")); -} - BOOLEAN PrepareICMPPacket( PADDRESS_FILE AddrFile, @@ -219,10 +196,7 @@ Status = IPSendDatagram(&Packet, NCE); if (!NT_SUCCESS(Status)) - { - Packet.Free(&Packet); return Status; - } *DataUsed = DataSize; Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Thu Dec 8 21:21:25 2011 @@ -254,10 +254,7 @@ Status = IPSendDatagram(&Packet, NCE); if (!NT_SUCCESS(Status)) - { - Packet.Free(&Packet); return Status; - } *DataUsed = DataSize; Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Thu Dec 8 21:21:25 2011 @@ -61,10 +61,7 @@ NdisStatus = IPSendDatagram(&Packet, NCE); if (!NT_SUCCESS(NdisStatus)) - { - Packet.Free(&Packet); return ERR_RTE; - } return 0; } Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Thu Dec 8 21:21:25 2011 @@ -230,10 +230,7 @@ Status = IPSendDatagram(&Packet, NCE); if (!NT_SUCCESS(Status)) - { - Packet.Free(&Packet); return Status; - } *DataUsed = DataSize;

1 0

[rharabien] 54619: - Partially revert r54613 to fix test bot
by rharabien＠svn.reactos.org 08 Dec '11

08 Dec '11

Author: rharabien Date: Thu Dec 8 20:28:06 2011 New Revision: 54619 URL: http://svn.reactos.org/svn/reactos?rev=54619&view=rev Log: - Partially revert r54613 to fix test bot Modified: trunk/reactos/tools/rsym/rsym.c Modified: trunk/reactos/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.c?rev=5461… ============================================================================== --- trunk/reactos/tools/rsym/rsym.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.c [iso-8859-1] Thu Dec 8 20:28:06 2011 @@ -432,6 +432,34 @@ } static int +IncludeRelocationsForSection(PIMAGE_SECTION_HEADER SectionHeader) +{ + static char *BlacklistedSections[] = + { + ".edata", + ".reloc" + }; + char SectionName[IMAGE_SIZEOF_SHORT_NAME]; + unsigned i; + + if (0 != (SectionHeader->Characteristics & IMAGE_SCN_LNK_REMOVE)) + { + return 0; + } + + for (i = 0; i < sizeof(BlacklistedSections) / sizeof(BlacklistedSections[0]); i++) + { + strncpy(SectionName, BlacklistedSections[i], IMAGE_SIZEOF_SHORT_NAME); + if (0 == memcmp(SectionName, SectionHeader->Name, IMAGE_SIZEOF_SHORT_NAME)) + { + return 0; + } + } + + return 1; +} + +static int ProcessRelocations(ULONG *ProcessedRelocsLength, void **ProcessedRelocs, void *RawData, PIMAGE_OPTIONAL_HEADER OptHeader, unsigned NumberOfSections, PIMAGE_SECTION_HEADER SectionHeaders) @@ -476,7 +504,7 @@ { TargetSectionHeader = FindSectionForRVA(BaseReloc->VirtualAddress, NumberOfSections, SectionHeaders); - if (NULL != TargetSectionHeader) + if (NULL != TargetSectionHeader && IncludeRelocationsForSection(TargetSectionHeader)) { AcceptedRelocs = *ProcessedRelocs; Found = 0;

1 0

[fireball] 54618: [KERNEL32] - Zero-initialize ActivationContextStack pointer before calling RtlAllocateActivationContextStack(). This allows to get rid of some hacks in the existing ActCtx support...
by fireball＠svn.reactos.org 08 Dec '11

08 Dec '11

Author: fireball Date: Thu Dec 8 19:40:25 2011 New Revision: 54618 URL: http://svn.reactos.org/svn/reactos?rev=54618&view=rev Log: [KERNEL32] - Zero-initialize ActivationContextStack pointer before calling RtlAllocateActivationContextStack(). This allows to get rid of some hacks in the existing ActCtx support in the ntdll loader and actual implementation. Modified: trunk/reactos/dll/win32/kernel32/client/thread.c Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Thu Dec 8 19:40:25 2011 @@ -182,7 +182,7 @@ if (hProcess == NtCurrentProcess()) { PTEB Teb; - PVOID ActivationContextStack; + PVOID ActivationContextStack = NULL; THREAD_BASIC_INFORMATION ThreadBasicInfo; #ifndef SXS_SUPPORT_FIXME ACTIVATION_CONTEXT_BASIC_INFORMATION ActivationCtxInfo;

1 0

[rmessiant] 54617: [WIN32K] - Probe the whole SIZE struct arguments, not a pointer size. LPSIZE -> SIZE. CID 14119, 14120.
by rmessiant＠svn.reactos.org 08 Dec '11

08 Dec '11

Author: rmessiant Date: Thu Dec 8 19:38:58 2011 New Revision: 54617 URL: http://svn.reactos.org/svn/reactos?rev=54617&view=rev Log: [WIN32K] - Probe the whole SIZE struct arguments, not a pointer size. LPSIZE -> SIZE. CID 14119, 14120. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Thu Dec 8 19:38:58 2011 @@ -587,7 +587,7 @@ { _SEH2_TRY { - ProbeForWrite(pSize, sizeof(LPSIZE), 1); + ProbeForWrite(pSize, sizeof(SIZE), 1); pSize->cx = pdcattr->szlViewportExt.cx; pSize->cy = pdcattr->szlViewportExt.cy; @@ -633,7 +633,7 @@ _SEH2_TRY { - ProbeForWrite(pSize, sizeof(LPSIZE), 1); + ProbeForWrite(pSize, sizeof(SIZE), 1); X = pdcattr->szlWindowExt.cx; if (pdcattr->dwLayout & LAYOUT_RTL) X = -X;

1 0

[cgutman] 54616: [WS2_32] - Store WSAPROTOCOL_INFOW struct on the stack
by cgutman＠svn.reactos.org 08 Dec '11

08 Dec '11

Author: cgutman Date: Thu Dec 8 19:29:20 2011 New Revision: 54616 URL: http://svn.reactos.org/svn/reactos?rev=54616&view=rev Log: [WS2_32] - Store WSAPROTOCOL_INFOW struct on the stack Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Thu Dec 8 19:29:20 2011 @@ -371,7 +371,7 @@ { INT ret, len; LPWSTR szTemp; - LPWSAPROTOCOL_INFOW lpProtoInfoW = NULL; + WSAPROTOCOL_INFOW ProtoInfoW; len = MultiByteToWideChar(CP_ACP, 0, @@ -393,13 +393,7 @@ if (lpProtocolInfo) { - len = WSAPROTOCOL_LEN+1; - lpProtoInfoW = HeapAlloc(GetProcessHeap(), - 0, - FIELD_OFFSET(WSAPROTOCOL_INFOW, szProtocol) + - (len * sizeof(WCHAR))); - - memcpy(lpProtoInfoW, + memcpy(&ProtoInfoW, lpProtocolInfo, FIELD_OFFSET(WSAPROTOCOL_INFOA, szProtocol)); @@ -407,24 +401,19 @@ 0, lpProtocolInfo->szProtocol, -1, - lpProtoInfoW->szProtocol, - len); + ProtoInfoW.szProtocol, + WSAPROTOCOL_LEN + 1); } ret = WSAStringToAddressW(szTemp, AddressFamily, - lpProtoInfoW, + &ProtoInfoW, lpAddress, lpAddressLength); HeapFree(GetProcessHeap(), 0, szTemp ); - - if (lpProtocolInfo) - HeapFree(GetProcessHeap(), - 0, - lpProtoInfoW); WSASetLastError(ret); return ret;

1 0

[rharabien] 54615: [WS2_32] - Use size of struct instead of size of pointer. Don't copy szProtocol, because it's set later. CID 14129 and 54.
by rharabien＠svn.reactos.org 08 Dec '11

08 Dec '11

Author: rharabien Date: Thu Dec 8 19:21:01 2011 New Revision: 54615 URL: http://svn.reactos.org/svn/reactos?rev=54615&view=rev Log: [WS2_32] - Use size of struct instead of size of pointer. Don't copy szProtocol, because it's set later. CID 14129 and 54. Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Thu Dec 8 19:21:01 2011 @@ -401,7 +401,7 @@ memcpy(lpProtoInfoW, lpProtocolInfo, - sizeof(LPWSAPROTOCOL_INFOA)); + FIELD_OFFSET(WSAPROTOCOL_INFOA, szProtocol)); MultiByteToWideChar(CP_ACP, 0, @@ -427,7 +427,7 @@ lpProtoInfoW); WSASetLastError(ret); - return ret; + return ret; } @@ -459,9 +459,9 @@ /* Set right adress family */ if (lpProtocolInfo!=NULL) - sockaddr->sin_family = lpProtocolInfo->iAddressFamily; - - else sockaddr->sin_family = AddressFamily; + sockaddr->sin_family = lpProtocolInfo->iAddressFamily; + else + sockaddr->sin_family = AddressFamily; /* Report size */ if (AddressFamily == AF_INET) @@ -513,7 +513,7 @@ WSASetLastError(res); if (!res) return 0; - return SOCKET_ERROR; + return SOCKET_ERROR; } void check_hostent(struct hostent **he) @@ -923,13 +923,12 @@ if(name == NULL) { ret = gethostname(p->Hostent->h_name, MAX_HOSTNAME_LEN); + if(ret) + { + WSASetLastError( WSAHOST_NOT_FOUND ); //WSANO_DATA ?? + return NULL; + } return p->Hostent; - } - - if(ret) - { - WSASetLastError( WSAHOST_NOT_FOUND ); //WSANO_DATA ?? - return NULL; } /* Is it an IPv6 address? */

1 0

[cgutman] 54614: [WS2_32] - Allocate enough memory for the WSAPROTOCOL_INFOW struct
by cgutman＠svn.reactos.org 08 Dec '11

08 Dec '11

Author: cgutman Date: Thu Dec 8 19:16:24 2011 New Revision: 54614 URL: http://svn.reactos.org/svn/reactos?rev=54614&view=rev Log: [WS2_32] - Allocate enough memory for the WSAPROTOCOL_INFOW struct Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Thu Dec 8 19:16:24 2011 @@ -393,10 +393,11 @@ if (lpProtocolInfo) { - len = WSAPROTOCOL_LEN+1; + len = WSAPROTOCOL_LEN+1; lpProtoInfoW = HeapAlloc(GetProcessHeap(), 0, - len * sizeof(WCHAR) ); + FIELD_OFFSET(WSAPROTOCOL_INFOW, szProtocol) + + (len * sizeof(WCHAR))); memcpy(lpProtoInfoW, lpProtocolInfo,

1 0

[rharabien] 54613: [RSYM] - Don't strip relocations for some sections. Linker knows better if they are needed. Fixes removed relocations for delayed imports in idata section. Bug traced by me, Timo...
by rharabien＠svn.reactos.org 08 Dec '11

08 Dec '11

Author: rharabien Date: Thu Dec 8 19:02:04 2011 New Revision: 54613 URL: http://svn.reactos.org/svn/reactos?rev=54613&view=rev Log: [RSYM] - Don't strip relocations for some sections. Linker knows better if they are needed. Fixes removed relocations for delayed imports in idata section. Bug traced by me, Timo and Amine. See issue #6618 for more details. Modified: trunk/reactos/tools/rsym/rsym.c Modified: trunk/reactos/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.c?rev=5461… ============================================================================== --- trunk/reactos/tools/rsym/rsym.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.c [iso-8859-1] Thu Dec 8 19:02:04 2011 @@ -432,35 +432,6 @@ } static int -IncludeRelocationsForSection(PIMAGE_SECTION_HEADER SectionHeader) -{ - static char *BlacklistedSections[] = - { - ".edata", - ".idata", - ".reloc" - }; - char SectionName[IMAGE_SIZEOF_SHORT_NAME]; - unsigned i; - - if (0 != (SectionHeader->Characteristics & IMAGE_SCN_LNK_REMOVE)) - { - return 0; - } - - for (i = 0; i < sizeof(BlacklistedSections) / sizeof(BlacklistedSections[0]); i++) - { - strncpy(SectionName, BlacklistedSections[i], IMAGE_SIZEOF_SHORT_NAME); - if (0 == memcmp(SectionName, SectionHeader->Name, IMAGE_SIZEOF_SHORT_NAME)) - { - return 0; - } - } - - return 1; -} - -static int ProcessRelocations(ULONG *ProcessedRelocsLength, void **ProcessedRelocs, void *RawData, PIMAGE_OPTIONAL_HEADER OptHeader, unsigned NumberOfSections, PIMAGE_SECTION_HEADER SectionHeaders) @@ -505,7 +476,7 @@ { TargetSectionHeader = FindSectionForRVA(BaseReloc->VirtualAddress, NumberOfSections, SectionHeaders); - if (NULL != TargetSectionHeader && IncludeRelocationsForSection(TargetSectionHeader)) + if (NULL != TargetSectionHeader) { AcceptedRelocs = *ProcessedRelocs; Found = 0;

1 0

[pschweitzer] 54612: [USP10] Fix memory leaks. Already sent & committed upstream: http://source.winehq.org/git/wine.git/commit/783683be2decd90079e484e6d12eee958da29754
by pschweitzer＠svn.reactos.org 08 Dec '11

08 Dec '11

Author: pschweitzer Date: Thu Dec 8 18:10:36 2011 New Revision: 54612 URL: http://svn.reactos.org/svn/reactos?rev=54612&view=rev Log: [USP10] Fix memory leaks. Already sent & committed upstream: http://source.winehq.org/git/wine.git/commit/783683be2decd90079e484e6d12eee… Modified: trunk/reactos/dll/win32/usp10/usp10.c Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Thu Dec 8 18:10:36 2011 @@ -1439,7 +1439,10 @@ { int tab_x = 0; if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) + { + heap_free(BidiLevel); goto error; + } for (i = 0; i < analysis->numItems; i++) { @@ -2422,8 +2425,16 @@ if (!(pwOutGlyphs[i] = get_cache_glyph(psc, chInput))) { WORD glyph; - if (!hdc) return E_PENDING; - if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR) return S_FALSE; + if (!hdc) + { + heap_free(rChars); + return E_PENDING; + } + if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR) + { + heap_free(rChars); + return S_FALSE; + } pwOutGlyphs[i] = set_cache_glyph(psc, chInput, glyph); } rChars[i] = chInput; @@ -2487,7 +2498,11 @@ charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars); if (!charProps) return E_OUTOFMEMORY; glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs); - if (!glyphProps) return E_OUTOFMEMORY; + if (!glyphProps) + { + heap_free(charProps); + return E_OUTOFMEMORY; + } hr = ScriptShapeOpenType(hdc, psc, psa, scriptInformation[psa->eScript].scriptTag, 0, NULL, NULL, 0, pwcChars, cChars, cMaxGlyphs, pwLogClust, charProps, pwOutGlyphs, glyphProps, pcGlyphs);

1 0

[jimtabor] 54611: [User32] - Add more debugging prints for message types in WndProc callback.
by jimtabor＠svn.reactos.org 08 Dec '11

08 Dec '11

Author: jimtabor Date: Thu Dec 8 17:00:59 2011 New Revision: 54611 URL: http://svn.reactos.org/svn/reactos?rev=54611&view=rev Log: [User32] - Add more debugging prints for message types in WndProc callback. Modified: trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Thu Dec 8 17:00:59 2011 @@ -1402,10 +1402,10 @@ switch(Hit) { case 1: - ERR("CallWindowProcW Ansi Failed! WndProc %p\n",WndProc); + ERR("CallWindowProcW Ansi Failed! Msg %d WndProc %p\n",Msg,WndProc); break; case 2: - ERR("CallWindowProcW Unicode Failed! WndProc %p\n",WndProc); + ERR("CallWindowProcW Unicode Failed! Msg %d WndProc %p\n",Msg,WndProc); break; } } @@ -1566,10 +1566,10 @@ switch(Hit) { case 1: - ERR("CallWindowProcA Ansi Failed! WndProc %p\n",WndProc); + ERR("CallWindowProcA Ansi Failed! Msg %d WndProc %p\n",Msg,WndProc); break; case 2: - ERR("CallWindowProcA Unicode Failed! WndProc %p\n",WndProc); + ERR("CallWindowProcA Unicode Failed! Msg %d WndProc %p\n",Msg,WndProc); break; } }

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