Commit graph

136 commits

Author SHA1 Message Date
Naveen Kumar P
1363086b84 Merge "Check number of output buffers and sizes" into lmp-dev am: 493410548a am: 41d5957422 am: cecb593ca5
am: 6bf3e38d8c

Change-Id: I179c1b76706a54adb014cd5a8c7d75b98025239a
2017-06-16 23:37:33 +00:00
Naveen Kumar P
6bf3e38d8c Merge "Check number of output buffers and sizes" into lmp-dev am: 493410548a am: 41d5957422
am: cecb593ca5

Change-Id: I5e81ebce4997638ea565460f28af3131248e47b4
2017-06-16 23:35:33 +00:00
Naveen Kumar P
41d5957422 Merge "Check number of output buffers and sizes" into lmp-dev
am: 493410548a

Change-Id: I2f44136cdfd6179712843915dbceb79d3e6aa600
2017-06-16 23:32:02 +00:00
TreeHugger Robot
493410548a Merge "Check number of output buffers and sizes" into lmp-dev 2017-06-16 23:26:32 +00:00
Naveen Kumar P
78e98c5480 Return error for invalid crop parameters am: e8c26c16d7 am: 870c70383d am: 6850014493
am: fc0890497a

Change-Id: Ieab583dcfdd14b70b99e51dd3b7c9a7ba9fbc7ae
2017-06-16 18:48:12 +00:00
Naveen Kumar P
fc0890497a Return error for invalid crop parameters am: e8c26c16d7 am: 870c70383d
am: 6850014493

Change-Id: I9df5bb8d14a56469ecb534061404d0da41dee8c2
2017-06-16 18:41:10 +00:00
Naveen Kumar P
870c70383d Return error for invalid crop parameters
am: e8c26c16d7

Change-Id: I7e8ae1eeccfc75b175485e47136b16d27a0b23c6
2017-06-16 18:28:38 +00:00
Naveen Kumar P
e8c26c16d7 Return error for invalid crop parameters
Test: run poc with and without the patch
Bug: 62214264
Change-Id: If627ee9a8f0dbd65963897966e1c2d39f5fbd428
2017-06-15 20:19:16 +00:00
Naveen Kumar P
1ffb19f7ae Check number of output buffers and sizes
Bug: 37435531
Bug: 36817631
Bug: 36492741
Change-Id: I85e3da9a8aaefaac0b494868fdc94d858e4cf8e6
2017-06-07 15:28:48 -07:00
Naveen Kumar P
835420e636 Merge "Fix OOB issue in nal unit parsing" into lmp-dev am: 1ce65aea9f am: c1451ed95b am: 18a325cf80
am: f9a3d7de57

Change-Id: If8eb5fd76b4aa6c526382f7c3babf1e1a001581c
2017-06-06 20:57:49 +00:00
Naveen Kumar P
f9a3d7de57 Merge "Fix OOB issue in nal unit parsing" into lmp-dev am: 1ce65aea9f am: c1451ed95b
am: 18a325cf80

Change-Id: I83294b270ac8f6853dce67076b497d2744aed571
2017-06-06 20:54:48 +00:00
Naveen Kumar P
c1451ed95b Merge "Fix OOB issue in nal unit parsing" into lmp-dev
am: 1ce65aea9f

Change-Id: I3778ef75155d6d53876525803a22d045ba2c27ff
2017-06-06 20:50:48 +00:00
TreeHugger Robot
1ce65aea9f Merge "Fix OOB issue in nal unit parsing" into lmp-dev 2017-06-06 20:42:09 +00:00
Marco Nelissen
e30fa58cf0 Merge "DO NOT MERGE Added check for invalid log2_max_transform_block_size in SPS" into lmp-dev 2017-06-06 20:10:10 +00:00
Naveen Kumar P
66ae5b6dc1 Merge "Set pic_present at end of pic_init instead of beginning" into lmp-dev am: 95cd002d79 am: 18a176494f am: b318a2b6a6
am: ab634125fb

Change-Id: I1f99a0f7825ac7ff2d42e7a2133e8ae8799d06f4
2017-06-06 19:51:37 +00:00
Naveen Kumar P
ab634125fb Merge "Set pic_present at end of pic_init instead of beginning" into lmp-dev am: 95cd002d79 am: 18a176494f
am: b318a2b6a6

Change-Id: If3dea359b1c1437dba1ab7b302583070e9812996
2017-06-06 19:46:07 +00:00
Naveen Kumar P
18a176494f Merge "Set pic_present at end of pic_init instead of beginning" into lmp-dev
am: 95cd002d79

