Commit 577ee9c
committed
Fix heap buffer overflow in libopenapv encoder
Add bounds checking to BSW_FLUSH_4BYTE and BSW_FLUSH_8BYTE macros
in oapv_vlc.c to prevent writing past the end of the bitstream buffer
during VLC encoding.
Add bounds checking in enc_frame in oapv.c to ensure the cumulative
tile bitstream size does not exceed the target bitstream buffer end
before copying tile bitstreams.
These changes prevent heap buffer overflows in the encoder.
Bug: 501452526
Test: Manual verification with PoC binaries on Cuttlefish
Flag: EXEMPT CVE_FIX
Change-Id: Ib40bc500096b6fda93e5802d97b306e4320ba6eb1 parent dd4f9d5 commit 577ee9c
2 files changed
Lines changed: 21 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1171 | 1171 | | |
1172 | 1172 | | |
1173 | 1173 | | |
| 1174 | + | |
1174 | 1175 | | |
1175 | 1176 | | |
1176 | 1177 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
44 | 48 | | |
45 | 49 | | |
46 | 50 | | |
47 | 51 | | |
48 | 52 | | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
57 | 65 | | |
58 | 66 | | |
59 | 67 | | |
| |||
0 commit comments