diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 04:37:18 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 04:37:18 +0000 |
| commit | 951f308ebd776fc69aa920b89aeacd653985cee8 (patch) | |
| tree | 4cc7d8ee5c2d067ba12a0548d623456753af7426 | |
| parent | b354e6387a9715948acee6da05a545dcae7bf9ea (diff) | |
| download | chromium_src-951f308ebd776fc69aa920b89aeacd653985cee8.zip chromium_src-951f308ebd776fc69aa920b89aeacd653985cee8.tar.gz chromium_src-951f308ebd776fc69aa920b89aeacd653985cee8.tar.bz2 | |
Fix mesa not checking for a valid depth in mesa's _mesa_TexSubImage3D
BUG=84134
TEST=none
Review URL: http://codereview.chromium.org/7074026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87161 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/mesa/MesaLib/src/mesa/main/teximage.c | 2 | ||||
| -rw-r--r-- | third_party/mesa/README.chromium | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/third_party/mesa/MesaLib/src/mesa/main/teximage.c b/third_party/mesa/MesaLib/src/mesa/main/teximage.c index ca1bd60..ee663e4 100644 --- a/third_party/mesa/MesaLib/src/mesa/main/teximage.c +++ b/third_party/mesa/MesaLib/src/mesa/main/teximage.c @@ -2798,7 +2798,7 @@ _mesa_TexSubImage3D( GLenum target, GLint level, format, type, texImage)) { /* error was recorded */ } - else if (width > 0 && height > 0 && height > 0) { + else if (width > 0 && height > 0 && depth > 0) { /* If we have a border, xoffset=-1 is legal. Bias by border width */ xoffset += texImage->Border; yoffset += texImage->Border; diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index a778a9f..1f4eac35 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium @@ -2,6 +2,7 @@ Name: mesa Version: 7.9 URL: http://www.mesa3d.org/ License File: MesaLib/docs/COPYING +Security Critical: Yes Description: This directory contains a copy of these MesaLib components: @@ -83,3 +84,7 @@ Later modifications (see chromium.patch): - Suppressed spurious compiler warning from gcc in eglCompareConfig by reorganizing the .h a little +- Corrected the comparison in src/mesa/main/teximage.c line 2801 to check + if width > 0 && height > 0 && depth > 0, instead of checking + width > 0 && height > 0 && height > 0 . See + https://bugs.freedesktop.org/show_bug.cgi?id=37648 |