Commit graph

14932 commits

Author SHA1 Message Date
Tianjie Xu
18ccbc2ece Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours
am: f7903d4374

Change-Id: Ic2cb35bbe317ef86c7eb177d53402d82a1cbe508
2017-04-11 19:39:58 +00:00
Tianjie Xu
f7903d4374 Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d  -s ours

Change-Id: I5cc4d5761c5d7f2b8bcee551a693c1858a7bebd1
2017-04-11 19:34:26 +00:00
Tianjie Xu
6908996434 Fix out of bound read in libziparchive
am: d9fd1863f4

Change-Id: I5fd0004842ab44ee1c5d38386d7073003eb94a98
2017-04-11 19:29:57 +00:00
Tianjie Xu
368f3d273d Do Not Merge: Fix out of bound read in libziparchive
am: a8d932f2a5

Change-Id: I8f373dc3d2e4ecb3aecd5a43f32e3ef01474e712
2017-04-11 19:29:57 +00:00
Tianjie Xu
a8d932f2a5 Do Not Merge: Fix out of bound read in libziparchive
We should check the boundary of central directory before checking its
signature. Swap the order of these two checks.

Bug: 36392138
Test: libziparchive doesn't read the signature after boundary check fails.
Change-Id: Ie89f709bb2d1ccb647116fb7ccb1e23c943e5ab8
(cherry picked from commit 74464a1361)
2017-04-06 18:46:06 +00:00
Tianjie Xu
d9fd1863f4 Fix out of bound read in libziparchive
We should check the boundary of central directory before checking its
signature. Swap the order of these two checks.

Bug: 36392138
Test: libziparchive doesn't read the signature after boundary check fails.
Change-Id: Ie89f709bb2d1ccb647116fb7ccb1e23c943e5ab8
(cherry picked from commit 74464a1361)
2017-04-06 18:07:02 +00:00
Josh Gao
f69ff66c5f Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd
am: 50dcfdf43a

Change-Id: I705254b519ec3fbf9798500d525b1f74c63f8153
2016-11-17 23:12:22 +00:00
Josh Gao
c80cd472c7 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d
am: 08420b5826

Change-Id: I201b41b3fe33e7227c6d3335f5935acf18f9cfa9
2016-11-17 23:12:06 +00:00
Josh Gao
50dcfdf43a Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb
am: fa961006fd

Change-Id: I193387ccd84e4425070153a242ab320eb434b44b
2016-11-17 22:57:23 +00:00
Josh Gao
08420b5826 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765
am: d0b35e9e1d

Change-Id: Id4c832f6ff9728e305a513d24f4378576e00fe6d
2016-11-17 22:57:06 +00:00
Josh Gao
fa961006fd Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140
am: 7e21e1efeb

Change-Id: I8498b7981b8b63905a80200880d9b8d778ecfaf2
2016-11-17 22:42:18 +00:00
Josh Gao
d0b35e9e1d adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours
am: 8621700765

Change-Id: I4cd639776fb19959b5b72302fcdb052c1d7a4786
2016-11-17 22:42:03 +00:00
Josh Gao
7e21e1efeb Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401
am: 8027acd140

Change-Id: I5e81317eefb5d19640506881d4b6717fd92932a4
2016-11-17 22:27:45 +00:00
Josh Gao
8621700765 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e
am: 0d5c1a7745  -s ours

Change-Id: Ic67f5e14491b6e685f898f4f8b7c15161cabb17a
2016-11-17 22:27:30 +00:00
Josh Gao
8027acd140 Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea
am: 55d871c401

Change-Id: Ia6e73d6df06b49b3c2f9b83ac5d4c8c52917d25a
2016-11-17 22:00:10 +00:00
Josh Gao
0d5c1a7745 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7
am: 1ceca95f8e

Change-Id: I1c8c386d69b3528a9be8f1b2c0032ed04363a228
2016-11-17 21:59:57 +00:00
Josh Gao
55d871c401 Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a
am: 0b4bd3feea

