aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-23Snap for 5400147 from 402344d63e5af63389d5c1b31b4000d6739cd0f4 to ↵android-9.0.0_r47android-9.0.0_r45android-9.0.0_r42pie-qpr3-b-releaseandroid-build-team Robot
pi-qpr3-b-release Change-Id: I7f5ea0cd6c657993045e4351a09792d779691700
2019-03-21[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Bryan Ferris
67c9400dce am: 8ae53d498d am: 358bd5333d am: ac82097329 am: 10c2d8b54a am: 8d9a3d2ea5 Change-Id: Ic0a9a4c3821951c2cffd59b401c3a3da40f335de
2019-03-21[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Bryan Ferris
67c9400dce am: 8ae53d498d am: 358bd5333d am: ac82097329 am: 10c2d8b54a Change-Id: Ie293171d315c18cd325ebce76c21fc3e2d59df09
2019-03-21[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Bryan Ferris
67c9400dce am: 8ae53d498d am: 358bd5333d am: ac82097329 Change-Id: I94d6722dcb51a8065d92a547563073f5deb91bac
2019-03-15[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Android Build Merger (Role)
67c9400dce am: 8ae53d498d am: 358bd5333d Change-Id: Ib152eb3974d2ae4fc24c08e8223e03301ae00761
2019-03-15[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Android Build Merger (Role)
67c9400dce am: 8ae53d498d Change-Id: I9afeb65c4d03dfe98863f36e8cc1e5a353c43314
2019-03-15[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Android Build Merger (Role)
67c9400dce Change-Id: I280df4d139064a8bde767d083777d4a4f7970fad
2019-03-15[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5cAndroid Build Merger (Role)
Change-Id: I155082d81283161c247af10ec6565965d3d4c48d
2019-03-15[automerger] Fix type confusion in libpac am: cad793346eAndroid Build Merger (Role)
Change-Id: Icd9f904517d9bfc306485a4a91882b1f02987a0e
2019-03-14Fix type confusion in libpacBryan Ferris
From the upstream patch (https://chromium.googlesource.com/v8/v8/+/e33fd30777f99a0d6e16b16d096a2663b1031457%5E%21/#F0): """ Fix HAliasAnalyzer for constants """ Bug: 117606285 Test: /data/local/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Test: gts-tradefed run gts --test \ com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest \ --module GtsGmscoreHostTestCases Test: PoC from bug report Merged-In: I2e02d994f107e64e4f465b4d8a02d4159a95240e Change-Id: I297f27c69e94666c9f61efb216244b3d534cd018
2019-03-10Snap for 5363709 from 69b6741df47f86f0ef638281daf1b9cb43576729 to ↵android-build-team Robot
pi-qpr3-b-release Change-Id: Ic44207972d2e06c173b239c2a631067afc9c0c4d
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-dev am: 4769f48036 -s ours am: d8d455bd02 -s ours am: 87a320a185 -s ours am skip reason: subject contains skip directive Change-Id: I31c15f5e4acb76ea6dfa63bec6227e906e5cc19a
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
oc-dev am: 13d1d93ab9 am: f25b6c1640 am: 9f3ec0d2b3 Change-Id: Ic4a5aa2a03e15d35cdb90ecb9ec15f51a6dc229c
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-dev am: 4769f48036 -s ours am: d8d455bd02 -s ours am skip reason: change_id I72321236f4d4cf8da993addc3ef7a1dc018c434b with SHA1 359b0da753 is in history Change-Id: I64d4c99ae99fb7989642b423f2f713d2a09278e6
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
oc-dev am: 13d1d93ab9 am: f25b6c1640 Change-Id: Iada7df8e2606ae1b6215b64046412fa6ee959b06
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-mr1-dev am: 062342ae31 -s ours am skip reason: subject contains skip directive Change-Id: Id2e4ad274d6c0e494f433dbff36484c043fbbeb8
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix type confusion in ↵Bryan Ferris
libpac" into oc-mr1-dev am: 891f56d1f8 -s ours am skip reason: subject contains skip directive Change-Id: I6c072c49015a1eb5e5006a9d61e97263a1d0b4b6
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-dev am: 4769f48036 -s ours am skip reason: change_id I72321236f4d4cf8da993addc3ef7a1dc018c434b with SHA1 1156762647 is in history Change-Id: I9e48f6b9879567a0be967423ca67ccde5cca6f08
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into oc-devBryan Ferris
am: 13d1d93ab9 Change-Id: I7b5baf9ad7ffe9d3fc2d14faba8e8e354046160d
2019-03-08Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in libpac" into oc-mr1-devBryan Ferris
2019-03-08Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in libpac" into oc-devBryan Ferris
2019-03-08Merge "Fix type confusion in libpac" into pi-devBryan Ferris
2019-03-08Merge "[RESTRICT AUTOMERGE] Fix type confusion in libpac" into oc-mr1-devBryan Ferris
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
nyc-mr2-dev * changes: [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 am: 7a551be4c7 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce [RESTRICT AUTOMERGE] Fix type confusion in libpac
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into cw-f-devBryan Ferris
* changes: [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce [RESTRICT AUTOMERGE] Fix type confusion in libpac
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
nyc-mr1-dev * changes: [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce [RESTRICT AUTOMERGE] Fix type confusion in libpac
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
nyc-dr1-dev * changes: [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce [RESTRICT AUTOMERGE] Fix type confusion in libpac
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into oc-devBryan Ferris
* changes: [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 am: 7a551be4c7 skipped: fca33be935 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 am: 7a551be4c7 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce [RESTRICT AUTOMERGE] Fix type confusion in libpac
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB Access in libpac" ↵Bryan Ferris
into oc-mr1-dev am: 9b2712718d -s ours am skip reason: subject contains skip directive Change-Id: I0d631c0b997b7a5f200267f1d70cf96bf8e0364e
2019-03-08Merge "[RESTRICT AUTOMERGE] Fix OOB Access in libpac" into pi-devBryan Ferris
2019-03-08Merge "[RESTRICT AUTOMERGE] Fix OOB Access in libpac" into oc-mr1-devBryan Ferris
2019-03-08Merge changes from topic "am-3adb581e-7f56-400e-beda-ce3df2453af7" into ↵Bryan Ferris
oc-dev am: 4d5d43eac8 am: 23e499f62b am: fb2329bc8e Change-Id: I07262ce6cedca4e7f56f05e73bf3252a29274a6f
2019-03-08Merge changes from topic "am-3adb581e-7f56-400e-beda-ce3df2453af7" into ↵Bryan Ferris
oc-dev am: 4d5d43eac8 am: 23e499f62b Change-Id: I58ec95f0c134a77e53d007ff5ded1ce0fd3b6a78
2019-03-08Merge changes from topic "am-3adb581e-7f56-400e-beda-ce3df2453af7" into oc-devBryan Ferris
am: 4d5d43eac8 Change-Id: Ic5f939333215819c2fcac8ecf37bae7ad2daa1a7
2019-03-08[RESTRICT AUTOMERGE] Fix Integer Overflow in libpacBryan Ferris
From the upstream patch (https://chromium.googlesource.com/v8/v8.git/+/7b27040e66c8a83006aebc90fe97d21bb42156a7%5E%21/#F0): """ Harden JSFunction::CalculateInstanceSizeHelper(...) """ Bug: 117556220 Test: /data/local/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Test: gts-tradefed run gts --test \ com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest \ --module GtsGmscoreHostTestCases Test: PoC from bug report Merged-In: I2e02d994f107e64e4f465b4d8a02d4159a95240e Merged-In: I72321236f4d4cf8da993addc3ef7a1dc018c434b Change-Id: I72321236f4d4cf8da993addc3ef7a1dc018c434b
2019-03-08[RESTRICT AUTOMERGE] Fix type confusion in libpacBryan Ferris
From the upstream patch (https://chromium.googlesource.com/v8/v8.git/+/55a98076827edac8eba775f8025df3749bcd8367%5E%21/#F0): """ Fix regexp fast path in MaybeCallFunctionAtSymbol The regexp fast path in MaybeCallFunctionAtSymbol had an issue in which we'd call ToString after checking that the given {object} was a fast regexp and deciding to take the fast path. This is invalid since ToString() can call into user-controlled JS and may mutate {object}. There's no way to place the ToString call correctly in this instance: 1 before BranchIfFastRegExp, it's a spec violation if we end up on the slow regexp path; 2 the problem with the current location is already described above; 3 and we can't place it into the fast-path regexp builtin (e.g. RegExpReplace) either due to the same reasons as 1. The solution in this CL is to restrict the fast path to string arguments only, i.e. cases where ToString would be a nop and can safely be skipped. """ Bug: 117556606 Test: /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Test: gts-tradefed run gts --test \ com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest \ --module GtsGmscoreHostTestCases Test: PoC from bug report Merged-In: I2e02d994f107e64e4f465b4d8a02d4159a95240e Change-Id: Ifb58de2b3c547c442f1ad69e0bca0fa934d1f728
2019-03-08Merge "Fix Integer Overflow in libpac" into pi-devBryan Ferris
2019-03-08Merge changes from topic "am-3adb581e-7f56-400e-beda-ce3df2453af7" into ↵Bryan Ferris
nyc-mr2-dev * changes: [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 am: 5f96bbd676 am: 7f487700d0 am: 2f9d58bd68 [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 am: 5f96bbd676 am: 7f487700d0 [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 am: 5f96bbd676 [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac
2019-03-08Merge changes from topic "am-3adb581e-7f56-400e-beda-ce3df2453af7" into cw-f-devBryan Ferris
* changes: [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 am: 5f96bbd676 am: 7f487700d0 [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 am: 5f96bbd676 [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac
2019-03-08Merge changes from topic "am-3adb581e-7f56-400e-beda-ce3df2453af7" into ↵Bryan Ferris
nyc-mr1-dev * changes: [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 am: 5f96bbd676 [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac
2019-03-08Merge changes from topic "am-3adb581e-7f56-400e-beda-ce3df2453af7" into ↵Bryan Ferris
nyc-dr1-dev * changes: [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac
2019-03-08Merge changes from topic "am-3adb581e-7f56-400e-beda-ce3df2453af7" into oc-devBryan Ferris
* changes: [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 am: 5f96bbd676 am: 7f487700d0 am: 2f9d58bd68 skipped: 837d703740 [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 am: 5f96bbd676 am: 7f487700d0 am: 2f9d58bd68 [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 am: 5f96bbd676 am: 7f487700d0 [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 am: 5f96bbd676 [automerger] [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac am: 1156762647 [RESTRICT AUTOMERGE] Fix Integer Overflow in libpac
2019-03-08[RESTRICT AUTOMERGE] Fix OOB Access in libpacBryan Ferris
Bug: 117554758 Test: /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Test: gts-tradefed run gts --test \ com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest \ --module GtsGmscoreHostTestCases Test: PoC from bug report From upstream commit (https://chromium.googlesource.com/v8/v8.git/+/389539ca30406101971745820d3105e7f39bb772%5E%21/#F0): """ Fix type of String#indexOf and String#lastIndexOf. The Typer put the wrong type on String#index and String#lastIndexOf builtins, with an off by one on the upper bound. """ Change-Id: I6230c1b764cacf9349317ad5870d7a679600d7d5
2019-03-07Merge changes from topic "am-a4610d75-cf54-4e1c-baf3-ed4f0dbb00a9" into ↵Bryan Ferris
oc-dev am: 68021f1a59 am: 7c70048d38 am: 5214c06652 Change-Id: Id525cb794f6f862ae6216ba5c269b92a16810a65
2019-03-07Merge changes from topic "am-a7911131-9cfc-43c1-a7d1-3aebb2024246" into ↵Bryan Ferris
oc-dev am: 1e32ebc7ae am: 918153fdd4 am: 621a18d23c Change-Id: Ife5fb1cb14d0163bdf0345c906db888079fe9365
2019-03-07[automerger] Fix OOB read in libpac ast-numbering.cc am: 8cc1440e71 am: ↵Bryan Ferris
a3b90fcc73 am: 8606e82e41 am: 7ab4802751 am: 2466459dcb am: 66b2fbdc91 am: 36e0e57313 am: e96b75d9b0 Change-Id: Id6034368b7008eec8b8d8d708401789325767119
2019-03-07Merge changes from topic "am-a4610d75-cf54-4e1c-baf3-ed4f0dbb00a9" into ↵Bryan Ferris
oc-dev am: 68021f1a59 am: 7c70048d38 Change-Id: Id227542c2b4895e6880390120f1b4f9406476f95
2019-03-07Merge changes from topic "am-a7911131-9cfc-43c1-a7d1-3aebb2024246" into ↵Bryan Ferris
oc-dev am: 1e32ebc7ae am: 918153fdd4 Change-Id: I24ca85b427135bb34ff979f934e026b536971f5a
2019-03-07[automerger] Fix OOB read in libpac ast-numbering.cc am: 8cc1440e71 am: ↵Bryan Ferris
a3b90fcc73 am: 8606e82e41 am: 7ab4802751 am: 2466459dcb am: 66b2fbdc91 am: 36e0e57313 Change-Id: I8984b05bee9260a6424b890efd7eb3bcb0ad0e53
2019-03-07Merge changes from topic "am-a4610d75-cf54-4e1c-baf3-ed4f0dbb00a9" into oc-devBryan Ferris
am: 68021f1a59 Change-Id: I24bc4641e560774b98c022b60d9240be5468a3c4
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 04:41:29 +0000