Skip to content

A
angle
Commit 9bf70365 by Jamie Madill
Options

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: 's avatarCorentin Wallez <cwallez@chromium.org> Tryjob-Request: Jamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 16a79cd1
Showing with 10 additions and 5 deletions
src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
......@@ -173,12 +173,17 @@ inline void InsertD3D11FormatInfo(D3D11ES3FormatMap *formatMap,
static const SwizzleInfoMap &swizzleMap = BuildSwizzleInfoMap();
SwizzleInfoMap::const_iterator swizzleIter =
swizzleMap.find(SwizzleSizeType(maxBits, formatInfo.componentType));
ASSERT(swizzleIter != swizzleMap.end());
const SwizzleFormatInfo &swizzleInfo = swizzleIter->second;
info.swizzleTexFormat = swizzleInfo.mTexFormat;
info.swizzleSRVFormat = swizzleInfo.mSRVFormat;
info.swizzleRTVFormat = swizzleInfo.mRTVFormat;
// 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
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment