| Index: media/base/video_decoder_config.cc
|
| diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc
|
| index d055f49d47b3d46178ff2e25cc2bc7d361216418..6a7add84435b0c4d10978cbb1d0e8a5f47505ce0 100644
|
| --- a/media/base/video_decoder_config.cc
|
| +++ b/media/base/video_decoder_config.cc
|
| @@ -7,6 +7,7 @@
|
| #include <cmath>
|
|
|
| #include "base/logging.h"
|
| +#include "media/base/limits.h"
|
|
|
| namespace media {
|
|
|
| @@ -90,7 +91,10 @@ bool VideoDecoderConfig::IsValidConfig() const {
|
| frame_rate_numerator_ > 0 &&
|
| frame_rate_denominator_ > 0 &&
|
| aspect_ratio_numerator_ > 0 &&
|
| - aspect_ratio_denominator_ > 0;
|
| + aspect_ratio_denominator_ > 0 &&
|
| + natural_size_.width() <= Limits::kMaxDimension &&
|
| + natural_size_.height() <= Limits::kMaxDimension &&
|
| + natural_size_.GetArea() <= Limits::kMaxCanvas;
|
| }
|
|
|
| VideoCodec VideoDecoderConfig::codec() const {
|
|
|