Author: pschweitzer
Date: Sun Feb 19 13:00:12 2017
New Revision: 73844
URL: http://svn.reactos.org/svn/reactos?rev=73844&view=rev
Log:
[SHELL32]
Don't attempt to dereference a pointer after having freed it
CID 1401297
Modified:
trunk/reactos/dll/win32/shell32/CShellLink.cpp
Modified: trunk/reactos/dll/win32/shell32/CShellLink.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShellLi…
==============================================================================
--- trunk/reactos/dll/win32/shell32/CShellLink.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CShellLink.cpp [iso-8859-1] Sun Feb 19 13:00:12 2017
@@ -1072,7 +1072,7 @@
ZeroMemory(pfd, sizeof(*pfd));
/* Copy the file data if a file path was returned */
- if (*pszFileW)
+ if (*pszFile)
{
/* Copy the fixed part */
CopyMemory(pfd, &wfd, FIELD_OFFSET(WIN32_FIND_DATAA, cFileName));
@@ -3050,4 +3050,4 @@
return E_FAIL;
return IShellLink_ConstructFromPath(path, riid, ppv);
-}
+}
Author: tfaber
Date: Sun Feb 19 11:44:18 2017
New Revision: 73839
URL: http://svn.reactos.org/svn/reactos?rev=73839&view=rev
Log:
[WS2_32]
- Fix wrong ServLength in getnameinfo, again, since it got lost in the ws2_32_new work. CID 716150
CORE-11214
Modified:
trunk/reactos/dll/win32/ws2_32/src/addrinfo.c
Modified: trunk/reactos/dll/win32/ws2_32/src/addrinfo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/addri…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/src/addrinfo.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/src/addrinfo.c [iso-8859-1] Sun Feb 19 11:44:18 2017
@@ -1028,7 +1028,7 @@
{
/* Setup the data for it */
ServiceString = ServiceBuffer;
- ServLength = sizeof(ServiceBuffer) - 1;
+ ServLength = sizeof(ServiceBuffer) / sizeof(WCHAR);
}
/* Now call the unicode function */