Change-Id: Ia706579c1d4f995956c91ffba7aa86e3da4e82d5
2016-11-17 21:51:38 +00:00
Josh Gao
1ceca95f8e adb: actually fix the windows build. am: 58eda35ace
am: bbd6d7b3e7

Change-Id: I0d2553e19b3e96e9af4e0aa3493a4b8b36e55431
2016-11-17 21:51:26 +00:00
Josh Gao
0b4bd3feea Merge "adb: actually fix the windows build." into klp-dev
am: da66b9100a

Change-Id: If9b3829707e7fc6d9846bc769108180e08d67b5f
2016-11-17 21:43:27 +00:00
Josh Gao
bbd6d7b3e7 adb: actually fix the windows build.
am: 58eda35ace

Change-Id: If917d578acb8a0b289369f7b5b1aca7deff4a4b9
2016-11-17 21:43:26 +00:00
Josh Gao
da66b9100a Merge "adb: actually fix the windows build." into klp-dev 2016-11-17 21:32:45 +00:00
Josh Gao
58eda35ace adb: actually fix the windows build.
Bug: http://b/32292581
Change-Id: I714e1f47c2c2e89027989d485cb28891b905f931
2016-11-15 13:05:11 -08:00
Josh Gao
3b0772f718 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4
am: c88a4dc090

Change-Id: I7aa727558e231368b68ae27659329e543203c648
2016-11-14 23:03:29 +00:00
Josh Gao
7f523007a1 adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3
am: df519a87fb

Change-Id: I373b7a84b76a1e08914cedc80f26a23496b38551
2016-11-14 23:03:13 +00:00
Josh Gao
c88a4dc090 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f
am: 667e9f92d4

Change-Id: I89181a9c04865e4e1a398833f2b712f6a2d1d819
2016-11-14 22:55:59 +00:00
Josh Gao
df519a87fb adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726
am: f55e22a7d3

Change-Id: Id5170a5b9e6ba4837b5811f0f812edfa886e3639
2016-11-14 22:55:42 +00:00
Josh Gao
667e9f92d4 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996
am: 750b4c3c5f

Change-Id: Ib44cbbcfe4ecba200fff8db0bf2cc2d826870577
2016-11-14 22:48:26 +00:00
Josh Gao
f55e22a7d3 adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours
am: 5c81df2726

Change-Id: I9b46995864508f85c00c6c3a99ebee86632f8402
2016-11-14 22:48:11 +00:00
Josh Gao
750b4c3c5f Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175
am: 4775e66996

Change-Id: I14eede001ac0abdef4c8ba3a2447b8b7b9aaaf6e
2016-11-14 22:40:55 +00:00
Josh Gao
5c81df2726 adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08
am: 8b88eb368a  -s ours

Change-Id: Ibcbd0507aa4978023ed0a444a66c93bf0fce98aa
2016-11-14 22:40:41 +00:00
Josh Gao
4775e66996 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11
am: 85b6b13175

Change-Id: I4a983b34a4c613a3226834d8683e520d6de3e617
2016-11-14 22:26:25 +00:00
Josh Gao
8b88eb368a adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b
am: ddf0740c08

Change-Id: I82ec8fe1bd14a0e80bd4cd57ca4958d5999eea3a
2016-11-14 22:26:10 +00:00
Josh Gao
85b6b13175 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c
am: 50fb0a1f11

Change-Id: Id68902bdc816f3885f97e6ea1226ed538e9df506
2016-11-14 22:18:52 +00:00
Josh Gao
ddf0740c08 adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46
am: e4e1ed0e5b

Change-Id: I36f3c0d34a64e7983a95607143e863d332e5324b
2016-11-14 22:18:39 +00:00
Josh Gao
50fb0a1f11 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev
am: b19b5fe08c

Change-Id: If4c9afd09de879519e4fd38d3b792af211c44d29
2016-11-14 22:10:40 +00:00
Josh Gao
e4e1ed0e5b adb: turn darwin/windows builds back on, hopefully fix them.
am: a9c0ac0c46

