Fix signed integer overflow in gles2_cmd_decoder_unittest_extensions.cc

gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
@@ skipping 571 matching lines @@
   delete_cmd.Init(0, 1);
   EXPECT_EQ(error::kNoError, ExecuteCmd(delete_cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   // DeletePaths with a big range should not cause any deletes.
   delete_cmd.Init(client_path_id_ + 1,
                   std::numeric_limits<GLsizei>::max() - client_path_id_ - 1);
   EXPECT_EQ(error::kNoError, ExecuteCmd(delete_cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
-  delete_cmd.Init(std::numeric_limits<GLsizei>::max() + 1,
+  delete_cmd.Init(static_cast<GLuint>(std::numeric_limits<GLsizei>::max()) + 1,

[Nico, 2017/05/18 17:40:23]

Isn't GLsizei an unsigned type already?

And can't you get the same in shorter with 1u instead of 1?

[hans, 2017/05/18 17:48:20]

No, it's signed.
I was nervous that if GLsizei happened to be wider than int, then GLsizei +
unsigned would promote the unsigned to GLsizei and we'd end up with signed
addition after all.

                   std::numeric_limits<GLsizei>::max());
   EXPECT_EQ(error::kNoError, ExecuteCmd(delete_cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   // Normal Gen and Delete should cause the normal calls.
   EXPECT_CALL(*gl_, GenPathsNV(kPathCount))
       .WillOnce(Return(kFirstCreatedServiceID))
       .RetiresOnSaturation();
 
   gen_cmd.Init(kFirstClientID, kPathCount);
@@ skipping 165 matching lines @@
   gen_cmd.Init(kFirstClientID, -1);
   EXPECT_EQ(error::kNoError, ExecuteCmd(gen_cmd));
   EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
 
   // Path 0 is invalid client id, connection error.
   gen_cmd.Init(0, kPathCount);
   EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(gen_cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   // Too big range causes client id to wrap, connection error.
-  gen_cmd.Init(std::numeric_limits<GLsizei>::max() + 3,
+  gen_cmd.Init(static_cast<GLuint>(std::numeric_limits<GLsizei>::max()) + 3,
                std::numeric_limits<GLsizei>::max());
   EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(gen_cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   // Creating duplicate client_ids cause connection error.
   EXPECT_CALL(*gl_, GenPathsNV(kPathCount))
       .WillOnce(Return(kFirstCreatedServiceID))
       .RetiresOnSaturation();
 
   gen_cmd.Init(kFirstClientID, kPathCount);
@@ skipping 23 matching lines @@
        DeletePathsCHROMIUMInvalidCalls) {
   static GLuint kFirstClientID = client_path_id_ + 88;
 
   // Range < 0 is causes gl error.
   cmds::DeletePathsCHROMIUM delete_cmd;
   delete_cmd.Init(kFirstClientID, -1);
   EXPECT_EQ(error::kNoError, ExecuteCmd(delete_cmd));
   EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
 
   // Too big range causes client id to wrap, connection error.
-  delete_cmd.Init(std::numeric_limits<GLsizei>::max() + 3,
+  delete_cmd.Init(static_cast<GLuint>(std::numeric_limits<GLsizei>::max()) + 3,
                   std::numeric_limits<GLsizei>::max());
   EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(delete_cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_P(GLES2DecoderTestWithCHROMIUMPathRendering,
        PathCommandsCHROMIUMInvalidCalls) {
   static const GLsizei kCorrectCoordCount = 19;
   static const GLsizei kCorrectCommandCount = 6;
   static const GLenum kInvalidCoordType = GL_NONE;
@@ skipping 888 matching lines @@
   SetBucketAsCString(kBucketId, kBadName1);
   cmd.Init(client_program_id_, kLocation, kBucketId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
 }
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu