Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[cgutman] 42776: - Fix ws2_32_new's build problems - ws2_32_new is now included in build (output file is ws2_32_new.dll for any curious testers :P)
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 23:40:20 2009 New Revision: 42776 URL: http://svn.reactos.org/svn/reactos?rev=42776&view=rev Log: - Fix ws2_32_new's build problems - ws2_32_new is now included in build (output file is ws2_32_new.dll for any curious testers :P) Added: trunk/reactos/include/reactos/winsock/ Removed: trunk/reactos/dll/win32/ws2help/ws2help.h Modified: trunk/reactos/dll/win32/win32.rbuild trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild trunk/reactos/dll/win32/ws2help/ws2help.rbuild Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Tue Aug 18 23:40:20 2009 @@ -619,6 +619,9 @@ <directory name="ws2_32"> <xi:include href="ws2_32/ws2_32.rbuild" /> </directory> +<directory name="ws2_32_new"> + <xi:include href="ws2_32_new/ws2_32.rbuild" /> +</directory> <directory name="ws2help"> <xi:include href="ws2help/ws2help.rbuild" /> </directory> Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Tue Aug 18 23:40:20 2009 @@ -25,9 +25,7 @@ #include <ws2spi.h> #include <ndk/umtypes.h> #include <ndk/rtlfuncs.h> - -/* Shared NSP Headers */ -#include <nsp_dns.h> +#include <svcguid.h> /* Winsock Helper Header */ #include <ws2help.h> Modified: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] Tue Aug 18 23:40:20 2009 @@ -8,6 +8,7 @@ /* INCLUDES ******************************************************************/ #include "ws2_32.h" +#include <nsp_dns.h> //#define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_3… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] Tue Aug 18 23:40:20 2009 @@ -1,6 +1,7 @@ <module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll"> <importlibrary definition="ws2_32.spec" /> <include base="ws2_32_new">inc</include> + <include base="ReactOS">include/reactos/winsock</include> <define name="LE" /> <library>wine</library> <library>ntdll</library> Removed: trunk/reactos/dll/win32/ws2help/ws2help.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.h (removed) @@ -1,163 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS WinSock 2 Helper DLL - * FILE: include/libs/winsock/ws2help.h - * PURPOSE: WinSock 2 Helper DLL header - */ - -#ifndef __WS2HELP_H -#define __WS2HELP_H - -/* Types */ -typedef struct _WSH_HANDLE -{ - LONG RefCount; - HANDLE Handle; -} WSH_HANDLE, *PWAH_HANDLE; - -typedef struct _WSH_HASH_TABLE -{ - DWORD Size; - PWAH_HANDLE Handles[1]; -} WSH_HASH_TABLE, *PWAH_HASH_TABLE; - -typedef struct _WSH_SEARCH_TABLE -{ - volatile PWAH_HASH_TABLE HashTable; - volatile PLONG CurrentCount; - LONG Count1; - LONG Count2; - LONG SpinCount; - BOOL Expanding; - CRITICAL_SECTION Lock; -} WSH_SEARCH_TABLE, *PWAH_SEARCH_TABLE; - -typedef struct _WSH_HANDLE_TABLE -{ - DWORD Mask; - WSH_SEARCH_TABLE SearchTables[1]; -} WSH_HANDLE_TABLE, *PWAH_HANDLE_TABLE; - -//typedef struct _WSH_HANDLE_TABLE *PWAH_HANDLE_TABLE; - -typedef BOOL -(WINAPI *PWAH_HANDLE_ENUMERATE_PROC)( - IN PVOID Context, - IN PWAH_HANDLE Handle -); - -PWAH_HANDLE -WINAPI -WahReferenceContextByHandle( - IN PWAH_HANDLE_TABLE Table, - IN HANDLE Handle -); - -DWORD -WINAPI -WahRemoveHandleContext( - IN PWAH_HANDLE_TABLE Table, - IN PWAH_HANDLE Handle -); - -DWORD -WINAPI -WahCloseSocketHandle( - IN HANDLE HelperHandle, - IN SOCKET Socket -); - -DWORD -WINAPI -WahOpenCurrentThread( - IN HANDLE HelperHandle, - OUT LPWSATHREADID ThreadId -); - -DWORD -WINAPI -WahCloseApcHelper( - IN HANDLE HelperHandle -); - -DWORD -WINAPI -WahCloseThread( - IN HANDLE HelperHandle, - IN LPWSATHREADID ThreadId -); - -DWORD -WINAPI -WahCloseHandleHelper( - IN HANDLE HelperHandle -); - -DWORD -WINAPI -WahCloseNotificationHandleHelper( - IN HANDLE HelperHandle -); - -DWORD -WINAPI -WahOpenNotificationHandleHelper( - OUT PHANDLE HelperHandle -); - -DWORD -WINAPI -WahCreateNotificationHandle( - IN HANDLE HelperHandle, - OUT PHANDLE NotificationHelperHandle -); - -INT -WINAPI -WahWaitForNotification( - IN HANDLE NotificationHelperHandle, - IN HANDLE lpNotificationHandle, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine -); - -INT -WINAPI -WahNotifyAllProcesses( - IN HANDLE NotificationHelperHandle -); - -BOOL -WINAPI -WahEnumerateHandleContexts( - IN PWAH_HANDLE_TABLE Table, - IN PWAH_HANDLE_ENUMERATE_PROC Callback, - IN PVOID Context -); - -DWORD -WINAPI -WahCreateHandleContextTable( - OUT PWAH_HANDLE_TABLE *Table -); - -DWORD -WINAPI -WahDestroyHandleContextTable( - IN PWAH_HANDLE_TABLE Table -); - -PWAH_HANDLE -WINAPI -WahInsertHandleContext( - IN PWAH_HANDLE_TABLE Table, - IN PWAH_HANDLE Handle -); - -DWORD -WINAPI -WahOpenApcHelper( - OUT PHANDLE ApcHelperHandle -); - -#endif Modified: trunk/reactos/dll/win32/ws2help/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] Tue Aug 18 23:40:20 2009 @@ -1,6 +1,7 @@ <module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll"> <importlibrary definition="ws2help.spec" /> <include base="ws2help">.</include> + <include base="ReactOS">include/reactos/winsock</include> <library>advapi32</library> <library>ntdll</library> <library>kernel32</library>