Change-Id: I537b23bdfd52ce943206d08bbad7c3e6d0460b78
2017-06-06 19:33:37 +00:00
TreeHugger Robot
95cd002d79 Merge "Set pic_present at end of pic_init instead of beginning" into lmp-dev 2017-06-06 19:22:09 +00:00
Harish Mahendrakar
d272cd6369 DO NOT MERGE Added check for invalid log2_max_transform_block_size in SPS
Bug: 33918236
Bug: 33964497
Bug: 33965905
Bug: 33862021
Change-Id: If121221d0f6e983c05d95d123af9bed378d1961f
2017-06-05 14:36:00 -07:00
Naveen Kumar P
62ebc32761 Fix OOB issue in nal unit parsing
Bug: 37712181
Test: ran patched against POC on nyc-mr2
Change-Id: I5408b3afd898db99265f94573d1163ef83c9b99c
2017-06-02 15:20:48 -07:00
Naveen Kumar P
3a53506dd4 Handle error return in parse slice am: 4535874899 am: c83ae25b05 am: 2bdd1d0979
am: f103a876f8

Change-Id: I4f04c489e508b1926051e6cbe5bd2af5a1f747f9
2017-06-01 21:13:23 +00:00
Naveen Kumar P
f103a876f8 Handle error return in parse slice am: 4535874899 am: c83ae25b05
am: 2bdd1d0979

Change-Id: Ib2359105fa8376d7fcb79973db597862f7340097
2017-06-01 21:10:24 +00:00
Naveen Kumar P
c83ae25b05 Handle error return in parse slice
am: 4535874899

Change-Id: Ic8e5266042cd3bf29d2024640ef1c163d378bea4
2017-06-01 21:04:23 +00:00
Naveen Kumar P
4535874899 Handle error return in parse slice
Bug: 37430213
Change-Id: I77f5973db54edccc0972649035b0fbde961c10dd
(cherry picked from commit 16c8c8cceeb74c7f4634803723a0b8b1f4881dc9)
2017-05-30 09:38:36 -07:00
Naveen Kumar P
d012a1ffc0 Set pic_present at end of pic_init instead of beginning
Bug: 37469795

In pic_init, pic_present was set in the beggining. If pic_present
was set, process and buffer managment were done. For an error
stream, a crash occured when pic_init returned with error after setting
pic_present.

Change-Id: Iea42e6ad2bc5a74517188fa5e4cc434bb96d46c7
2017-05-23 10:32:34 -07:00
Harish Mahendrakar
a136624479 Fix heap buffer overflow while searching for valid PPS am: 5204651228 am: 89e719dc77 am: 22af42db03
am: 8108fecdf7

Change-Id: If4d873c7e01ad27c2e8f2e66525448b909e0ee63
2017-05-17 10:12:42 +00:00
Harish Mahendrakar
8108fecdf7 Fix heap buffer overflow while searching for valid PPS am: 5204651228 am: 89e719dc77
am: 22af42db03

Change-Id: I63e5a3e0168b901968d070a7b6185cb209b765f4
2017-05-17 10:10:11 +00:00
Harish Mahendrakar
89e719dc77 Fix heap buffer overflow while searching for valid PPS
am: 5204651228

Change-Id: I350a07a784f1e8570babeb670b5338ad98feb477
2017-05-17 10:04:11 +00:00
Harish Mahendrakar
5204651228 Fix heap buffer overflow while searching for valid PPS
Bug: 37094889
Test: Tested POC on ASAN build
Change-Id: Id4e52cd10a4d5eac015efe4b752162dc39cc30b8
2017-05-16 16:48:29 -07:00
Naveen Kumar P
76c466f238 Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev am: 1853d3871a am: f7635dd278 am: 17caa64f8b
am: 0b13008b9a

Change-Id: Iff756412d3aae6cebffffde91c2577872e35813a
2017-05-16 22:33:32 +00:00
Harish Mahendrakar
5dbf371a33 Merge "memset SPS to zero" into lmp-dev am: 31e21c5134 am: c1c11822d6 am: bb4f42afa0
am: 356364edaa

Change-Id: I19018bea987903cf7cd194f543dd603e20368a8f
2017-05-16 22:33:14 +00:00
Naveen Kumar P
0b13008b9a Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev am: 1853d3871a am: f7635dd278
am: 17caa64f8b

Change-Id: Ibdf47e9ea494abfb70d387b48ff8b4f02b68e45c
2017-05-16 22:29:43 +00:00
Harish Mahendrakar
356364edaa Merge "memset SPS to zero" into lmp-dev am: 31e21c5134 am: c1c11822d6
am: bb4f42afa0

