Fix a possible OOB read in InsertD3D11FormatInfo.

It's unclear how this might happen, as it's during static map init, but add a fail-safe to be sure. BUG=526779 Change-Id: I5aa33f9bed30d4a8c1e9937a0b8c5fd11a7503d7 Reviewed-on: https://chromium-review.googlesource.com/302385Reviewed-by: Corentin Wallez <cwallez@chromium.org> Tryjob-Request: Jamie Madill <jmadill@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Fix a possible OOB read in InsertD3D11FormatInfo.
9bf70365 · Jamie Madill · 16a79cd1 · 9bf70365
Commit 9bf70365 authored Sep 30, 2015 by Jamie Madill
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

texture_format_table.cpp src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp +6 -1

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
@@ -173,13 +173,18 @@ inline void InsertD3D11FormatInfo(D3D11ES3FormatMap *formatMap,
            static const SwizzleInfoMap &swizzleMap = BuildSwizzleInfoMap();
            SwizzleInfoMap::const_iterator swizzleIter =
                swizzleMap.find(SwizzleSizeType(maxBits, formatInfo.componentType));
-            ASSERT(swizzleIter != swizzleMap.end());
+            // Handle the odd case where we might find an invalid swizzle key.
+            // This should never happen, but it's hard to prove, so add a fail-safe.
+            ASSERT(swizzleIter != swizzleMap.end());
+            if (swizzleIter != swizzleMap.end())
+            {
                const SwizzleFormatInfo &swizzleInfo = swizzleIter->second;
                info.swizzleTexFormat                = swizzleInfo.mTexFormat;
                info.swizzleSRVFormat                = swizzleInfo.mSRVFormat;
                info.swizzleRTVFormat                = swizzleInfo.mRTVFormat;
            }
+        }
        else
        {
            // The original texture format is suitable for swizzle operations