1 0

[cgutman] 42775: - Print a message to the debug log if ZwClose returns STATUS_INVALID_HANDLE - This message will only after "cont"ing past the bugcheck and will hopefully help me track down bug 4796
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 22:43:13 2009 New Revision: 42775 URL: http://svn.reactos.org/svn/reactos?rev=42775&view=rev Log: - Print a message to the debug log if ZwClose returns STATUS_INVALID_HANDLE - This message will only after "cont"ing past the bugcheck and will hopefully help me track down bug 4796 Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Tue Aug 18 22:43:13 2009 @@ -233,10 +233,20 @@ ObDereferenceObject(FCB->AddressFile.Object); if( FCB->AddressFile.Handle != INVALID_HANDLE_VALUE ) - ZwClose(FCB->AddressFile.Handle); + { + if (ZwClose(FCB->AddressFile.Handle) == STATUS_INVALID_HANDLE) + { + DbgPrint("INVALID ADDRESS FILE HANDLE VALUE: %x %x\n", FCB->AddressFile.Handle, FCB->AddressFile.Object); + } + } if( FCB->Connection.Handle != INVALID_HANDLE_VALUE ) - ZwClose(FCB->Connection.Handle); + { + if (ZwClose(FCB->Connection.Handle) == STATUS_INVALID_HANDLE) + { + DbgPrint("INVALID CONNECTION HANDLE VALUE: %x %x\n", FCB->Connection.Handle, FCB->Connection.Object); + } + } if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer);

1 0

