Fix GPU overflow

content/common/gpu/media/h264_parser.cc

 // Copyright (c) 2012 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 "content/common/gpu/media/h264_parser.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 
@@ skipping 442 matching lines @@
   // See 7.4.2.1.1.
   bool seq_scaling_list_present_flag;
   bool use_default;
   Result res;
 
   // Parse scaling_list4x4.
   for (int i = 0; i < 6; ++i) {
     READ_BOOL_OR_RETURN(&seq_scaling_list_present_flag);
 
     if (seq_scaling_list_present_flag) {
-      res = ParseScalingList(sizeof(sps->scaling_list4x4[i]),
+      CHECK_EQ(arraysize(sps->scaling_list4x4[i]), kH264ScalingList4x4Length);

[Pawel Osciak, 2013/03/08 02:37:53]

I don't see how this check would be useful.

+      res = ParseScalingList(arraysize(sps->scaling_list4x4[i]),
                              sps->scaling_list4x4[i], &use_default);
       if (res != kOk)
         return res;
 
       if (use_default)
         DefaultScalingList4x4(i, sps->scaling_list4x4);
 
     } else {
         FallbackScalingList4x4(i, kDefault4x4Intra, kDefault4x4Inter,
                                sps->scaling_list4x4);
     }
   }
 
   // Parse scaling_list8x8.
   for (int i = 0; i < ((sps->chroma_format_idc != 3) ? 2 : 6); ++i) {
     READ_BOOL_OR_RETURN(&seq_scaling_list_present_flag);
 
     if (seq_scaling_list_present_flag) {
       res = ParseScalingList(sizeof(sps->scaling_list8x8[i]),

[Pawel Osciak, 2013/03/08 02:37:53]

Need to fix here too.

                              sps->scaling_list8x8[i], &use_default);
       if (res != kOk)
         return res;
 
       if (use_default)
         DefaultScalingList8x8(i, sps->scaling_list8x8);
 
     } else {
         FallbackScalingList8x8(i, kDefault8x8Intra, kDefault8x8Inter,
                               sps->scaling_list8x8);
     }
   }
 
   return kOk;
 }
 
 H264Parser::Result H264Parser::ParsePPSScalingLists(const H264SPS& sps,
                                                     H264PPS* pps) {
   // See 7.4.2.2.
   bool pic_scaling_list_present_flag;
   bool use_default;
   Result res;
 
   for (int i = 0; i < 6; ++i) {
     READ_BOOL_OR_RETURN(&pic_scaling_list_present_flag);
 
     if (pic_scaling_list_present_flag) {
       res = ParseScalingList(sizeof(pps->scaling_list4x4[i]),

[Pawel Osciak, 2013/03/08 02:37:53]

And here.

                              pps->scaling_list4x4[i], &use_default);
       if (res != kOk)
         return res;
 
       if (use_default)
         DefaultScalingList4x4(i, pps->scaling_list4x4);
 
     } else {
       if (sps.seq_scaling_matrix_present_flag) {
         // Table 7-2 fallback rule A in spec.
         FallbackScalingList4x4(i, kDefault4x4Intra, kDefault4x4Inter,
                                pps->scaling_list4x4);
       } else {
         // Table 7-2 fallback rule B in spec.
         FallbackScalingList4x4(i, sps.scaling_list4x4[0],
                                sps.scaling_list4x4[3], pps->scaling_list4x4);
       }
     }
   }
 
   if (pps->transform_8x8_mode_flag) {
     for (int i = 0; i < ((sps.chroma_format_idc != 3) ? 2 : 6); ++i) {
       READ_BOOL_OR_RETURN(&pic_scaling_list_present_flag);
 
       if (pic_scaling_list_present_flag) {
         res = ParseScalingList(sizeof(pps->scaling_list8x8[i]),

[Pawel Osciak, 2013/03/08 02:37:53]

And here.

                                pps->scaling_list8x8[i], &use_default);
         if (res != kOk)
           return res;
 
         if (use_default)
           DefaultScalingList8x8(i, pps->scaling_list8x8);
 
       } else {
         if (sps.seq_scaling_matrix_present_flag) {
           // Table 7-2 fallback rule A in spec.
@@ skipping 576 matching lines @@
 
     default:
       DVLOG(4) << "Unsupported SEI message";
       break;
   }
 
   return kOk;
 }
 
 }  // namespace content