OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
916a968
)
libstagefright: fix overflow in pvdec_api.cpp.
author
Wei Jia
<wjia@google.com>
Thu, 20 Aug 2015 00:31:51 +0000
(17:31 -0700)
committer
Wei Jia
<wjia@google.com>
Thu, 20 Aug 2015 03:36:58 +0000
(
03:36
+0000)
Bug:
20674086
Change-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3
(cherry picked from commit
d7bb1cd786e5ea4ac61119cc1a08082474f7787b
)
media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
patch
|
blob
|
history
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
(file)
--- 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;
}