aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglrenderingcontext.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-05-20 11:54:56 -0400
committerGitHub <noreply@github.com>2018-05-20 11:54:56 -0400
commit0b5720547e8ee0148d8482b04cfc0a5f71cca2f0 (patch)
treecf4d773f0612782275d6007d78fbdfb1014488ae /components/script/dom/webglrenderingcontext.rs
parentb9407adb04b28585403e1a0cdb49c406b6969c43 (diff)
parentf32ffeb5530aff5a93ea1d5405d5bd8456fcd8af (diff)
downloadservo-0b5720547e8ee0148d8482b04cfc0a5f71cca2f0.tar.gz
servo-0b5720547e8ee0148d8482b04cfc0a5f71cca2f0.zip
Auto merge of #20669 - simartin:issue_20623, r=jdm
Issue #20623: Check the input to WebGLRenderingContext's clear(). Validate the input to this function as per specifications. --- - [X] `./mach build -d` does not report any errors - [X] `./mach build-geckolib` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #20623 - [X] There are tests for these changes <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20669) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r--components/script/dom/webglrenderingcontext.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 32059db6302..6617e1b227f 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -1878,6 +1878,9 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
if !self.validate_framebuffer_complete() {
return;
}
+ if mask & !(constants::DEPTH_BUFFER_BIT | constants::STENCIL_BUFFER_BIT | constants::COLOR_BUFFER_BIT) != 0 {
+ return self.webgl_error(InvalidValue);
+ }
self.send_command(WebGLCommand::Clear(mask));
self.mark_as_dirty();