usp10: Fix possible crashes (clang).

a6a7bceb · André Hentschel · Alexandre Julliard · 89beac47 · a6a7bceb
Commit a6a7bceb authored Jul 13, 2011 by André Hentschel Committed by Alexandre Julliard Jul 14, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

usp10.c dlls/usp10/usp10.c +2 -2

No files found.
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1612,7 +1612,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc,
    if (cRanges)
        FIXME("Ranges not supported yet\n");

-    rtl = (!psa->fLogicalOrder && psa->fRTL);
+    rtl = (psa && !psa->fLogicalOrder && psa->fRTL);

    *pcGlyphs = cChars;
    if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr;
@@ -1640,7 +1640,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc,
        pwLogClust[i] = idx;
    }

-    if (!psa->fNoGlyphIndex)
+    if (psa && !psa->fNoGlyphIndex)
    {
        WCHAR *rChars;
        if ((hr = SHAPE_CheckFontForRequiredFeatures(hdc, (ScriptCache *)*psc, psa)) != S_OK) return hr;