aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] DO NOT MERGE - ↵android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devXin Li2019-10-300-0/+0
|\ | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 9ac75d8528 am: c85a853564 -s ours am skip reason: subject contains skip directive Change-Id: Id512c503d5e28ea5bd7b6b68caa9ee79a17586e4
| * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-300-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 9ac75d8528 Change-Id: I7259f825dc9b3540f7683407d1af151124af51f3
| | * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li2019-10-300-0/+0
| | |\ | | |/ | |/| | | | | | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: I67522db54ed4f291b96566d2b49153c211d034c3
* | | [automerger skipped] [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression ↵DRC2019-09-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | access violation am: 31f2242ed3 am: 7fcb8d19a0 am: ac4de6ba3d -s ours am: 9cc205d55c -s ours am: 3911ad3369 am: 0f14204411 am: 1c8190b9b3 am: f62296b70a -s ours am skip reason: subject contains skip directive Change-Id: Ib9eb98ba42e44a172ed85f122cff08dd45cb8f74
| * | [automerger skipped] [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression ↵DRC2019-09-110-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | access violation am: 31f2242ed3 am: 7fcb8d19a0 am: ac4de6ba3d -s ours am: 9cc205d55c -s ours am: 3911ad3369 am: 0f14204411 am: 1c8190b9b3 Change-Id: I72a0b25d22dbafc7583463be8ba9c5ecdc364d9b
| | * \ [automerger skipped] [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression ↵DRC2019-09-110-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access violation am: 31f2242ed3 am: 7fcb8d19a0 am: ac4de6ba3d -s ours am: 9cc205d55c -s ours am: 3911ad3369 am: 0f14204411 Change-Id: Iba93df24551a4e77163439d7865fa418b8f85a7b
* | | | | [automerger skipped] [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. ↵DRC2019-09-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files w/ ICC data am: 87ccce3a16 am: 8fb8607759 am: a3292c09aa -s ours am: d4aceabe8a -s ours am: e2b87474fe am: 376ca1bdf4 am: 2c20cade5c am: 50648aa826 -s ours am skip reason: subject contains skip directive Change-Id: Iada37a1ede98b5d43e08b176bd84e0aad103a87d
| * | | | [automerger skipped] [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. ↵DRC2019-09-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files w/ ICC data am: 87ccce3a16 am: 8fb8607759 am: a3292c09aa -s ours am: d4aceabe8a -s ours am: e2b87474fe am: 376ca1bdf4 am: 2c20cade5c Change-Id: Iec62289374a12b569dbdcfb56f0b46b0c8115ebc
| | * | | [automerger skipped] [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. ↵DRC2019-09-110-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files w/ ICC data am: 87ccce3a16 am: 8fb8607759 am: a3292c09aa -s ours am: d4aceabe8a -s ours am: e2b87474fe am: 376ca1bdf4 Change-Id: Iebf87a5f7384f799c4b4b719f9f93e118104265b
* | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: b1ab8ba6d9 am: 622fa8362f am: f6fe132d89 -s ours am: ac6efc4641 -s ours am: 2dbb0b8222 am: f2caf151c5 am: f55c84ab7f am: 1c70f7555f -s ours am skip reason: subject contains skip directive Change-Id: Ibb63061e67beb3204b6e685058c2a0dd889008f1
| * | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: b1ab8ba6d9 am: 622fa8362f am: f6fe132d89 -s ours am: ac6efc4641 -s ours am: 2dbb0b8222 am: f2caf151c5 am: f55c84ab7f Change-Id: I0976caf1b144573af996e2f734e7ff270eca9692
| | * | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: b1ab8ba6d9 am: 622fa8362f am: f6fe132d89 -s ours am: ac6efc4641 -s ours am: 2dbb0b8222 am: f2caf151c5 Change-Id: Iab7c6259071baceaeda2d7b325ab65826854f469
* | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: be6e36b97f -s ours am: 08f226f6dc am: 58e1a6c166 am: 30a5a2d537 am: 3f66285c22 -s ours am skip reason: subject contains skip directive Change-Id: I9d244a6b2c04b4e1263a25dafc93ef3b6aa19060
| * | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: be6e36b97f -s ours am: 08f226f6dc am: 58e1a6c166 am: 30a5a2d537 Change-Id: Iacf4e19292876036ddbe397146fd8647874ca93a
| | * | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: be6e36b97f -s ours am: 08f226f6dc am: 58e1a6c166 Change-Id: I2838b8d97a4135256498bdd62c7e02986070e4da
* | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression ↵DRC2019-09-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access violation am: 31f2242ed3 am: 7fcb8d19a0 am: ac4de6ba3d -s ours am: 9cc205d55c -s ours am: 3911ad3369 am: 0f14204411 am: 3b3b3aa72e am: aa98f9758e -s ours am skip reason: subject contains skip directive Change-Id: I5de4a9fa120bce1575c6b32783db73a4b776bf63
| * | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression ↵DRC2019-09-110-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access violation am: 31f2242ed3 am: 7fcb8d19a0 am: ac4de6ba3d -s ours am: 9cc205d55c -s ours am: 3911ad3369 am: 0f14204411 am: 3b3b3aa72e Change-Id: I94d1846db667547cd3438bbed541ef374b564d77
| | * \ \ \ \ \ \ [automerger skipped] [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression ↵android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseDRC2019-09-110-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access violation am: 31f2242ed3 am: 7fcb8d19a0 am: ac4de6ba3d -s ours am: 9cc205d55c -s ours am: 3911ad3369 am: 0f14204411 Change-Id: Ifb5c18bec2a710400fa02b30dc7595063d24f0f8
| | | * | | | | | [automerger skipped] [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression ↵DRC2019-09-110-0/+0
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access violation am: 31f2242ed3 am: 7fcb8d19a0 am: ac4de6ba3d -s ours am: 9cc205d55c -s ours am: 3911ad3369 Change-Id: Id84db5e455385fc76ed6d49f0c1508a83ecf420d
| | | | * | | | | [automerger skipped] [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression ↵DRC2019-09-110-0/+0
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access violation am: 31f2242ed3 am: 7fcb8d19a0 am: ac4de6ba3d -s ours am: 9cc205d55c -s ours am skip reason: subject contains skip directive Change-Id: I3c21675aa5351b993ac0385e7c0fe742d4de36d6
| | | | | * \ \ \ \ [automerger skipped] [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression ↵DRC2019-09-110-0/+0
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access violation am: 31f2242ed3 am: 7fcb8d19a0 am: ac4de6ba3d -s ours am skip reason: subject contains skip directive Change-Id: I0743c24cc7abdb0a1b5aef6d7260521dbaf6a760
| | | | | | * \ \ \ \ [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression access violation am: ↵DRC2019-09-112-7/+13
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31f2242ed3 am: 7fcb8d19a0 Change-Id: I3259550b579c82d402c4ef27c2e0b96f95975a4d
| | | | | | | * \ \ \ \ [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression access violationDRC2019-09-112-7/+13
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 31f2242ed3 Change-Id: I36e2a39891cb5841f9355076fb32504414b0d57b
| | | | | | | | * | | | | [RESTRICT AUTOMERGE] tjbench.exe: Fix decompression access violationDRC2019-09-062-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of an upstream commit. The original commit message included the following: """ The program crashed when a JPEG image was passed on the command line, because we were mixing our metaphors vis-a-vis malloc()/free() and tjAlloc()/tjFree() (malloc()/free() uses the tjbench.exe heap, whereas tjAlloc()/tjFree() uses the turbojpeg.dll heap.) """ This commit was pulled in due to a SEGFAULT that appeared after backporting the fix to the original bug. Bug: 120551338 Test: tj64 /data/local/tmp/crash-46.jpg See b/120551338#comment1 to get crash-46.jpg Change-Id: Ie970992b659118406528bc7519f22a1ae67ff14e
* | | | | | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. ↵DRC2019-09-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files w/ ICC data am: 87ccce3a16 am: 8fb8607759 am: a3292c09aa -s ours am: d4aceabe8a -s ours am: e2b87474fe am: 376ca1bdf4 am: 401cb48290 am: 08d77b5c92 -s ours am skip reason: subject contains skip directive Change-Id: I81a7dd99d7b1e1e1012bfdb4de3453eebe9a124e
| * | | | | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. ↵DRC2019-09-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files w/ ICC data am: 87ccce3a16 am: 8fb8607759 am: a3292c09aa -s ours am: d4aceabe8a -s ours am: e2b87474fe am: 376ca1bdf4 am: 401cb48290 Change-Id: I4f8eac19284f734a0962e6efa7aec4e98170ef34
| | * | | | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. ↵DRC2019-09-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files w/ ICC data am: 87ccce3a16 am: 8fb8607759 am: a3292c09aa -s ours am: d4aceabe8a -s ours am: e2b87474fe am: 376ca1bdf4 Change-Id: I98b5fb0c27157203b4517c3378c7ac1ea8b5a2a9
| | | * | | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. ↵DRC2019-09-110-0/+0
| | | |\| | | | | | | | | | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files w/ ICC data am: 87ccce3a16 am: 8fb8607759 am: a3292c09aa -s ours am: d4aceabe8a -s ours am: e2b87474fe Change-Id: Ib55b839f35b0155da15ad3e7e8372724598024be
| | | | * | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. ↵DRC2019-09-110-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files w/ ICC data am: 87ccce3a16 am: 8fb8607759 am: a3292c09aa -s ours am: d4aceabe8a -s ours am skip reason: subject contains skip directive Change-Id: I94f1057c8b7e7155563d813a6c29318de2fdb071
| | | | | * | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. ↵DRC2019-09-110-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files w/ ICC data am: 87ccce3a16 am: 8fb8607759 am: a3292c09aa -s ours am skip reason: subject contains skip directive Change-Id: Ie57590c854f0db70d150ef5c45dc420bddea5989
| | | | | | * | | | | | [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. files w/ ICC data am: ↵DRC2019-09-113-4/+12
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87ccce3a16 am: 8fb8607759 Change-Id: I58767b3d9d2abdf868307840b06f7eb2d2764e8c
| | | | | | | * | | | | [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. files w/ ICC dataDRC2019-09-113-4/+12
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 87ccce3a16 Change-Id: I04ecc06e3ffeaa4e22f2c1c6f5d22e3a415534e2
| | | | | | | | * | | | [RESTRICT AUTOMERGE] TJBench: Fix errors when decomp. files w/ ICC dataDRC2019-09-063-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of an upstream commit. Original commit message included the following: """ Embedded ICC profiles can cause the size of a JPEG file to exceed the size returned by tjBufSize() (which is really meant to be used for compression anyhow, not for decompression), and this was causing a segfault (C) or an ArrayIndexOutOfBoundsException (Java) when decompressing such files with TJBench. This commit modifies the benchmark such that, when tiled decompression is disabled, it re-uses the source buffer as the primary JPEG buffer. """ This commit was pulled in due to a SEGFAULT that appeared after backporting the fix to the original bug. Bug: 120551338 Test: tj64 /data/local/tmp/crash-46.jpg See b/120551338#comment1 to get crash-46.jpg Change-Id: Ia480d23a5581027da11a2da168c06448161668bf
* | | | | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: b1ab8ba6d9 am: 622fa8362f am: f6fe132d89 -s ours am: ac6efc4641 -s ours am: 2dbb0b8222 am: f2caf151c5 am: 0f5242a640 am: 4c242d9064 -s ours am skip reason: subject contains skip directive Change-Id: Iccbb0c3c700bda8f9714bf4272c27fee4de2fcdb
| * | | | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: b1ab8ba6d9 am: 622fa8362f am: f6fe132d89 -s ours am: ac6efc4641 -s ours am: 2dbb0b8222 am: f2caf151c5 am: 0f5242a640 Change-Id: If8d384b32fb267ac23b3bd3f682674704f8d303f
| | * | | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: b1ab8ba6d9 am: 622fa8362f am: f6fe132d89 -s ours am: ac6efc4641 -s ours am: 2dbb0b8222 am: f2caf151c5 Change-Id: I4e13dcda20996b2e369ee64279ce7a47034898b7
| | | * | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| | | |\| | | | | | | | | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: b1ab8ba6d9 am: 622fa8362f am: f6fe132d89 -s ours am: ac6efc4641 -s ours am: 2dbb0b8222 Change-Id: I62e964e63f69df38245137767e86c62c4e0a562b
| | | | * | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: b1ab8ba6d9 am: 622fa8362f am: f6fe132d89 -s ours am: ac6efc4641 -s ours am skip reason: subject contains skip directive Change-Id: I31254606b1b42813ff3c77290f2ecc47a30f1435
| | | | | * | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: b1ab8ba6d9 am: 622fa8362f am: f6fe132d89 -s ours am skip reason: subject contains skip directive Change-Id: Ibcd545e0adc3047753823f02cd3d791414b085a5
| | | | | | * | | | | [RESTRICT AUTOMERGE] Prevent integer overflows when handling large images ↵Bryan Ferris2019-09-115-34/+109
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b1ab8ba6d9 am: 622fa8362f Change-Id: Iccc64ee231fa1d1ef251d774c9fedd124c3e08a6
| | | | | | | * | | | [RESTRICT AUTOMERGE] Prevent integer overflows when handling large imagesBryan Ferris2019-09-115-34/+109
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b1ab8ba6d9 Change-Id: Ia1dfb1dcf5a557962c1f71d4905964dd255694f5
| | | | | | | | * | | [RESTRICT AUTOMERGE] Prevent integer overflows when handling large imagesBryan Ferris2019-09-065-34/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of an upstream patch. Original commit message: """ Prevent several integer overflow issues and subsequent segfaults that occurred when attempting to compress or decompress gigapixel images with the TurboJPEG API: - Modify tjBufSize(), tjBufSizeYUV2(), and tjPlaneSizeYUV() to avoid integer overflow when computing the return values and to return an error if such an overflow is unavoidable. - Modify tjunittest to validate the above. - Modify tjCompress2(), tjEncodeYUVPlanes(), tjDecompress2(), and tjDecodeYUVPlanes() to avoid integer overflow when computing the row pointers in the 64-bit TurboJPEG C API. - Modify TJBench (both C and Java versions) to avoid overflowing the size argument to malloc()/new and to fail gracefully if such an overflow is unavoidable. In general, this allows gigapixel images to be accommodated by the 64-bit TurboJPEG C API when using automatic JPEG buffer (re)allocation. Such images cannot currently be accommodated without automatic JPEG buffer (re)allocation, due to the fact that tjAlloc() accepts a 32-bit integer argument (oops.) Such images cannot be accommodated in the TurboJPEG Java API due to the fact that Java always uses a signed 32-bit integer as an array index. """ Bug: 120551338 Test: tj64 /data/local/tmp/crash-46.jpg See b/120551338#comment1 to get crash-46.jpg Change-Id: I3a4e772c6017ffeb2181510f8e447f7e91baa095
* | | | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: be6e36b97f -s ours am: 08f226f6dc am: 58e1a6c166 am: bccfb26b1a am: 23320fe86f -s ours am skip reason: subject contains skip directive Change-Id: I69aec467d9827c3c56babbab57f5d68aacd79763
| * | | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: be6e36b97f -s ours am: 08f226f6dc am: 58e1a6c166 am: bccfb26b1a Change-Id: I27235267cadab32d7c7b90c29e72e105a6d43bd6
| | * | | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: be6e36b97f -s ours am: 08f226f6dc am: 58e1a6c166 Change-Id: I54d3881cd0354985a9439f3b2a6db4c723de588f
| | | * | | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: be6e36b97f -s ours am: 08f226f6dc Change-Id: I53c16bd6cbaa30d11677c0f301ad67dc19550356
| | | | * | | | | | | [automerger skipped] [RESTRICT AUTOMERGE] Prevent integer overflows when ↵Bryan Ferris2019-09-110-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling large images am: be6e36b97f -s ours am skip reason: subject contains skip directive Change-Id: I2f49f916cab04e9a21ba5c9966a9b874c67dee48
| | | | | * | | | | | [RESTRICT AUTOMERGE] Prevent integer overflows when handling large imagesBryan Ferris2019-09-055-34/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of an upstream patch. Original commit message: """ Prevent several integer overflow issues and subsequent segfaults that occurred when attempting to compress or decompress gigapixel images with the TurboJPEG API: - Modify tjBufSize(), tjBufSizeYUV2(), and tjPlaneSizeYUV() to avoid integer overflow when computing the return values and to return an error if such an overflow is unavoidable. - Modify tjunittest to validate the above. - Modify tjCompress2(), tjEncodeYUVPlanes(), tjDecompress2(), and tjDecodeYUVPlanes() to avoid integer overflow when computing the row pointers in the 64-bit TurboJPEG C API. - Modify TJBench (both C and Java versions) to avoid overflowing the size argument to malloc()/new and to fail gracefully if such an overflow is unavoidable. In general, this allows gigapixel images to be accommodated by the 64-bit TurboJPEG C API when using automatic JPEG buffer (re)allocation. Such images cannot currently be accommodated without automatic JPEG buffer (re)allocation, due to the fact that tjAlloc() accepts a 32-bit integer argument (oops.) Such images cannot be accommodated in the TurboJPEG Java API due to the fact that Java always uses a signed 32-bit integer as an array index. """ Bug: 120551338 Test: tj64 /data/local/tmp/crash-46.jpg See b/120551338#comment1 to get crash-46.jpg Change-Id: I3a4e772c6017ffeb2181510f8e447f7e91baa095
* | | | | | | | | | | Merge "[automerger skipped] [RESTRICT AUTOMERGE] TurboJPEG: Properly handle ↵DRC2019-09-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gigapixel images am: d8b95103b9 am: 2596ecc57d -s ours am: f70877afe4 -s ours am: 27cfe46b4b -s ours am skip reason: subject contains skip directive Change-Id: I710e66f7c413893a1b120ede198828adf1e2bb68
| * | | | | | | | | | Merge "[automerger skipped] [RESTRICT AUTOMERGE] TurboJPEG: Properly handle ↵Android Build Merger (Role)2019-09-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gigapixel images am: d8b95103b9 am: 2596ecc57d -s ours am: f70877afe4 -s ours am skip reason: change_id I472f52c15eaaaf7995249d1fb488079955cd7c61 with SHA1 58137a32d6 is in history" into qt-qpr1-dev-plus-aosp
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-08 17:45:15 +0000