[cgutman] 42774: - Fix null pointer dereferences - Fix out of bounds array access - Check that we got a valid pointer from HeapAlloc - Don't close the caller's handle when we fail - Fix a memory leak - Found by Amine Khaldi
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 22:30:58 2009 New Revision: 42774 URL: http://svn.reactos.org/svn/reactos?rev=42774&view=rev Log: - Fix null pointer dereferences - Fix out of bounds array access - Check that we got a valid pointer from HeapAlloc - Don't close the caller's handle when we fail - Fix a memory leak - Found by Amine Khaldi Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c trunk/reactos/dll/win32/iphlpapi/registry.c trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Tue Aug 18 22:30:58 2009 @@ -582,6 +582,8 @@ interfaceName = HeapAlloc( GetProcessHeap(), 0, strlen(adapter_name) + 1 ); + if (!interfaceName) return NULL; + strcpy( interfaceName, adapter_name ); } @@ -847,15 +849,14 @@ char *toIPAddressString(unsigned int addr, char string[16]) { - if (string) { struct in_addr iAddr; iAddr.s_addr = addr; - /* extra-anal, just to make auditors happy */ - strncpy(string, inet_ntoa(iAddr), 16); - string[16] = '\0'; - } - return string; + + if (string) + strncpy(string, inet_ntoa(iAddr), 16); + + return inet_ntoa(iAddr); } NTSTATUS addIPAddress( IPAddr Address, IPMask Mask, DWORD IfIndex, Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Tue Aug 18 22:30:58 2009 @@ -102,6 +102,7 @@ { DWORD ndx, retVal = 0, numRoutes = getNumRoutes(); RouteTable *table = getRouteTable(); + if (!table) return 0; for (ndx = 0; ndx < numRoutes; ndx++) { @@ -645,9 +646,12 @@ DWORD addrLen = sizeof(ptr->Address), type; const char *ifname = getInterfaceNameByIndex(table->indexes[ndx]); + if (!ifname) { + ret = ERROR_OUTOFMEMORY; + break; + } /* on Win98 this is left empty, but whatever */ - strncpy(ptr->AdapterName,ifname,sizeof(ptr->AdapterName)); consumeInterfaceName(ifname); ptr->AdapterName[MAX_ADAPTER_NAME_LENGTH] = '\0'; @@ -983,9 +987,9 @@ } else { InterfaceIndexTable *table = getNonLoopbackInterfaceIndexTable(); - TRACE("table->numIndexes == 0x%x\n", table->numIndexes); if (table) { + TRACE("table->numIndexes == 0x%x\n", table->numIndexes); size = sizeof(IP_INTERFACE_INFO) + (table->numIndexes) * sizeof(IP_ADAPTER_INDEX_MAP); if (*dwOutBufLen < size) { Modified: trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ipstats… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] Tue Aug 18 22:30:58 2009 @@ -459,6 +459,10 @@ out_route_table = HeapAlloc( GetProcessHeap(), 0, sizeof(RouteTable) + (sizeof(RouteEntry) * (numRoutes - 1)) ); + if (!out_route_table) { + closeTcpFile(tcpFile); + return NULL; + } out_route_table->numRoutes = numRoutes; @@ -586,6 +590,10 @@ IpArpTable = HeapAlloc ( GetProcessHeap(), 0, sizeof(DWORD) + (sizeof(MIB_IPNETROW) * totalNumber) ); + if (!IpArpTable) { + closeTcpFile(tcpFile); + return NULL; + } status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); Modified: trunk/reactos/dll/win32/iphlpapi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/registr… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] Tue Aug 18 22:30:58 2009 @@ -44,18 +44,19 @@ PWCHAR Value; DWORD ValueLen; - if (MaxAdapterName == -1) { - RegCloseKey( RegHandle ); + if (MaxAdapterName == -1) return 0; - } ValueLen = MaxAdapterName; Value = (PWCHAR)HeapAlloc( GetProcessHeap(), 0, MaxAdapterName * sizeof(WCHAR) ); + if (!Value) return 0; + Status = RegEnumKeyExW( RegHandle, n, Value, &ValueLen, NULL, NULL, NULL, NULL ); - if (Status != ERROR_SUCCESS) + if (Status != ERROR_SUCCESS) { + HeapFree(GetProcessHeap(), 0, Value); return 0; - else { + } else { Value[ValueLen] = 0; return Value; } Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Tue Aug 18 22:30:58 2009 @@ -151,11 +151,13 @@ } if (ch - LastNameStart > 0) { /* A last name? */ PWCHAR NameServer = malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); - memcpy(NameServer,NameServerString + LastNameStart, - (ch - LastNameStart) * sizeof(WCHAR)); - NameServer[ch - LastNameStart] = 0; - cb( Interface, NameServer, Data ); - free(NameServer); + if (NameServer) { + memcpy(NameServer,NameServerString + LastNameStart, + (ch - LastNameStart) * sizeof(WCHAR)); + NameServer[ch - LastNameStart] = 0; + cb( Interface, NameServer, Data ); + free(NameServer); + } } ConsumeRegValueString(NameServerString); } @@ -223,6 +225,8 @@ PrivateNSEnum.NumServers = ServerCount; DnsList = HeapAlloc(GetProcessHeap(), 0, ServerCount * sizeof(IP_ADDR_STRING)); + if (!DnsList) return NULL; + ZeroMemory(DnsList, ServerCount * sizeof(IP_ADDR_STRING)); ResInfo = (PIPHLP_RES_INFO)RtlAllocateHeap ( GetProcessHeap(), 0, sizeof(IPHLP_RES_INFO));

