diff options
| author | James Zern <jzern@google.com> | 2014-08-12 21:11:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-12 21:11:11 -0700 |
| commit | bcb97ec647baedea85444ba89b1b1d9f551d5875 (patch) | |
| tree | 8c2e159ddece556b12ec7f260638e977d01952e2 /vpx | |
| parent | cedd19c187b6710af3170b7ea84e04755d52374d (diff) | |
| parent | 6a2e9ef20aed3b87259e9491fc76c0b83a76ab3c (diff) | |
| download | libvpx-bcb97ec647baedea85444ba89b1b1d9f551d5875.tar libvpx-bcb97ec647baedea85444ba89b1b1d9f551d5875.tar.gz libvpx-bcb97ec647baedea85444ba89b1b1d9f551d5875.tar.bz2 libvpx-bcb97ec647baedea85444ba89b1b1d9f551d5875.zip | |
Merge "vpx_codec_decode: check data size"
Diffstat (limited to 'vpx')
| -rw-r--r-- | vpx/src/vpx_decoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vpx/src/vpx_decoder.c b/vpx/src/vpx_decoder.c index d9c8a9522..4d22a0847 100644 --- a/vpx/src/vpx_decoder.c +++ b/vpx/src/vpx_decoder.c @@ -113,7 +113,7 @@ vpx_codec_err_t vpx_codec_decode(vpx_codec_ctx_t *ctx, /* Sanity checks */ /* NULL data ptr allowed if data_sz is 0 too */ - if (!ctx || (!data && data_sz)) + if (!ctx || (!data && data_sz) || (data && !data_sz)) res = VPX_CODEC_INVALID_PARAM; else if (!ctx->iface || !ctx->priv) res = VPX_CODEC_ERROR; |