Tom Taylor
f9b9dc3d2f
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2
...
am: cbed68f73b
Change-Id: I66781d5390231f55da0ead3293010a240c632ff8
2017-07-12 19:15:11 +00:00
Tom Taylor
cbed68f73b
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4
...
am: 93d52cb5e2
Change-Id: I35c5b7ee69984e1c91c63c9cf78af9d1c0e0ab43
2017-07-12 19:12:40 +00:00
Tom Taylor
93d52cb5e2
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1
...
am: a072033ce4
Change-Id: I2ead912804b75f6633d04259e0bdd61f2b4aad5f
2017-07-12 19:11:39 +00:00
Tom Taylor
a072033ce4
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4
...
am: 6ea30b87b1
Change-Id: I28cfc0b9abbc28420feec7c690406ebe922b31e8
2017-07-12 19:09:10 +00:00
Tom Taylor
6ea30b87b1
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360
...
am: 7a6b99a4a4
Change-Id: I0817d9c8e4e30630cd0008f93ee31a728342eae1
2017-07-12 19:07:09 +00:00
Tom Taylor
7a6b99a4a4
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec
...
am: 22bbfd7360
Change-Id: Ibe13d61b03cc6ae40d6782bf7ae045b5aeb491de
2017-07-12 19:06:10 +00:00
Tom Taylor
22bbfd7360
37742976 - Catch bad gifs am: e0f247e399
...
am: 7c28ca34ec
Change-Id: I0dad7e115a279290a51ee652dbd6a4f9b7ab7081
2017-07-12 19:02:38 +00:00
Tom Taylor
7c28ca34ec
37742976 - Catch bad gifs
...
am: e0f247e399
Change-Id: I54307fd0a08e1ecc14b2f3be5b8d52fac6ff7033
2017-07-12 19:01:08 +00:00
Tom Taylor
e0f247e399
37742976 - Catch bad gifs
...
* A security researcher crafted a gif that would cause the Android
Bitmap code to throw an NPE. That would cause messaging to crash when
decoding the NPE. Catch the NPE.
Test: manually tested the "crash.gif" attached to the bug. Stepped
through the debugger to verify we're catching the NPE and logging
the attempt. Verified normal gifs still work.
Bug: 37742976
Change-Id: Iab814d5b0b514bed0cecddd9a76f1fc095f90892
(cherry picked from commit 3671fd94ae )
2017-06-23 16:48:57 -07:00
Matt Sarett
ebe4ce865f
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016
...
am: ffa6f9ac89
Change-Id: Ib6053a2965920cb2487f1d697ba51d26a275eea4
2017-03-15 17:10:03 +00:00
Matt Sarett
ffa6f9ac89
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b
...
am: d7b191a016
Change-Id: I1637b3f32e85d91c16d64ccfcb7227fb55b8dbd7
2017-03-15 17:05:02 +00:00
Matt Sarett
d7b191a016
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5
...
am: 172aeda52b
Change-Id: I0b3f11dfc15470583a2890ed54406d96dd0cbfe9
2017-03-15 16:59:32 +00:00
Matt Sarett
172aeda52b
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours
...
am: 7fb08c55f5
Change-Id: I3b3a5e591427010eb9814bc8bbf49ff472024b61
2017-03-15 16:54:02 +00:00
Matt Sarett
7fb08c55f5
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314
...
am: cc1dbfc497 -s ours
Change-Id: I15259006a672182c3d5abab0172eb51d94e64c2b
2017-03-15 16:49:25 +00:00
Matt Sarett
cc1dbfc497
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec
...
am: 93facf6314
Change-Id: Ib851a4d150690cc4959455dc0f7bc249fbd784c6
2017-03-15 16:45:22 +00:00
Matt Sarett
93facf6314
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e
...
am: 0cf3a7d3ec
Change-Id: I17c2d833878a9e60efc9b65eb5c8d91299d5ea42
2017-03-15 16:39:46 +00:00
Matt Sarett
0cf3a7d3ec
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE
...
am: 60519c717e
Change-Id: I6f3b4664585a35d3177aea9371e283d567044e6e
2017-03-15 16:34:47 +00:00
Matt Sarett
60519c717e
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE
...
Bug:34697653
Test: build; existing CTS tests
Original commit message:
Fix build breakage caused by updating giflib
Change-Id: I085379470620ec4db13f8baf7a9eb069747270b7
2017-03-15 10:15:32 -04:00
Tom Taylor
8495e582a1
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf
...
am: eece1bd759
Change-Id: I5b978323dc12e67a3ea2b27a71d1bf1de27e1c0a
2017-01-17 19:59:54 +00:00
Tom Taylor
eece1bd759
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c
...
am: fb324f89bf
Change-Id: I8e57243cac35d74a28e5af1fd23800d5cb7cb080
2017-01-17 19:57:24 +00:00
Tom Taylor
fb324f89bf
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e
...
am: 657379f51c
Change-Id: I1533f159aa2ae92a6db094722475d2d5f527bb6d
2017-01-17 19:55:43 +00:00
Tom Taylor
657379f51c
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a
...
am: cc649e4e1e
Change-Id: Ibd12cb39d3abb95bacdfd0461927f5bd57b0c2c4
2017-01-17 19:53:24 +00:00
Tom Taylor
cc649e4e1e
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462
...
am: 82fa311e9a
Change-Id: Ifd7c99312f526e379268f5f12a5ff61d95a90996
2017-01-17 19:51:36 +00:00
Tom Taylor
82fa311e9a
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb
...
am: 71d4913462
Change-Id: I114e41f77d0b7e07a2cf404a1d382451f7d6542f
2017-01-17 19:49:23 +00:00
Tom Taylor
71d4913462
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a
...
am: 9f00add2fb
Change-Id: If555818f7f14dcfef35c57c1d3e918ac0f31959a
2017-01-17 19:46:53 +00:00
Tom Taylor
9f00add2fb
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex]
...
am: 6f763fef7a
Change-Id: Ia34564714e00734976099b95594b6ea6501894b9
2017-01-17 19:44:53 +00:00
Tom Taylor
6f763fef7a
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so
...
in colorMap->Colors[colorIndex]
* No range checking was done on a color index. Add range
checking and bail if the color index is out of range.
Test: tested sending a large gif that would invoke the GifTranscoder library
to make the gif smaller.
Bug: 32764144
Change-Id: I44f36274ec333ae1960fa8fc96b2dbde35fbaa66
2017-01-13 14:47:35 -08:00
Tom Taylor
f07dfd0a19
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9
...
am: 0d9e6a3cf5
Change-Id: Ib0b070a83020dcddf935e2b1de48cffc5665c986
2017-01-06 18:07:43 +00:00
Tom Taylor
0d9e6a3cf5
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438
...
am: 728c4943e9
Change-Id: I9cca57ea1b2e1ab554feec399c6697e14b258a3c
2017-01-06 18:03:43 +00:00
Tom Taylor
728c4943e9
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529
...
am: 508f541438
Change-Id: I9a59d60847e30a476b187d928cb591cb4b2ac272
2017-01-06 17:59:14 +00:00
Tom Taylor
508f541438
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35
...
am: 2917015529
Change-Id: I71a178ea92909fe11275ed5a051efca85ec7f6e2
2017-01-06 17:56:08 +00:00
Tom Taylor
2917015529
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4
...
am: c708e8fb35
Change-Id: Iac2d9f2a4f11f4e0ec70c9aa9aeb8b105729ba7b
2017-01-06 17:51:59 +00:00
Tom Taylor
c708e8fb35
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779
...
am: cefccea7b4
Change-Id: Ie7926325beb817a1894a4f966a9053e284258330
2017-01-06 17:48:29 +00:00
Tom Taylor
cefccea7b4
33388925 Mismatched new vs delete in framesequence library am: 837474a376
...
am: b44b56b779
Change-Id: I18616dc9fff35bdfef460142dbf1b12a3f625a8e
2017-01-06 17:45:00 +00:00
Tom Taylor
b44b56b779
33388925 Mismatched new vs delete in framesequence library
...
am: 837474a376
Change-Id: I1882a0ea4cb061fe39b2a26c7cd77534a609168c
2017-01-06 17:41:33 +00:00
Tom Taylor
837474a376
33388925 Mismatched new vs delete in framesequence library
...
* The array allocations neglected to include [] so delete, instead
of delete [] would get called.
* Test
Manual
- tested sending a large gif that would invoke the GifTranscoder library
to make the gif smaller.
Bug: 33388925
Change-Id: I1e200e470d66ae615ffe9340ff9c049eaa73f63c
2017-01-04 09:42:37 -08:00
Tom Taylor
904b5cbec5
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5
...
am: 4d1366300e
Change-Id: Ieb82c45b1a09c9a8f3cb97ecc7f891971d19f09d
2016-12-07 02:58:04 +00:00
Tom Taylor
0c37f58fa0
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee
...
am: 838049884f
Change-Id: I54b2fc3ed0958a928a75575ba111374aa3c5a69c
2016-12-07 02:57:54 +00:00
Tom Taylor
4d1366300e
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03
...
am: 28c5e61eb5
Change-Id: If6822da7a5eb2d5bb59fd6c31d01c47770e07d7d
2016-12-07 02:54:04 +00:00
Tom Taylor
838049884f
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777
...
am: 47feeee8ee
Change-Id: Iec5af613a115c5120bbfd3e99d6e3503d0a05b36
2016-12-07 02:53:54 +00:00
Tom Taylor
28c5e61eb5
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb
...
am: 8166028e03
Change-Id: I2be10933c2b692efd21ad911375232029e5e18fa
2016-12-07 02:49:34 +00:00
Tom Taylor
47feeee8ee
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18
...
am: 4d220d4777
Change-Id: I15daa15adbcd98ac51bdc1d1cf2a344c3638207c
2016-12-07 02:49:24 +00:00
Tom Taylor
8166028e03
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c
...
am: 518c9798eb
Change-Id: I773eb76c12d3c3adf1860cc17c1b09ed56b77e2d
2016-12-07 02:46:00 +00:00
Tom Taylor
4d220d4777
resolve merge conflicts of eafd58a to nyc-dev
...
am: a43c5c5f18
Change-Id: Ibcf2308553a68a8deaa05d15548d3eca67d4579a
2016-12-07 02:45:53 +00:00
Tom Taylor
518c9798eb
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6
...
am: ced2069d1c
Change-Id: I9ddf0377ce1eff5620104cd0a43bb2eba310e469
2016-12-07 02:41:54 +00:00
Tom Taylor
a43c5c5f18
resolve merge conflicts of eafd58a to nyc-dev
...
Change-Id: I58151ca0c248dd4b84c78c8e7ca73d5a80bbd962
2016-12-06 16:26:14 -08:00
Tom Taylor
a9bec8503b
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17
...
am: 49b092f602
Change-Id: Ibab72017d2b4f54a77b8ff4030587a05e29b43b8
2016-12-06 22:39:38 +00:00
Tom Taylor
49b092f602
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da
...
am: 615f6d0b17
Change-Id: Ife414d257770570e7ea1d24e86b72e4efc3b8a56
2016-12-06 22:36:08 +00:00
Tom Taylor
615f6d0b17
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7
...
am: 4dfcff98da
Change-Id: I0e6378adbd3c2d0b518cfe9f81e6c91abb6b85d4
2016-12-06 22:31:37 +00:00
Tom Taylor
4dfcff98da
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef
...
am: 313284eee7
Change-Id: Iaa18124b7f9090efe55a0a46a1851ff5c0b6fe28
2016-12-06 22:27:37 +00:00