1 0

[gschneider] 42773: - Improve glyph guard from r42749: allow displaying glyphs if the application knows the character placements - Some rendering engines (like FF3) do the conversion without using GetCharacterPlacementA/W
by gschneider＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: gschneider Date: Tue Aug 18 21:51:32 2009 New Revision: 42773 URL: http://svn.reactos.org/svn/reactos?rev=42773&view=rev Log: - Improve glyph guard from r42749: allow displaying glyphs if the application knows the character placements - Some rendering engines (like FF3) do the conversion without using GetCharacterPlacementA/W Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Tue Aug 18 21:51:32 2009 @@ -3695,7 +3695,10 @@ } /* FIXME: remove this as soon as GetCharacterPlacementA/W work properly */ - fuOptions &= ~ETO_GLYPH_INDEX; + if ((fuOptions & ETO_GLYPH_INDEX) && (fuOptions != (ETO_GLYPH_INDEX | ETO_PDY))) + { + fuOptions &= ~ETO_GLYPH_INDEX; + } /* Finally call the internal routine */ Result = GreExtTextOutW(hDC,

1 0

[cgutman] 42772: - Fix dereference of freed memory
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 21:06:52 2009 New Revision: 42772 URL: http://svn.reactos.org/svn/reactos?rev=42772&view=rev Log: - Fix dereference of freed memory Modified: trunk/reactos/dll/win32/ws2help/handle.c Modified: trunk/reactos/dll/win32/ws2help/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/handle.c… ============================================================================== --- trunk/reactos/dll/win32/ws2help/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/handle.c [iso-8859-1] Tue Aug 18 21:06:52 2009 @@ -65,6 +65,7 @@ ExitThreadApc(ULONG_PTR Context) { PWAH_HELPER_CONTEXT HelperContext = (PWAH_HELPER_CONTEXT)Context; + HMODULE DllHandle = HelperContext->DllHandle; /* Close the file handle */ CloseHandle(HelperContext->FileHandle); @@ -73,7 +74,7 @@ HeapFree(GlobalHeap, 0, HelperContext); /* Exit the thread and library */ - FreeLibraryAndExitThread(HelperContext->DllHandle, ERROR_SUCCESS); + FreeLibraryAndExitThread(DllHandle, ERROR_SUCCESS); } DWORD

1 0

[cgutman] 42771: - Fix a typo
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 21:04:51 2009 New Revision: 42771 URL: http://svn.reactos.org/svn/reactos?rev=42771&view=rev Log: - Fix a typo Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Tue Aug 18 21:04:51 2009 @@ -346,7 +346,7 @@ case STATUS_NO_MEMORY: /* Fall through to STATUS_INSUFFICIENT_RESOURCES */ case STATUS_INSUFFICIENT_RESOURCES: DbgPrint("MSAFD: STATUS_NO_MEMORY/STATUS_INSUFFICIENT_RESOURCES\n"); - *Errno = WSANOBUFS; + *Errno = WSAENOBUFS; break; case STATUS_INVALID_CONNECTION: DbgPrint("MSAFD: STATUS_INVALID_CONNECTION\n");

1 0