Change-Id: Ie84e14343f217221c46e64c389ae14c75993f9b8
2017-05-16 22:29:22 +00:00
Naveen Kumar P
f7635dd278 Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev
am: 1853d3871a

Change-Id: Iba174494476450fbbf283e16c3f15d37783d9544
2017-05-16 22:24:02 +00:00
Harish Mahendrakar
c1c11822d6 Merge "memset SPS to zero" into lmp-dev
am: 31e21c5134

Change-Id: Iddca06711b6801b6b7fa45a8e2201dcc0c8c3974
2017-05-16 22:23:52 +00:00
TreeHugger Robot
1853d3871a Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev 2017-05-16 22:20:33 +00:00
TreeHugger Robot
31e21c5134 Merge "memset SPS to zero" into lmp-dev 2017-05-16 22:18:29 +00:00
Naveen Kumar P
d61d5e5f6a Check for buffer overflow in pps/slice header parsing
Bug: 36215950
Bug: 36215953
Bug: 36216719
Change-Id: Ibdc05e1d5aa21d060d7c683fd9af4bed8537053f
2017-05-15 15:45:50 -07:00
Harish Mahendrakar
2e0e75aede memset SPS to zero
SPS structure is memset to zero in parse_sps()
Bug: 33966031
Bug: 37458993

Change-Id: I7d4c04d2d25d7e9c8f581bd470260fc4394a564b
2017-05-12 16:21:21 -07:00
Ray Essick
50272c7a39 Merge changes from topic 'b34779227-mnc-dr' into mnc-dr-dev
* changes:
  Fix reallocation for new sps
  DO NOT MERGE Handle streams with change in max_dec_buffering/num_reorder_frames without resolution change
2017-05-12 23:15:16 +00:00
Marco Nelissen
e4ca1d697d Merge "Fixed out of bound reads in stack variables" into lmp-dev
am: 4629c5cebf

Change-Id: Ic58f75e9cea0b77b0ec905667b5d14f11a977acb
2017-05-12 20:48:11 +00:00
Marco Nelissen
4629c5cebf Merge "Fixed out of bound reads in stack variables" into lmp-dev 2017-05-12 20:45:19 +00:00
Mark Salyzyn
5e17a2046b resolve merge conflicts of 8dc7b42 to mnc-dr-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: 34896431
Change-Id: I670a2d2025f52b0197651bd4bb2acbc4887e0447
2017-05-11 15:23:00 +00:00
Wonsik Kim
4490398c88 Merge "DO NOT MERGE Check for cpb cnt in hrd parsing" into lmp-dev 2017-05-10 23:48:22 +00:00
Wonsik Kim
8dc7b42e65 Merge "DO NOT MERGE Check for cpb cnt in hrd parsing" into mnc-dev 2017-05-10 23:48:16 +00:00
Harish Mahendrakar
c9834edd64 Fixed out of bound reads in stack variables
Out of bound reads in the following variables are fixed

scaling_mat_offset in ihevcd_iquant_itrans_recon_ctb()
ai1_offset_y, ai1_offset_cb and ai1_offset_cr in ihevcd_sao_shift_ctb()

These values were read but not used

Bug: 34819017
Change-Id: Ic00e713b2c61d6793e1e097f852f0d1b3f913712
2017-05-09 14:28:47 -07:00
Naveen Kumar P
99df61bb9a Fix reallocation for new sps
This works for mnc-dr-dev and later.

Bug: 34779227
Test: re-ran POC before/after patch to verify behavior
Change-Id: Ida0bf6bcc236494c3c89b228039501e287839fbe
2017-05-05 09:50:11 -07:00
Harish Mahendrakar
b62479887e DO NOT MERGE Handle streams with change in max_dec_buffering/num_reorder_frames
without resolution change

backported from master as part of fixing a security issue on mnc-dr.

Bug: 34779227
Test: before/after execution of PIC
Change-Id: I404099ac24439b5f6eddc9265dc571929433b3ee
2017-05-05 09:46:46 -07:00
Hangyu Kuang
af6ce4991f Merge "Correct Tiles rows and cols check" into lmp-dev am: 7e3858b313 am: a78650de6d am: 2bd3c9cd07
am: 576f2fd4ef

Change-Id: I1044bc5326db71f545299e3845148e09d1d0934f
2017-04-12 20:26:32 +00:00
Hangyu Kuang
576f2fd4ef Merge "Correct Tiles rows and cols check" into lmp-dev am: 7e3858b313 am: a78650de6d
am: 2bd3c9cd07

Change-Id: I2118b213dd4568f23db79a80bebaf483a96efa5e
2017-04-12 20:21:31 +00:00