Matt Sarett
06dbece4c5
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
...
am: ebe4ce865f
2017-03-15 17:14:33 +00: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
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
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
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
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
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
2017-03-15 16:45:22 +00:00
Matt Sarett
93facf6314
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e
...
am: 0cf3a7d3ec
2017-03-15 16:39:46 +00:00
Matt Sarett
0cf3a7d3ec
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE
...
am: 60519c717e
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
Paul Duffin
0188c2ac3e
Refactor code incompatible with Mockito 2.7.13 am: d529415c68
...
am: 65a7c6845d
2017-03-09 23:59:31 +00:00
Paul Duffin
65a7c6845d
Refactor code incompatible with Mockito 2.7.13
...
am: d529415c68
2017-03-09 23:56:06 +00:00
Paul Duffin
d529415c68
Refactor code incompatible with Mockito 2.7.13
...
Bug: 32912773
Test: make checkbuild
Change-Id: I252a7e8ae8473f0ce7e177f691aac7dfeb67e7d8
2017-03-09 18:49:41 +00:00
Paul Duffin
872137e536
Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469
...
am: 3fc616a742
2017-03-03 14:44:15 +00:00
Paul Duffin
3fc616a742
Prepare for removal of junit and android.test classes from Android API (step 1)
...
am: e98e557469
2017-03-03 14:41:46 +00:00
Paul Duffin
e98e557469
Prepare for removal of junit and android.test classes from Android API (step 1)
...
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug: 30188076
Test: make checkbuild
Change-Id: Ic5b5b771dbc3cb5a1902cf5eb4e838a2f22c8f87
2017-03-01 13:21:11 +00:00
Paul Duffin
613ba55900
Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8
...
am: 3cce9e3644
2017-02-21 18:10:13 +00:00
Paul Duffin
3cce9e3644
Use com.android.messaging.util.Assert instead of junit.framework.Assert
...
am: 991c2e5ab8
2017-02-21 18:01:15 +00:00
Paul Duffin
991c2e5ab8
Use com.android.messaging.util.Assert instead of junit.framework.Assert
...
Bug: 35234379
Bug: 30188076
Test: make checkbuild
Change-Id: I3aa9b72393d128877c86c9a116495f76f3e50e18
2017-02-21 11:23:14 +00:00
Tom Taylor
103c8bdb63
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
...
am: 984688e992
2017-01-17 20:05:11 +00:00
Tom Taylor
8bace8dbea
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
...
am: 8495e582a1
2017-01-17 20:02:06 +00: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
2017-01-17 19:59:54 +00:00
Tom Taylor
984688e992
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
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
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
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
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
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
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
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
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
c40e95726f
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5
...
am: f07dfd0a19
2017-01-06 18:12:25 +00:00
Tom Taylor
61c16108ac
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5
...
am: 2686c894a4
2017-01-06 18:11:46 +00: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
2017-01-06 18:07:43 +00:00
Tom Taylor
2686c894a4
33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9
...
am: 0d9e6a3cf5
2017-01-06 18:07:39 +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
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
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
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
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
2017-01-06 17:48:29 +00:00
Tom Taylor
cefccea7b4
33388925 Mismatched new vs delete in framesequence library am: 837474a376
...
am: b44b56b779
2017-01-06 17:45:00 +00:00
Tom Taylor
b44b56b779
33388925 Mismatched new vs delete in framesequence library
...
am: 837474a376
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
Android Build Merger (Role)
aba491e150
Merge "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 am: 208a2979d4" into nyc-mr2-dev-plus-aosp
2016-12-07 03:02:09 +00:00
Android Build Merger (Role)
ab3d4505b8
Merge "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 am: 904b5cbec5" into nyc-mr2-dev-plus-aosp
2016-12-07 03:02:08 +00:00
Tom Taylor
6866222775
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
...
am: 208a2979d4
2016-12-07 03:02:03 +00:00
Tom Taylor
c1acc768f6
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
...
am: 904b5cbec5
2016-12-07 03:02:03 +00:00
Android Build Merger (Role)
6f1cbaf08f
Merge "resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e" into nyc-mr2-dev-plus-aosp
2016-12-07 03:02:00 +00:00
Tom Taylor
c2faf5d56b
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f
...
am: 713068d06e
2016-12-07 03:01:55 +00:00
Tom Taylor
d918dfbcd7
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f
...
am: 0c37f58fa0
2016-12-07 03:01:55 +00:00
Matt Sarett
Paul Duffin
Tom Taylor
Android Build Merger (Role)