Remove extra DoCommonCommand call.

If the provided command id is bigger then the size of our
command array we would recurse until we run out of memory.

Remove extra call; add unit test.

BUG=58153


Review URL: https://chromiumcodereview.appspot.com/11308045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168130 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 2 deletions

diff --git a/gpu/command_buffer/service/common_decoder.cc b/gpu/command_buffer/service/common_decoder.cc
index b9886ce..74adcea 100644
--- a/gpu/command_buffer/service/common_decoder.cc
+++ b/gpu/command_buffer/service/common_decoder.cc
@@ -166,7 +166,6 @@ error::Error CommonDecoder::DoCommonCommand(
       return error::kInvalidArguments;
     }
   }
-  return DoCommonCommand(command, arg_count, cmd_data);
   return error::kUnknownCommand;
 }
 
diff --git a/gpu/command_buffer/service/common_decoder_unittest.cc b/gpu/command_buffer/service/common_decoder_unittest.cc
index 1a350fb..734dd1b 100644
--- a/gpu/command_buffer/service/common_decoder_unittest.cc
+++ b/gpu/command_buffer/service/common_decoder_unittest.cc
@@ -185,6 +185,10 @@ TEST_F(CommonDecoderTest, Initialize) {
   EXPECT_EQ(0, engine_.GetGetOffset());
 }
 
+TEST_F(CommonDecoderTest, DoCommonCommandInvalidCommand) {
+  EXPECT_EQ(error::kUnknownCommand, decoder_.DoCommand(999999, 0, NULL));
+}
+
 TEST_F(CommonDecoderTest, HandleNoop) {
   cmd::Noop cmd;
   const uint32 kSkipCount = 5;
@@ -634,4 +638,3 @@ TEST_F(CommonDecoderTest, GetBucketData) {
 }
 
 }  // namespace gpu
-