[PATCH] mlang: Fix error handling in Rfc1766ToLcid
Detlef Riekenberg
wine.dev at web.de
Sun May 24 11:30:07 CDT 2009
---
dlls/mlang/mlang.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 5deb87b..14122c8 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -1222,8 +1222,6 @@ HRESULT WINAPI Rfc1766ToLcidW(LCID *pLocale, LPCWSTR pszRfc1766)
if (!pLocale || !pszRfc1766)
return E_INVALIDARG;
- *pLocale = 0;
-
hr = EnumRfc1766_create(0, &enumrfc1766);
if (FAILED(hr))
return hr;
@@ -1238,6 +1236,9 @@ HRESULT WINAPI Rfc1766ToLcidA(LCID *lcid, LPCSTR rfc1766A)
{
WCHAR rfc1766W[MAX_RFC1766_NAME + 1];
+ if (!rfc1766A)
+ return E_INVALIDARG;
+
MultiByteToWideChar(CP_ACP, 0, rfc1766A, -1, rfc1766W, MAX_RFC1766_NAME);
rfc1766W[MAX_RFC1766_NAME] = 0;
--
1.5.4.3
--=-kmOXoH5SzzzvqmIhyBOj--
More information about the wine-patches
mailing list