diff options
| author | James Zern <jzern@google.com> | 2013-08-14 18:35:22 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2013-08-14 18:35:22 -0700 |
| commit | 20395189cd30d743eaaec0678373e0a9743b1c6b (patch) | |
| tree | f5f851d74a5bb4e826dde4d19fed13ad4c5803a3 | |
| parent | bb072000e8da3b5a4f59cf851b8c0d43871b9b6e (diff) | |
| download | libvpx-20395189cd30d743eaaec0678373e0a9743b1c6b.tar libvpx-20395189cd30d743eaaec0678373e0a9743b1c6b.tar.gz libvpx-20395189cd30d743eaaec0678373e0a9743b1c6b.tar.bz2 libvpx-20395189cd30d743eaaec0678373e0a9743b1c6b.zip | |
vp9_dx_iface: check for NULL/0-size input
avoids a crash caused by issue #585
Change-Id: I301595ee0227699b0da6f0dad6d870dd546e94ef
| -rw-r--r-- | vp9/vp9_dx_iface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index 05029b92e..66a3c2b93 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -368,6 +368,8 @@ static vpx_codec_err_t vp9_decode(vpx_codec_alg_priv_t *ctx, uint32_t sizes[8]; int frames_this_pts, frame_count = 0; + if (data == NULL || data_sz == 0) return VPX_CODEC_INVALID_PARAM; + parse_superframe_index(data, data_sz, sizes, &frames_this_pts); do { |