Commit f6fa7c53 authored by Kurt Roeckx's avatar Kurt Roeckx
Browse files

capi_get_provname: Check return values 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent f5905ba3

engines/e_capi.c

+12 −6
Original line number Diff line number Diff line
@@ -1148,14 +1148,15 @@ static int capi_get_provname(CAPI_CTX *ctx, LPSTR *pname, DWORD *ptype, DWORD id 
		capi_adderror(err);

		return 0;

		}

	if (sizeof(TCHAR) != sizeof(char))

		name = alloca(len);

	else

	name = OPENSSL_malloc(len);

	if (name == NULL)

		{

		CAPIerr(CAPI_F_CAPI_GET_PROVNAME, ERR_R_MALLOC_FAILURE);

		return 0;

		}

	if (!CryptEnumProviders(idx, NULL, 0, ptype, name, &len))

		{

		err = GetLastError();

		if (sizeof(TCHAR) == sizeof(char))

		OPENSSL_free(name);

		if (err == ERROR_NO_MORE_ITEMS)

			return 2;
@@ -1164,7 +1165,12 @@ static int capi_get_provname(CAPI_CTX *ctx, LPSTR *pname, DWORD *ptype, DWORD id 
		return 0;

		}

	if (sizeof(TCHAR) != sizeof(char))

		{

		*pname = wide_to_asc((WCHAR *)name);

		OPENSSL_free(name);

		if (*pname == NULL)

			return 0;

		}

	else

		*pname = (char *)name;

	CAPI_trace(ctx, "capi_get_provname, returned name=%s, type=%d\n", *pname, *ptype);