[cgutman] 42770: - Make sure HeapAlloc returned a valid pointer - Fix some memory leaks - Return a better status for STATUS_INSUFFICIENT_RESOURCES and STATUS_NO_MEMORY - Fix a potential null pointer dereference in SetSocketInformation and GetSocketInformation - Initialize RemoteAddress so we aren't trying to copy the remote address to 0 - Found by Amine Khaldi
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 20:53:10 2009 New Revision: 42770 URL: http://svn.reactos.org/svn/reactos?rev=42770&view=rev Log: - Make sure HeapAlloc returned a valid pointer - Fix some memory leaks - Return a better status for STATUS_INSUFFICIENT_RESOURCES and STATUS_NO_MEMORY - Fix a potential null pointer dereference in SetSocketInformation and GetSocketInformation - Initialize RemoteAddress so we aren't trying to copy the remote address to 0 - Found by Amine Khaldi Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Tue Aug 18 20:53:10 2009 @@ -98,6 +98,9 @@ /* Set Socket Data */ Socket = HeapAlloc(GlobalHeap, 0, sizeof(*Socket)); + if (!Socket) + return MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); + RtlZeroMemory(Socket, sizeof(*Socket)); Socket->RefCount = 2; Socket->Handle = -1; @@ -140,6 +143,9 @@ /* Set up EA Buffer */ EABuffer = HeapAlloc(GlobalHeap, 0, SizeOfEA); + if (!EABuffer) + return MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); + RtlZeroMemory(EABuffer, SizeOfEA); EABuffer->NextEntryOffset = 0; EABuffer->Flags = 0; @@ -240,6 +246,8 @@ EABuffer, SizeOfEA); + HeapFree(GlobalHeap, 0, EABuffer); + /* Save Handle */ Socket->Handle = (SOCKET)Sock; @@ -290,6 +298,9 @@ error: AFD_DbgPrint(MID_TRACE,("Ending %x\n", Status)); + + if( Socket ) + HeapFree(GlobalHeap, 0, Socket); if( lpErrno ) *lpErrno = Status; @@ -335,7 +346,7 @@ case STATUS_NO_MEMORY: /* Fall through to STATUS_INSUFFICIENT_RESOURCES */ case STATUS_INSUFFICIENT_RESOURCES: DbgPrint("MSAFD: STATUS_NO_MEMORY/STATUS_INSUFFICIENT_RESOURCES\n"); - *Errno = WSA_NOT_ENOUGH_MEMORY; + *Errno = WSANOBUFS; break; case STATUS_INVALID_CONNECTION: DbgPrint("MSAFD: STATUS_INVALID_CONNECTION\n"); @@ -1038,6 +1049,11 @@ { /* Allocate needed space */ PendingData = HeapAlloc(GlobalHeap, 0, PendingDataLength); + if (!PendingData) + { + MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } /* We want the data now */ PendingAcceptData.ReturnSize = FALSE; @@ -1079,6 +1095,13 @@ CalleeID.buf = (PVOID)Socket->LocalAddress; CalleeID.len = Socket->SharedData.SizeOfLocalAddress; + RemoteAddress = HeapAlloc(GlobalHeap, 0, sizeof(*RemoteAddress)); + if (!RemoteAddress) + { + MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); + return INVALID_SOCKET; + } + /* Set up Address in SOCKADDR Format */ RtlCopyMemory (RemoteAddress, &ListenReceiveData->Address.Address[0].AddressType, @@ -1097,6 +1120,10 @@ { /* Allocate Buffer for Callee Data */ CalleeDataBuffer = HeapAlloc(GlobalHeap, 0, 4096); + if (!CalleeDataBuffer) { + MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } CalleeData.buf = CalleeDataBuffer; CalleeData.len = 4096; } @@ -1288,6 +1315,11 @@ /* Get the Wildcard Address */ BindAddressLength = Socket->HelperData->MaxWSAddressLength; BindAddress = HeapAlloc(GetProcessHeap(), 0, BindAddressLength); + if (!BindAddress) + { + MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } Socket->HelperData->WSHGetWildcardSockaddr (Socket->HelperContext, BindAddress, &BindAddressLength); @@ -1938,7 +1970,10 @@ } /* Return Information */ - *Ulong = InfoData.Information.Ulong; + if (Ulong != NULL) + { + *Ulong = InfoData.Information.Ulong; + } if (LargeInteger != NULL) { *LargeInteger = InfoData.Information.LargeInteger; @@ -1975,7 +2010,10 @@ InfoData.InformationClass = AfdInformationClass; /* Set Information */ - InfoData.Information.Ulong = *Ulong; + if (Ulong != NULL) + { + InfoData.Information.Ulong = *Ulong; + } if (LargeInteger != NULL) { InfoData.Information.LargeInteger = *LargeInteger; @@ -2491,6 +2529,7 @@ /* Wait on new events */ AsyncData = HeapAlloc(GetProcessHeap(), 0, sizeof(ASYNC_DATA)); + if (!AsyncData) return; /* Create the Asynch Thread if Needed */ SockCreateOrReferenceAsyncThread(); @@ -2538,6 +2577,7 @@ /* Allocate Heap for 1024 Sockets, can be expanded later */ Sockets = HeapAlloc(GetProcessHeap(), 0, sizeof(PSOCKET_INFORMATION) * 1024); + if (!Sockets) return FALSE; AFD_DbgPrint(MAX_TRACE, ("MSAFD.DLL has been loaded\n")); Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Tue Aug 18 20:53:10 2009 @@ -32,6 +32,11 @@ /* Allocate the Async Data Structure to pass on to the Thread later */ AsyncData = HeapAlloc(GetProcessHeap(), 0, sizeof(*AsyncData)); + if (!AsyncData) + { + MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } /* Change the Socket to Non Blocking */ BlockMode = 1; @@ -533,6 +538,11 @@ /* Get the Wildcard Address */ BindAddressLength = Socket->HelperData->MaxWSAddressLength; BindAddress = HeapAlloc(GlobalHeap, 0, BindAddressLength); + if (!BindAddress) + { + MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } Socket->HelperData->WSHGetWildcardSockaddr (Socket->HelperContext, BindAddress, &BindAddressLength);

