Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WS2_32] Use SEH in WSCGetProviderPath()

Browse source
This commit is contained in:
Pierre Schweitzer 2019-02-23 13:34:28 +01:00
parent 2e797accd3
commit d1598788cd
No known key found for this signature in database
GPG key ID: 7545556C3D585B0B
1 changed files with 40 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
dll/win32/ws2_32/src/enumprot.c
View file

@ -350,52 +350,60 @@ WSCGetProviderPath(IN LPGUID lpProviderId,
/* Get the catalog */
Catalog = WsProcGetNsCatalog(Process);
/* Setup the context */
Context.ProviderId = *lpProviderId;
Context.ProviderDllPath = lpszProviderDllPath;
Context.ProviderDllPathLen = *lpProviderDllPathLen;
Context.FoundPathLen = 0;
Context.Found = 0;
Context.ErrorCode = ERROR_SUCCESS;
ErrorCode = ERROR_SUCCESS;
/* Enumerate the catalog */
WsNcEnumerateCatalogItems(Catalog, ProviderEnumerationProc, &Context);
/* Check the error code */
if (Context.ErrorCode == ERROR_SUCCESS)
_SEH2_TRY
{
/* Check if provider was found */
if (Context.Found)
{
PathLen = Context.FoundPathLen;
/* Setup the context */
Context.ProviderId = *lpProviderId;
Context.ProviderDllPath = lpszProviderDllPath;
Context.ProviderDllPathLen = *lpProviderDllPathLen;
Context.FoundPathLen = 0;
Context.Found = 0;
Context.ErrorCode = ERROR_SUCCESS;
/* Check whether buffer is too small
* If it isn't, return length without null char
* (see ProviderEnumerationProc)
*/
if (Context.FoundPathLen <= *lpProviderDllPathLen)
ErrorCode = ERROR_SUCCESS;
/* Enumerate the catalog */
WsNcEnumerateCatalogItems(Catalog, ProviderEnumerationProc, &Context);
/* Check the error code */
if (Context.ErrorCode == ERROR_SUCCESS)
{
/* Check if provider was found */
if (Context.Found)
{
PathLen = Context.FoundPathLen - 1;
PathLen = Context.FoundPathLen;
/* Check whether buffer is too small
* If it isn't, return length without null char
* (see ProviderEnumerationProc)
*/
if (Context.FoundPathLen <= *lpProviderDllPathLen)
{
PathLen = Context.FoundPathLen - 1;
}
else
{
ErrorCode = WSAEFAULT;
}
/* Set returned/required length */
*lpProviderDllPathLen = PathLen;
}
else
{
ErrorCode = WSAEFAULT;
ErrorCode = WSAEINVAL;
}
/* Set returned/required length */
*lpProviderDllPathLen = PathLen;
}
else
{
ErrorCode = WSAEINVAL;
ErrorCode = Context.ErrorCode;
}
}
else
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
ErrorCode = Context.ErrorCode;
ErrorCode = WSAEFAULT;
}
_SEH2_END;
/* Do we have to return failure? */
if (ErrorCode != ERROR_SUCCESS)