Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(826)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

Issue 2043983002: gpu: Disallow null client ids in Gen* functions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index 7e8c44fdc6e4f35d39e052b585582e06039c183d..53a11eaba5d49a3cd6c1da3a69a9838a107dca05 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -487,7 +487,7 @@ TEST_P(GLES2DecoderTest, GenQueriesEXTImmediateValidArgs) {
EXPECT_TRUE(query_manager->IsValidQuery(kNewClientId));
}
-TEST_P(GLES2DecoderTest, GenQueriesEXTImmediateDuplicateIds) {
+TEST_P(GLES2DecoderTest, GenQueriesEXTImmediateDuplicateOrNullIds) {
cmds::GenQueriesEXTImmediate* cmd =
GetImmediateAs<cmds::GenQueriesEXTImmediate>();
GLuint temp[3] = {kNewClientId, kNewClientId + 1, kNewClientId};
@@ -497,6 +497,11 @@ TEST_P(GLES2DecoderTest, GenQueriesEXTImmediateDuplicateIds) {
ASSERT_TRUE(query_manager != NULL);
EXPECT_FALSE(query_manager->IsValidQuery(kNewClientId));
EXPECT_FALSE(query_manager->IsValidQuery(kNewClientId + 1));
+ GLuint null_id[2] = {kNewClientId, 0};
+ cmd->Init(2, null_id);
+ EXPECT_EQ(error::kInvalidArguments,
+ ExecuteImmediateCmd(*cmd, sizeof(temp)));
+ EXPECT_FALSE(query_manager->IsValidQuery(kNewClientId));
}
TEST_P(GLES2DecoderTest, GenQueriesEXTImmediateInvalidArgs) {

Powered by Google App Engine
This is Rietveld 408576698