Change-Id: Icc58ac512edaaa0a47dda375147a832214107556
2016-11-14 22:10:39 +00:00
Josh Gao
b19b5fe08c Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev 2016-11-14 21:53:50 +00:00
Josh Gao
a9c0ac0c46 adb: turn darwin/windows builds back on, hopefully fix them.
Bug: http://b/32292581
Change-Id: Ie5182165a122f7aed4a5728906f005cc7d54ddd1
2016-11-14 13:06:44 -08:00
Tianjie Xu
4e37d97d61 DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131 am: ccfb7619f4 -s ours am: 3bd49af10b -s ours am: af7dbf4d7a am: b01cb2a926 -s ours
am: 778fff4ae8

Change-Id: Iaf5f9adc0fb0a30979915b5776d18d0512ebb232
2016-11-08 23:31:13 +00:00
Tianjie Xu
778fff4ae8 DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131 am: ccfb7619f4 -s ours am: 3bd49af10b -s ours am: af7dbf4d7a
am: b01cb2a926  -s ours

Change-Id: Ida16d9953d40010ebdd68d5a6b8a01199556e78c
2016-11-08 23:25:24 +00:00
Tianjie Xu
b01cb2a926 DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131 am: ccfb7619f4 -s ours am: 3bd49af10b -s ours
am: af7dbf4d7a

Change-Id: I2e790caa4c84dcd5c7d465e512ca3c1d3b878482
2016-11-08 23:20:50 +00:00
Tianjie Xu
cc236b7e94 Merge "DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket" into lmp-dev am: 40138b630c -s ours am: 65e59a4960 am: fb3d3904d0 -s ours
am: 4b9c44dcf7

Change-Id: I82ab3313abbb10b6c78ece2427eed82c17df3c4c
2016-11-08 23:16:07 +00:00
Tianjie Xu
f93261010a DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: bef09aaf9e -s ours am: b1fada1564 am: 466a521607 -s ours
am: ea11f5547c

Change-Id: I1d2cf48db50232f32872ee6a518b19e09ad3d19b
2016-11-08 23:15:53 +00:00
Tianjie Xu
af7dbf4d7a DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131 am: ccfb7619f4 -s ours
am: 3bd49af10b  -s ours

Change-Id: I9d9d3e658756ca104555039e8db4749310725a68
2016-11-08 23:14:53 +00:00
Tianjie Xu
4b9c44dcf7 Merge "DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket" into lmp-dev am: 40138b630c -s ours am: 65e59a4960
am: fb3d3904d0  -s ours

Change-Id: Ic47e26dca3eb4a0563882ffcc8a4fc33518577d0
2016-11-08 23:09:37 +00:00
Tianjie Xu
3bd49af10b DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131
am: ccfb7619f4  -s ours

Change-Id: If730d293efe1076a33555863fb6122ddde77694c
2016-11-08 23:09:24 +00:00
Tianjie Xu
ea11f5547c DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: bef09aaf9e -s ours am: b1fada1564
am: 466a521607  -s ours

Change-Id: I5f52d3e2b5fff92059670c1ff78a847a2a0066a2
2016-11-08 23:09:22 +00:00
Tianjie Xu
fb3d3904d0 Merge "DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket" into lmp-dev am: 40138b630c -s ours
am: 65e59a4960

Change-Id: I22ffc287456c01e181198ef86308d11ff85f0936
2016-11-08 23:05:12 +00:00
Tianjie Xu
466a521607 DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: bef09aaf9e -s ours
am: b1fada1564

Change-Id: I0ce21c35630cb62fe557143cbc4257a1adee362f
2016-11-08 23:04:58 +00:00
Tianjie Xu
ccfb7619f4 DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b
am: 4f3df4e131

Change-Id: I067fb2db1e83a0af84f248774b78c155f5e89c96
2016-11-08 23:03:21 +00:00