diff options
author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2017-01-16 11:26:26 +0530 |
---|---|---|
committer | Sean McCreary <mccreary@mcwest.org> | 2017-03-22 12:25:51 -0600 |
commit | ac5d8a4360af8623d078da36d01a8b528a158aa1 (patch) | |
tree | 31033ef201c1555da243db9437327e12a1f3cd8d /decoder | |
parent | 8abf00cf8600990362581a9b42ff789dad7cfbaa (diff) | |
download | android_external_libavc-ac5d8a4360af8623d078da36d01a8b528a158aa1.tar.gz android_external_libavc-ac5d8a4360af8623d078da36d01a8b528a158aa1.tar.bz2 android_external_libavc-ac5d8a4360af8623d078da36d01a8b528a158aa1.zip |
Decoder: Fixed DoS in header decode when no PPS is present
When the input does not contain PPS and decoder is in header decode
mode, decoder was entering an infinite loop.
Bug: 33621215
CVE-2017-0486
Change-Id: I3fe853660e210a259446a3d2992db2cbce69308e
(cherry picked from commit 33e1b190d6db09bd72a9f0f51acef4b14eabd6ff)
(cherry picked from commit 2cd2f7a33535f29c87a1952e0d4b43a80b6f1f3c)
(cherry picked from commit 19814b7ad4ea6f0cc4cab34e50ebab2e180fc269)
Diffstat (limited to 'decoder')
-rw-r--r-- | decoder/ih264d_api.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index b759dda..aaea591 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -2050,6 +2050,7 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) { /* a start code has already been found earlier in the same process call*/ frame_data_left = 0; + header_data_left = 0; continue; } |