diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-08-10 18:44:45 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2018-08-14 14:53:18 +0000 |
| commit | 625870f953b986447c7b267defd1162deaa056af (patch) | |
| tree | 042504ec9a5db84349bfc90eae64d0a865ca47a0 | |
| parent | 2b111a00fe9f063f7ecc3b34a9e2a4ef7b1a1112 (diff) | |
[Backport] CVE-2018-6162
fix incorrect TexImage3D params w/ UNPACK_IMAGE_HEIGHT
Bug: 804123
Test: http://github.com/KhronosGroup/WebGL/pull/2646
Reviewed-on: https://chromium-review.googlesource.com/1053573
Change-Id: I6f55586e8b275ebd48bbfdfb95223b01dd4006be
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | chromium/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chromium/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/chromium/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp index b25ebbcb1fe..b2bcb72714b 100644 --- a/chromium/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp +++ b/chromium/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp @@ -4835,10 +4835,6 @@ void WebGLRenderingContextBase::TexImageHelperImageData( adjusted_source_image_rect.Height(), format, type, bytes); } else { GLint upload_height = adjusted_source_image_rect.Height(); - if (unpack_image_height) { - // GL_UNPACK_IMAGE_HEIGHT overrides the passed-in height. - upload_height = unpack_image_height; - } if (function_id == kTexImage3D) { ContextGL()->TexImage3D(target, level, internalformat, adjusted_source_image_rect.Width(), upload_height, |