diff options
| author | Wei Jia <wjia@google.com> | 2015-08-20 04:16:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 04:16:58 +0000 |
| commit | 84a4221e305847fb0c8846122fe8f2bc7c2fda0a (patch) | |
| tree | 456fb68735b6b57ba60abe511c771ace336c9fd6 /media | |
| parent | 096a931e5a0d5f45c3546b09046912b4d54136c8 (diff) | |
| parent | a9b3cd3c101b68522a3d8492cb3a19d8b5409329 (diff) | |
| download | frameworks_av-84a4221e305847fb0c8846122fe8f2bc7c2fda0a.zip frameworks_av-84a4221e305847fb0c8846122fe8f2bc7c2fda0a.tar.gz frameworks_av-84a4221e305847fb0c8846122fe8f2bc7c2fda0a.tar.bz2 | |
am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.
* commit 'a9b3cd3c101b68522a3d8492cb3a19d8b5409329':
libstagefright: fix overflow in pvdec_api.cpp.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp index 419e3f4..30d5cbd 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp @@ -338,7 +338,7 @@ Bool PVAllocVideoData(VideoDecControls *decCtrl, int width, int height, int nLay video->prevVop->uChan = video->prevVop->yChan + size; video->prevVop->vChan = video->prevVop->uChan + (size >> 2); #else - if (size > INT32_MAX / 3 * 2) { + if (size > INT32_MAX / 3) { return PV_FALSE; } video->currVop->yChan = (PIXEL *) oscl_malloc(size * 3 / 2); /* Allocate memory for all VOP OKA 3/2/1*/ @@ -368,7 +368,7 @@ Bool PVAllocVideoData(VideoDecControls *decCtrl, int width, int height, int nLay { oscl_memset(video->prevEnhcVop, 0, sizeof(Vop)); #ifndef PV_MEMORY_POOL - if (size > INT32_MAX / 3 * 2) { + if (size > INT32_MAX / 3) { return PV_FALSE; } |