1 0

[cgutman] 42769: - Handle failure of NdisMInitializeWrapper - Found by Amine Khaldi
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 20:01:26 2009 New Revision: 42769 URL: http://svn.reactos.org/svn/reactos?rev=42769&view=rev Log: - Handle failure of NdisMInitializeWrapper - Found by Amine Khaldi Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Tue Aug 18 20:01:26 2009 @@ -1342,6 +1342,7 @@ Characteristics.SendHandler = MiniportSend; NdisMInitializeWrapper(&WrapperHandle, DriverObject, RegistryPath, 0); + if (!WrapperHandle) return NDIS_STATUS_FAILURE; Status = NdisMRegisterMiniport(WrapperHandle, &Characteristics, sizeof(Characteristics)); if(Status != NDIS_STATUS_SUCCESS)

1 0

[cgutman] 42768: - Verify that we got a handle to a file object
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 18:23:31 2009 New Revision: 42768 URL: http://svn.reactos.org/svn/reactos?rev=42768&view=rev Log: - Verify that we got a handle to a file object Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Tue Aug 18 18:23:31 2009 @@ -130,7 +130,7 @@ if (NT_SUCCESS(Status)) { Status = ObReferenceObjectByHandle(*Handle, /* Handle to open file */ GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, /* Access mode */ - NULL, /* Object type */ + IoFileObjectType, /* Object type */ KernelMode, /* Access mode */ (PVOID*)Object, /* Pointer to object */ NULL); /* Handle information */

1 0

[gschneider] 42767: Check the correct buffer for failed memory allocation, found by Amine Khaldi
by gschneider＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: gschneider Date: Tue Aug 18 16:43:47 2009 New Revision: 42767 URL: http://svn.reactos.org/svn/reactos?rev=42767&view=rev Log: Check the correct buffer for failed memory allocation, found by Amine Khaldi Modified: trunk/reactos/dll/win32/kernel32/file/move.c Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] Tue Aug 18 16:43:47 2009 @@ -405,7 +405,7 @@ } lpExistingFileName2 = (LPWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,max_size * sizeof(WCHAR)); - if (lpNewFileName2 == NULL) + if (lpExistingFileName2 == NULL) { HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009