220861 2021-01-22 08:36:53 -0800 Support aspect-ratio in intrinsic sizing 2021-03-08 04:37:53 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 47738 1 rbuis rbuis changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr webkit-bug-importer oldest_to_newest 1721588 0 rbuis 2021-01-22 08:36:53 -0800 Support aspect-ratio in intrinsic sizing. 1721589 1 418150 rbuis 2021-01-22 08:39:32 -0800 Created attachment 418150 Patch 1723331 2 418632 rbuis 2021-01-28 02:50:50 -0800 Created attachment 418632 Patch 1723718 3 webkit-bug-importer 2021-01-29 08:37:14 -0800 <rdar://problem/73755568> 1726377 4 419498 rbuis 2021-02-06 02:59:19 -0800 Created attachment 419498 Patch 1730835 5 420826 rbuis 2021-02-18 06:22:53 -0800 Created attachment 420826 Patch 1730858 6 420831 rbuis 2021-02-18 08:34:20 -0800 Created attachment 420831 Patch 1731280 7 420944 rbuis 2021-02-19 02:10:16 -0800 Created attachment 420944 Patch 1731931 8 421135 rbuis 2021-02-21 03:22:35 -0800 Created attachment 421135 Patch 1731981 9 421148 rbuis 2021-02-21 12:56:53 -0800 Created attachment 421148 Patch 1732193 10 421210 rbuis 2021-02-22 10:31:45 -0800 Created attachment 421210 Patch 1732262 11 421228 rbuis 2021-02-22 12:50:27 -0800 Created attachment 421228 Patch 1732819 12 421393 rbuis 2021-02-24 03:39:12 -0800 Created attachment 421393 Patch 1734189 13 421744 rbuis 2021-02-27 04:54:48 -0800 Created attachment 421744 Patch 1734206 14 421751 rbuis 2021-02-27 10:44:28 -0800 Created attachment 421751 Patch 1734223 15 421754 rbuis 2021-02-27 12:56:48 -0800 Created attachment 421754 Patch 1734295 16 421779 rbuis 2021-02-28 13:01:41 -0800 Created attachment 421779 Patch 1735220 17 422053 rbuis 2021-03-03 02:52:06 -0800 Created attachment 422053 Patch 1736921 18 422528 rbuis 2021-03-07 08:02:02 -0800 Created attachment 422528 Patch 1737004 19 422528 koivisto 2021-03-08 01:38:31 -0800 Comment on attachment 422528 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422528&action=review > Source/WebCore/rendering/RenderBox.h:88 > + LayoutUnit constrainLogicalWidthInFragmentByMinMax(LayoutUnit, LayoutUnit, RenderBlock&, RenderFragmentContainer*, bool allowIntrinsic = true) const; Please use an enum. The 'false' in call site is mysterious. 1737019 20 422552 rbuis 2021-03-08 03:02:48 -0800 Created attachment 422552 Patch 1737030 21 ews-feeder 2021-03-08 04:37:51 -0800 Committed r274068: <https://commits.webkit.org/r274068> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422552. 418150 2021-01-22 08:39:32 -0800 2021-01-28 02:50:45 -0800 Patch bug-220861-20210122173930.patch text/plain 8270 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYwZTA4OGZhNzIzNTRl ZjY4MDU2MzZhMmZiMmZlZDQwYjkxNzlkNC4uNjJjYjBmZTEzM2MxYzk3MzA0NzkwYWNmNDJhM2Rm MzlmMDYyZDI4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAxLTIyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9n aWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6YmxvY2tTaXplRnJvbUFzcGVjdFJhdGlvKToK KwogMjAyMS0wMS0yMiAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4K IAogICAgICAgICBEZW55aW5nIHN0b3JhZ2UgYWNjZXNzIG9uIHBsYXlzdGF0aW9uLmNvbSB0aGVu IGNsaWNraW5nIHNpZ24taW4gZmFpbHMgdG8gc2hvdyB0aGUgcHJvbXB0IGFnYWluCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCAyMjJiYmZiYzQwNDg5ZjcxMTg3 MTc3ZGM3NWQzZmQ0MTM0MmZmNGQ0Li45Y2UzMWI3NmNkZjFmNjU0YjJiYzIxZmVjNjVmN2FmOTM1 MjE4MWU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTI0 MzgsNiArMjQzOCw4IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVDaGlsZFByZWZlcnJlZExv Z2ljYWxXaWR0aHMoUmVuZGVyT2JqZWN0JiBjaGlsZCwgTGF5b3V0CiAgICAgCiAgICAgaWYgKGNo aWxkLmlzQm94KCkpIHsKICAgICAgICAgYXV0byYgYm94ID0gZG93bmNhc3Q8UmVuZGVyQm94Pihj aGlsZCk7CisgICAgICAgIGlmIChib3guc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl Y3RSYXRpbygpKQorICAgICAgICAgICAgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbWF4UHJl ZmVycmVkTG9naWNhbFdpZHRoID0gYm94LmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW8oKTsKICAgICAgICAgaWYgKG92ZXJyaWRpbmdIZWlnaHQpCiAgICAgICAgICAgICBib3guc2V0 T3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQob3ZlcnJpZGluZ0hlaWdodC52YWx1ZSgpKTsKICAgICAg ICAgaWYgKG92ZXJyaWRpbmdXaWR0aCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAKaW5kZXggMDc1ZTI3YWU4YmI1MzAyY2FlZjJjOGUzM2YxYTRjYTcyNWI1YjE1MC4uYjcyYWZi ZjZhZjBhNTQ3OTY1ZjQyYmU5MjVmYjIwYmE0ZGZlODEwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAKQEAgLTI1ODQsNiArMjU4NCwxNSBAQCBMYXlvdXRVbml0IFJlbmRl ckJveDo6ZmlsbEF2YWlsYWJsZU1lYXN1cmUoTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lk dGgsIExheQogICAgIHJldHVybiBhdmFpbGFibGVMb2dpY2FsV2lkdGggLSBtYXJnaW5TdGFydCAt IG1hcmdpbkVuZDsKIH0KIAordm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs V2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNh bFdpZHRoLCBib29sIGFsbG93X2ludHJpbnNpYykgY29uc3QKK3sKKyAgICBpZiAoIWFsbG93X2lu dHJpbnNpYyAmJiBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpIHsK KyAgICAgICAgbWluTG9naWNhbFdpZHRoID0gbWF4TG9naWNhbFdpZHRoID0gY29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIGNv bXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdp ZHRoKTsKK30KKwogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs V2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRoTGVuZ3RoLCBMYXlvdXRVbml0IGF2YWlsYWJs ZUxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nKSBjb25zdAogewogICAg IGlmIChsb2dpY2FsV2lkdGhMZW5ndGgudHlwZSgpID09IEZpbGxBdmFpbGFibGUpCkBAIC0yNTkx LDcgKzI2MDAsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2lj YWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhMZW5ndAogCiAgICAgTGF5b3V0VW5pdCBt aW5Mb2dpY2FsV2lkdGg7CiAgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGg7Ci0gICAgY29t cHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lk dGgpOworICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwg bWF4TG9naWNhbFdpZHRoLCB0cnVlKTsKIAogICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGgudHlw ZSgpID09IE1pbkNvbnRlbnQpCiAgICAgICAgIHJldHVybiBtaW5Mb2dpY2FsV2lkdGggKyBib3Jk ZXJBbmRQYWRkaW5nOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IGFmOThi NDkyY2U5N2NiYTg5MWNiYzI1OGY2MGQ0OGU5ZmNjNGM1ZDMuLmNiMTkyM2Y0MGE1Y2UxNjRlNjBi Mjc0OTBlMGIzMzM4M2ZhMmVmZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgK QEAgLTY0OSw2ICs2NDksMTkgQEAgb3ZlcnJpZGU7CiAKICAgICBMYXlvdXRSZWN0IGFic29sdXRl QW5jaG9yUmVjdFdpdGhTY3JvbGxNYXJnaW4oYm9vbCogaW5zaWRlRml4ZWQgPSBudWxscHRyKSBj b25zdCBvdmVycmlkZTsKIAorICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9t QXNwZWN0UmF0aW8oKSBjb25zdDsKKyAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKKyAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbXB1 dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0g bnVsbHB0cikgY29uc3Q7CisgICAgc3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+IGNv bXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKKworICAgIHN0 YXRpYyBMYXlvdXRVbml0IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0IGJvcmRl clBhZGRpbmdJbmxpbmVTdW0sIExheW91dFVuaXQgYm9yZGVyUGFkZGluZ0Jsb2NrU3VtLCBMYXlv dXRVbml0IGFzcGVjdFJhdGlvLCBCb3hTaXppbmcgYm94U2l6aW5nLCBMYXlvdXRVbml0IGlubGlu ZVNpemUpCisgICAgeworICAgICAgICBpZiAoYm94U2l6aW5nID09IEJveFNpemluZzo6Qm9yZGVy Qm94KQorICAgICAgICAgICAgcmV0dXJuIGlubGluZVNpemUgLyBhc3BlY3RSYXRpbzsKKyAgICAg ICAgcmV0dXJuICgoaW5saW5lU2l6ZSAtIGJvcmRlclBhZGRpbmdJbmxpbmVTdW0pIC8gYXNwZWN0 UmF0aW8pICsgYm9yZGVyUGFkZGluZ0Jsb2NrU3VtOworICAgIH0KKwogcHJvdGVjdGVkOgogICAg IFJlbmRlckJveChFbGVtZW50JiwgUmVuZGVyU3R5bGUmJiwgQmFzZVR5cGVGbGFncyk7CiAgICAg UmVuZGVyQm94KERvY3VtZW50JiwgUmVuZGVyU3R5bGUmJiwgQmFzZVR5cGVGbGFncyk7CkBAIC02 OTgsMTkgKzcxMSw2IEBAIHByb3RlY3RlZDoKIAogICAgIHZvaWQgaW5jcmVtZW50VmlzdWFsbHlO b25FbXB0eVBpeGVsQ291bnRJZk5lZWRlZChjb25zdCBJbnRTaXplJik7CiAKLSAgICBib29sIHNo b3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7Ci0gICAgYm9v bCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7Ci0gICAg Ym9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkg Y29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlv KFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiA9IG51bGxwdHIpIGNvbnN0OwotICAgIHN0ZDo6cGFp cjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKCkgY29uc3Q7Ci0KLSAgICBzdGF0aWMgTGF5b3V0VW5pdCBibG9ja1NpemVGcm9t QXNwZWN0UmF0aW8oTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nSW5saW5lU3VtLCBMYXlvdXRVbml0 IGJvcmRlclBhZGRpbmdCbG9ja1N1bSwgTGF5b3V0VW5pdCBhc3BlY3RSYXRpbywgQm94U2l6aW5n IGJveFNpemluZywgTGF5b3V0VW5pdCBpbmxpbmVTaXplKQotICAgIHsKLSAgICAgICAgaWYgKGJv eFNpemluZyA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKLSAgICAgICAgICAgIHJldHVybiBpbmxp bmVTaXplIC8gYXNwZWN0UmF0aW87Ci0gICAgICAgIHJldHVybiAoKGlubGluZVNpemUgLSBib3Jk ZXJQYWRkaW5nSW5saW5lU3VtKSAvIGFzcGVjdFJhdGlvKSArIGJvcmRlclBhZGRpbmdCbG9ja1N1 bTsKLSAgICB9Ci0KIHByaXZhdGU6CiAgICAgYm9vbCByZXBsYWNlZE1pbk1heExvZ2ljYWxIZWln aHRDb21wdXRlc0FzTm9uZShTaXplVHlwZSkgY29uc3Q7CiAKQEAgLTc0Nyw2ICs3NDcsNyBAQCBw cml2YXRlOgogICAgIExheW91dFVuaXQgZmlsbEF2YWlsYWJsZU1lYXN1cmUoTGF5b3V0VW5pdCBh dmFpbGFibGVMb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1hcmdpblN0YXJ0LCBMYXlvdXRVbml0 JiBtYXJnaW5FbmQpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVJbnRyaW5zaWNM b2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4 TG9naWNhbFdpZHRoKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lk dGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdp ZHRoLCBib29sIGFsbG93X2ludHJpbnNpYykgY29uc3Q7CiAKICAgICAvLyBUaGlzIGZ1bmN0aW9u IGNhbGN1bGF0ZXMgdGhlIG1pbmltdW0gYW5kIG1heGltdW0gcHJlZmVycmVkIHdpZHRocyBmb3Ig YW4gb2JqZWN0LgogICAgIC8vIFRoZXNlIHZhbHVlcyBhcmUgdXNlZCBpbiBzaHJpbmstdG8tZml0 IGxheW91dCBzeXN0ZW1zLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGE1ZjRhZWY5N2MwMjA0ZDYyZjllZDgyNDkzYjhlY2Vi OGE5NTVlZDYuLjhhOTVmY2ZjZWQwNzMwYjY3ZDdlMTM1ZmI4NDE5NGQxYTg3ZmIwYzYgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMS0yMiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29t PgorCisgICAgICAgIFN1cHBvcnQgYXNwZWN0LXJhdGlvIGluIGludHJpbnNpYyBzaXppbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg2MQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSBzb21l IHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAy MDIxLTAxLTIxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgSGFuZGxl IHNoYXBlTWFyZ2luIGJlY29taW5nIE5hTgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNzliMWQ2NDA4 NzA5Yzk4YzQ2N2NhNGI3ZWNjNWU5MjVkOTBiMzVlNC4uODlhY2E1YWYwNDI3ZjE5OGNjNjEwZGIz YmI4ZGJiYjQwMDU0NzdlNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u cworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDM0LDEwICs0NDM0LDcg QEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h c3BlY3QtcmF0aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAx Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmlu c2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vaW50cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA2Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUt MDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcGFy c2luZy9jb250YWluLWludHJpbnNpYy1zaXplLWludmFsaWQuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQo= 418632 2021-01-28 02:50:50 -0800 2021-02-06 02:59:15 -0800 Patch bug-220861-20210128115049.patch text/plain 8412 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM4MDhkYmRiOTFkODE4 NDRmODVhNWU2ZTNmMTFlZjYzOTgwNGY0NS4uMzMxOGJlN2ExNGYxY2E2MTExMzdkNWRlYTdkN2Ux MjYwMzhhM2NjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAxLTI4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9n aWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6YmxvY2tTaXplRnJvbUFzcGVjdFJhdGlvKToK KwogMjAyMS0wMS0yNyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSRUdSRVNTSU9OKHIyNjg2MTUpOiBpbWFnZXMgZmxpY2tlciBvbiBhcHBsZS5jb20vaW9z L2lvcy0xNApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggYjcz NTMzMmQ0NzI5ZDU4NzllNmM1OWYzMjdmMDAzMzdhMjc1YzA5MS4uYWU4MWRjOGY5NzdiYjhkNzM2 ZjgwNzhjYjU2MzgyYmU2YzljNDBiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwCkBAIC0yNDI2LDYgKzI0MjYsOCBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRl Q2hpbGRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKFJlbmRlck9iamVjdCYgY2hpbGQsIExheW91dAog ICAgIAogICAgIGlmIChjaGlsZC5pc0JveCgpKSB7CiAgICAgICAgIGF1dG8mIGJveCA9IGRvd25j YXN0PFJlbmRlckJveD4oY2hpbGQpOworICAgICAgICBpZiAoYm94LnNob3VsZENvbXB1dGVMb2dp Y2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIG1pblByZWZlcnJlZExvZ2lj YWxXaWR0aCA9IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGJveC5jb21wdXRlTG9naWNhbFdp ZHRoRnJvbUFzcGVjdFJhdGlvKCk7CiAgICAgICAgIGlmIChvdmVycmlkaW5nSGVpZ2h0KQogICAg ICAgICAgICAgYm94LnNldE92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KG92ZXJyaWRpbmdIZWlnaHQu dmFsdWUoKSk7CiAgICAgICAgIGlmIChvdmVycmlkaW5nV2lkdGgpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDk4ZDJjMGEyOTk1ZWViNDM1Y2QxNzI2NWYxZTczZmYw NGVkZjUxMTIuLmQ4MWM1NTExN2ZiYzNkZjExNTllZDIwZmY5ZjkxZDdkOTVmNjU0MWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0yNjAyLDYgKzI2MDIsMTUgQEAg TGF5b3V0VW5pdCBSZW5kZXJCb3g6OmZpbGxBdmFpbGFibGVNZWFzdXJlKExheW91dFVuaXQgYXZh aWxhYmxlTG9naWNhbFdpZHRoLCBMYXkKICAgICByZXR1cm4gYXZhaWxhYmxlTG9naWNhbFdpZHRo IC0gbWFyZ2luU3RhcnQgLSBtYXJnaW5FbmQ7CiB9CiAKK3ZvaWQgUmVuZGVyQm94Ojpjb21wdXRl SW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91 dFVuaXQmIG1heExvZ2ljYWxXaWR0aCwgYm9vbCBhbGxvd0ludHJpbnNpYykgY29uc3QKK3sKKyAg ICBpZiAoIWFsbG93SW50cmluc2ljICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW8oKSkgeworICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGgg PSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisgICAgICAgIHJldHVybjsK KyAgICB9CisgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRo LCBtYXhMb2dpY2FsV2lkdGgpOworfQorCiBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhMZW5ndGgsIExheW91 dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcp IGNvbnN0CiB7CiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC50eXBlKCkgPT0gRmlsbEF2YWls YWJsZSkKQEAgLTI2MDksNyArMjYxOCw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRl SW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0CiAKICAg ICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aDsKICAgICBMYXlvdXRVbml0IG1heExvZ2ljYWxX aWR0aDsKLSAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgs IG1heExvZ2ljYWxXaWR0aCk7CisgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWlu TG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgsIHRydWUpOwogCiAgICAgaWYgKGxvZ2ljYWxX aWR0aExlbmd0aC50eXBlKCkgPT0gTWluQ29udGVudCkKICAgICAgICAgcmV0dXJuIG1pbkxvZ2lj YWxXaWR0aCArIGJvcmRlckFuZFBhZGRpbmc7CkBAIC01MDc4LDcgKzUwODcsNyBAQCBib29sIFJl bmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBjb25z dAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBhdXRvIGggPSBzdHlsZSgpLmxvZ2ljYWxI ZWlnaHQoKTsKLSAgICByZXR1cm4gaC5pc0F1dG8oKSB8fCAoIWlzT3V0T2ZGbG93UG9zaXRpb25l ZCgpICYmIGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgcGVyY2VudGFnZUxvZ2ljYWxIZWln aHRJc1Jlc29sdmFibGUoKSk7CisgICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgKCFpc091dE9mRmxv d1Bvc2l0aW9uZWQoKSAmJiBoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmICFwZXJjZW50YWdl TG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKTsKIH0KIAogYm9vbCBSZW5kZXJCb3g6OnNob3Vs ZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDQwM2I2OGQxYzUyYjZmNmVhNDFjMGNjOTA3NzdhZjY4 YTM5MGVhYjUuLjU1Y2VkZGRkODViOTk5YjdiZmFmM2EzY2M0MzQ0YTYwOWYyYmZkZDAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTY1MSw2ICs2NTEsMTAgQEAgb3ZlcnJp ZGU7CiAKICAgICBMYXlvdXRSZWN0IGFic29sdXRlQW5jaG9yUmVjdFdpdGhTY3JvbGxNYXJnaW4o Ym9vbCogaW5zaWRlRml4ZWQgPSBudWxscHRyKSBjb25zdCBvdmVycmlkZTsKIAorICAgIGJvb2wg c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKKyAgICBi b29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKKyAg ICBMYXlvdXRVbml0IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJh Z21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CisKIHByb3RlY3RlZDoKICAgICBSZW5k ZXJCb3goRWxlbWVudCYsIFJlbmRlclN0eWxlJiYsIEJhc2VUeXBlRmxhZ3MpOwogICAgIFJlbmRl ckJveChEb2N1bWVudCYsIFJlbmRlclN0eWxlJiYsIEJhc2VUeXBlRmxhZ3MpOwpAQCAtNzAwLDEw ICs3MDQsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIGluY3JlbWVudFZpc3VhbGx5Tm9uRW1w dHlQaXhlbENvdW50SWZOZWVkZWQoY29uc3QgSW50U2l6ZSYpOwogCi0gICAgYm9vbCBzaG91bGRD b21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwotICAgIGJvb2wgc2hv dWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwogICAgIGJvb2wg c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0 OwotICAgIExheW91dFVuaXQgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5k ZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKICAgICBzdGQ6OnBhaXI8TGF5 b3V0VW5pdCwgTGF5b3V0VW5pdD4gY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RS YXRpbygpIGNvbnN0OwogCiAgICAgc3RhdGljIExheW91dFVuaXQgYmxvY2tTaXplRnJvbUFzcGVj dFJhdGlvKExheW91dFVuaXQgYm9yZGVyUGFkZGluZ0lubGluZVN1bSwgTGF5b3V0VW5pdCBib3Jk ZXJQYWRkaW5nQmxvY2tTdW0sIExheW91dFVuaXQgYXNwZWN0UmF0aW8sIEJveFNpemluZyBib3hT aXppbmcsIExheW91dFVuaXQgaW5saW5lU2l6ZSkKQEAgLTc1MSw2ICs3NTIsNyBAQCBwcml2YXRl OgogICAgIExheW91dFVuaXQgZmlsbEF2YWlsYWJsZU1lYXN1cmUoTGF5b3V0VW5pdCBhdmFpbGFi bGVMb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1hcmdpblN0YXJ0LCBMYXlvdXRVbml0JiBtYXJn aW5FbmQpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs V2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNh bFdpZHRoKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExh eW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoLCBi b29sIGFsbG93SW50cmluc2ljKSBjb25zdDsKIAogICAgIC8vIFRoaXMgZnVuY3Rpb24gY2FsY3Vs YXRlcyB0aGUgbWluaW11bSBhbmQgbWF4aW11bSBwcmVmZXJyZWQgd2lkdGhzIGZvciBhbiBvYmpl Y3QuCiAgICAgLy8gVGhlc2UgdmFsdWVzIGFyZSB1c2VkIGluIHNocmluay10by1maXQgbGF5b3V0 IHN5c3RlbXMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggMjdmMGZmMDYxNWNjM2FiYzAzZjczNzhmMjFhZTY5MTk1MjBlYmM0 Mi4uMTBhNzQwZDEyZmU2NWNhMzRlNDcyNTg4NzczOGFlMTU0MmI0Yjc1MSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDIxLTAxLTI4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAg ICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5hYmxlIHNvbWUgdGVzdHMg dGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDEt MjcgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVT U0lPTihyMjY4NjE1KTogaW1hZ2VzIGZsaWNrZXIgb24gYXBwbGUuY29tL2lvcy9pb3MtMTQKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0 RXhwZWN0YXRpb25zCmluZGV4IDRkMTI2NTQ2ZWJmMGYzMzY1N2FjMjc5ZTE0MjcxM2IwZWFlYmE4 NzAuLjQ0Yzc0OTI1Njg4MjdhYjQxOWFhMTQ2NmFjNDY4NzM4Y2FhZDY5YzEgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVj dGF0aW9ucwpAQCAtNDQ0NSwxNCArNDQ0NSw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3 ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAwOS5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAx MS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQt YXNwZWN0LXJhdGlvLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13 ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNC5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1z aXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2ludHJpbnNpYy1zaXplLTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMC5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3BhcnNpbmcv Y29udGFpbi1pbnRyaW5zaWMtc2l6ZS1pbnZhbGlkLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcGVyY2VudGFnZS1yZXNvbHV0aW9uLTAwNS5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1l bnQtMDMwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 419498 2021-02-06 02:59:19 -0800 2021-02-18 06:22:47 -0800 Patch bug-220861-20210206115918.patch text/plain 11581 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGYxNGVjZDBhYTNhYWVm ZDMzNDRkYmIwNWE2NDY5N2E4MGZhZGI5Ni4uMjkyMGFhMDhiNjE1NDcyZTU5ZDYyMGRjM2JiOGMy MDQzYmM1YWY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTA2ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMS0wMi0wNCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIHRoZSBUaW1lciBmcm9tIFN0eWxlOjpTY29wZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggYjczNTMzMmQ0NzI5ZDU4NzllNmM1OWYzMjdm MDAzMzdhMjc1YzA5MS4uYWU4MWRjOGY5NzdiYjhkNzM2ZjgwNzhjYjU2MzgyYmU2YzljNDBiNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0yNDI2LDYgKzI0 MjYsOCBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dpY2FsV2lk dGhzKFJlbmRlck9iamVjdCYgY2hpbGQsIExheW91dAogICAgIAogICAgIGlmIChjaGlsZC5pc0Jv eCgpKSB7CiAgICAgICAgIGF1dG8mIGJveCA9IGRvd25jYXN0PFJlbmRlckJveD4oY2hpbGQpOwor ICAgICAgICBpZiAoYm94LnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8o KSkKKyAgICAgICAgICAgIG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heFByZWZlcnJlZExv Z2ljYWxXaWR0aCA9IGJveC5jb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CiAg ICAgICAgIGlmIChvdmVycmlkaW5nSGVpZ2h0KQogICAgICAgICAgICAgYm94LnNldE92ZXJyaWRp bmdMb2dpY2FsSGVpZ2h0KG92ZXJyaWRpbmdIZWlnaHQudmFsdWUoKSk7CiAgICAgICAgIGlmIChv dmVycmlkaW5nV2lkdGgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4 IDM3ZjY3NjVjYjMzYTg0YTgzOWY1YTdhMTQ2MjZhNmRjYzgyMzAxODIuLmIwZjAyOGI4ZWMyMTJh YTg1MWFkNzNhNGMyNGRjYmY5M2NkNWZhYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCkBAIC02NTEsNyArNjUxLDcgQEAgdm9pZCBSZW5kZXJCb3g6OnVwZGF0ZUxheWVy VHJhbnNmb3JtKCkKICAgICAgICAgbGF5ZXIoKS0+dXBkYXRlVHJhbnNmb3JtKCk7CiB9CiAKLUxh eW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5N YXgoTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIFJl bmRlckJsb2NrJiBjYiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGZyYWdtZW50KSBjb25zdAor TGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1p bk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwg UmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQsIGJvb2wg YWxsb3dJbnRyaW5zaWMpIGNvbnN0CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlVG9V c2UgPSBzdHlsZSgpOwogCkBAIC02NjAsOCArNjYwLDEwIEBAIExheW91dFVuaXQgUmVuZGVyQm94 Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dp Y2FsCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRoLCBsb2dp Y2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CiAgICAgfQogCi0gICAgaWYgKCFzdHlsZVRv VXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCisgICAgaWYgKCFzdHlsZVRvVXNl LmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgKGFsbG93SW50cmluc2ljIHx8ICFz dHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzSW50cmluc2ljKCkpKQogICAgICAgICBsb2dp Y2FsV2lkdGggPSBzdGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZy YWdtZW50VXNpbmcoTWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwgYXZhaWxh YmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOworICAgIGlmICghYWxsb3dJbnRyaW5zaWMgJiYgc3R5 bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKQorICAgICAgICByZXR1cm4g bG9naWNhbFdpZHRoOwogICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2FsV2lkdGgsIGNvbXB1dGVM b2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWlu V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOwogfQogCkBAIC0yNjAyLDYg KzI2MDQsMTUgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmZpbGxBdmFpbGFibGVNZWFzdXJlKExh eW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMYXkKICAgICByZXR1cm4gYXZhaWxhYmxl TG9naWNhbFdpZHRoIC0gbWFyZ2luU3RhcnQgLSBtYXJnaW5FbmQ7CiB9CiAKK3ZvaWQgUmVuZGVy Qm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2Fs V2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCwgYm9vbCBhbGxvd0ludHJpbnNpYykg Y29uc3QKK3sKKyAgICBpZiAoYWxsb3dJbnRyaW5zaWMgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgIG1pbkxvZ2ljYWxXaWR0aCA9IG1heExv Z2ljYWxXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKyAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5M b2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7Cit9CisKIExheW91dFVuaXQgUmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExl bmd0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYm9yZGVy QW5kUGFkZGluZykgY29uc3QKIHsKICAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLnR5cGUoKSA9 PSBGaWxsQXZhaWxhYmxlKQpAQCAtMjYwOSw3ICsyNjIwLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJC b3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRo TGVuZ3QKIAogICAgIExheW91dFVuaXQgbWluTG9naWNhbFdpZHRoOwogICAgIExheW91dFVuaXQg bWF4TG9naWNhbFdpZHRoOwotICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxv Z2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKyAgICBjb21wdXRlSW50cmluc2ljTG9naWNh bFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCwgdHJ1ZSk7CiAKICAgICBp ZiAobG9naWNhbFdpZHRoTGVuZ3RoLnR5cGUoKSA9PSBNaW5Db250ZW50KQogICAgICAgICByZXR1 cm4gbWluTG9naWNhbFdpZHRoICsgYm9yZGVyQW5kUGFkZGluZzsKQEAgLTUwODEsNyArNTA5Miw3 IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RS YXRpbygpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gaCA9IHN0eWxl KCkubG9naWNhbEhlaWdodCgpOwotICAgIHJldHVybiBoLmlzQXV0bygpIHx8ICghaXNPdXRPZkZs b3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFn ZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CisgICAgcmV0dXJuIGguaXNBdXRvKCkgfHwg aC5pc0ludHJpbnNpYygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNl bnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUo KSk7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKCkgY29uc3QKQEAgLTUxMTQsNyArNTEyNSw3IEBAIExheW91dFVuaXQgUmVuZGVy Qm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29u dGFpbmVyCiAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBpbmxpbmVTaXplRnJvbUFzcGVjdFJhdGlv KGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFk ZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9naWNhbEFzcGVjdFJhdGlvKCkpLCBz dHlsZSgpLmJveFNpemluZygpLCBsb2dpY2FsSGVpZ2h0Zm9yQXNwZWN0UmF0aW8pOwogCiAgICAg TGF5b3V0VW5pdCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uID0gc3RkOjptYXg8TGF5 b3V0VW5pdD4oMCwgY29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudEluRnJhZ21l bnQoZnJhZ21lbnQpKTsKLSAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwg KmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCk7CisgICAgcmV0dXJuIGNvbnN0cmFpbkxvZ2lj YWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lkdGgsIGNvbnRhaW5lcldpZHRoSW5J bmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2soKSwgZnJhZ21lbnQsIGZhbHNlKTsKIH0K IAogc3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+IFJlbmRlckJveDo6Y29tcHV0ZU1p bk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmgKaW5kZXggZTBhZTkxZjRjMzE5OTBhNjAzOTJiYTFkZjEwNzM4YWM4MDUy MWVjZS4uMzE4ZTgwNzc4OTNkZTRhZmY5OTQzYjdiMzBiNzhhZjA1ZWE0ZjgxYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtODUsNyArODUsNyBAQCBwdWJsaWM6CiAgICAg TGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmlzSG9yaXpv bnRhbFdyaXRpbmdNb2RlKCkgPyB3aWR0aCgpIDogaGVpZ2h0KCk7IH0KICAgICBMYXlvdXRVbml0 IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKCkgPyBoZWlnaHQoKSA6IHdpZHRoKCk7IH0KIAotICAgIExheW91dFVuaXQgY29uc3Ry YWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQsIExheW91dFVuaXQs IFJlbmRlckJsb2NrJiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7 CisgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgo TGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5kZXJGcmFnbWVudENvbnRh aW5lciosIGJvb2wgYWxsb3dJbnRyaW5zaWMgPSB0cnVlKSBjb25zdDsKICAgICBMYXlvdXRVbml0 IGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQs IE9wdGlvbmFsPExheW91dFVuaXQ+IGludHJpbnNpY0NvbnRlbnRIZWlnaHQpIGNvbnN0OwogICAg IExheW91dFVuaXQgY29uc3RyYWluQ29udGVudEJveExvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlv dXRVbml0IGxvZ2ljYWxIZWlnaHQsIE9wdGlvbmFsPExheW91dFVuaXQ+IGludHJpbnNpY0NvbnRl bnRIZWlnaHQpIGNvbnN0OwogCkBAIC02NTEsNiArNjUxLDEwIEBAIG92ZXJyaWRlOwogCiAgICAg TGF5b3V0UmVjdCBhYnNvbHV0ZUFuY2hvclJlY3RXaXRoU2Nyb2xsTWFyZ2luKGJvb2wqIGluc2lk ZUZpeGVkID0gbnVsbHB0cikgY29uc3Qgb3ZlcnJpZGU7CiAKKyAgICBib29sIHNob3VsZENvbXB1 dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CisgICAgYm9vbCBzaG91bGRD b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CisgICAgTGF5b3V0VW5p dCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFp bmVyKiA9IG51bGxwdHIpIGNvbnN0OworCiBwcm90ZWN0ZWQ6CiAgICAgUmVuZGVyQm94KEVsZW1l bnQmLCBSZW5kZXJTdHlsZSYmLCBCYXNlVHlwZUZsYWdzKTsKICAgICBSZW5kZXJCb3goRG9jdW1l bnQmLCBSZW5kZXJTdHlsZSYmLCBCYXNlVHlwZUZsYWdzKTsKQEAgLTcwMCwxMCArNzA0LDcgQEAg cHJvdGVjdGVkOgogCiAgICAgdm9pZCBpbmNyZW1lbnRWaXN1YWxseU5vbkVtcHR5UGl4ZWxDb3Vu dElmTmVlZGVkKGNvbnN0IEludFNpemUmKTsKIAotICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2lj YWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKLSAgICBib29sIHNob3VsZENvbXB1dGVM b2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKICAgICBib29sIHNob3VsZENvbXB1 dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSBjb25zdDsKLSAgICBMYXlv dXRVbml0IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRD b250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CiAgICAgc3RkOjpwYWlyPExheW91dFVuaXQsIExh eW91dFVuaXQ+IGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25z dDsKIAogICAgIHN0YXRpYyBMYXlvdXRVbml0IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyhMYXlv dXRVbml0IGJvcmRlclBhZGRpbmdJbmxpbmVTdW0sIExheW91dFVuaXQgYm9yZGVyUGFkZGluZ0Js b2NrU3VtLCBMYXlvdXRVbml0IGFzcGVjdFJhdGlvLCBCb3hTaXppbmcgYm94U2l6aW5nLCBMYXlv dXRVbml0IGlubGluZVNpemUpCkBAIC03NTEsNiArNzUyLDcgQEAgcHJpdmF0ZToKICAgICBMYXlv dXRVbml0IGZpbGxBdmFpbGFibGVNZWFzdXJlKExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdp ZHRoLCBMYXlvdXRVbml0JiBtYXJnaW5TdGFydCwgTGF5b3V0VW5pdCYgbWFyZ2luRW5kKSBjb25z dDsKIAogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlv dXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkgY29u c3Q7CisgICAgdm9pZCBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBt aW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCwgYm9vbCBhbGxvd0lu dHJpbnNpYykgY29uc3Q7CiAKICAgICAvLyBUaGlzIGZ1bmN0aW9uIGNhbGN1bGF0ZXMgdGhlIG1p bmltdW0gYW5kIG1heGltdW0gcHJlZmVycmVkIHdpZHRocyBmb3IgYW4gb2JqZWN0LgogICAgIC8v IFRoZXNlIHZhbHVlcyBhcmUgdXNlZCBpbiBzaHJpbmstdG8tZml0IGxheW91dCBzeXN0ZW1zLgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IDE0YWQ1MTA5YjhiOWIyZWQyMTdiMTI0MTBhYzIwMDdlMDkwNThmY2QuLmYyNWZhMTJj ODQwNWY4ZGY2YTkxNjgzYTg2N2RhNWJhMjVjYTk0NjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAyMS0wMi0wNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFN1cHBv cnQgYXNwZWN0LXJhdGlvIGluIGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg2MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBu b3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAyLTA0ICBOaWtpdGEg VmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IENvbGxhcHNlIGJsYWNrYm94ZWQgY2FsbCBmcmFtZXMgaW4gU291cmNlcwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv bnMKaW5kZXggM2Y3YTUyYjI1MWI0MGM0ZWY2N2Y5ZjhjMWNmN2ZiMDU5OGM5OGZmMi4uMTAzYmRh ZTUyNTRiZWI4MDEzNmZkZWY2YmE1NDk5NTRmNjc4ODA1NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBA IC00NDM3LDE1ICs0NDM3LDEwIEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh dGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2ludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNp Yy1zaXplLTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2ludHJpbnNpYy1zaXplLTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMC5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAx MS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxh Y2VkLWVsZW1lbnQtMDMxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby90YWJsZS1lbGVtZW50LTAwMS5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCg== 420826 2021-02-18 06:22:53 -0800 2021-02-18 08:34:15 -0800 Patch bug-220861-20210218152251.patch text/plain 11629 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzI3MzM2ZDZkZDM2Mjg1 MTM5MzAyY2RiNzg1YWFkMDE1ZGJhYTFlZS4uZTEyZmE0YTg2ZDVmOThlYjFkZWMyMDMzMmQ3YzIy YzE5NGRkNjliZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTE4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMS0wMi0xOCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+ CiAKICAgICAgICAgUm9vdCBzY3JvbGwgc25hcHBpbmcgYnJva2VuIG92ZXJmbG93OnNjcm9sbCBp cyBzZXQgb24gdGhlIDxib2R5PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAKaW5kZXggMWJmOTY5NGNjYjA2YmE2ZmQ1NzA2MjA2YmU5ZDkyNjIxZWVlYzczMi4uMWExOTA0 ODlmZWY1ZDg2YTM0NWE5NmY2NzJmYmM4OGM5ZTRhYTMxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0yNDI2LDYgKzI0MjYsOCBAQCB2b2lkIFJlbmRlckJs b2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKFJlbmRlck9iamVjdCYgY2hp bGQsIExheW91dAogICAgIAogICAgIGlmIChjaGlsZC5pc0JveCgpKSB7CiAgICAgICAgIGF1dG8m IGJveCA9IGRvd25jYXN0PFJlbmRlckJveD4oY2hpbGQpOworICAgICAgICBpZiAoYm94LnNob3Vs ZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIG1pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGJveC5jb21w dXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CiAgICAgICAgIGlmIChvdmVycmlkaW5n SGVpZ2h0KQogICAgICAgICAgICAgYm94LnNldE92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KG92ZXJy aWRpbmdIZWlnaHQudmFsdWUoKSk7CiAgICAgICAgIGlmIChvdmVycmlkaW5nV2lkdGgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGQyZDM3YTA5OWM5NGQ3YmU3M2E5 YTMwY2M3MDUzNzdlM2RhZTJjY2YuLjc2NDZmNThlNDA1YTAzNWNiOGMyOTVjNDZjMDE0YjQ5NTE1 NDc0MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC02NTEsNyAr NjUxLDcgQEAgdm9pZCBSZW5kZXJCb3g6OnVwZGF0ZUxheWVyVHJhbnNmb3JtKCkKICAgICAgICAg bGF5ZXIoKS0+dXBkYXRlVHJhbnNmb3JtKCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyQm94Ojpj b25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2Fs V2lkdGgsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIFJlbmRlckJsb2NrJiBjYiwgUmVuZGVy RnJhZ21lbnRDb250YWluZXIqIGZyYWdtZW50KSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJCb3g6 OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2lj YWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5k ZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0 CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlVG9Vc2UgPSBzdHlsZSgpOwogCkBAIC02 NjAsOCArNjYwLDEwIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lk dGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsCiAgICAgICAgIGxvZ2ljYWxX aWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxN YXhXaWR0aCk7CiAgICAgfQogCi0gICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgp LmlzVW5kZWZpbmVkKCkpCisgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlz VW5kZWZpbmVkKCkgJiYgKGFsbG93SW50cmluc2ljIHx8ICFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhX aWR0aCgpLmlzSW50cmluc2ljKCkpKQogICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihs b2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWF4U2l6ZSwg c3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVu dCkpOworICAgIGlmICghYWxsb3dJbnRyaW5zaWMgJiYgc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lk dGgoKS5pc0ludHJpbnNpYygpKQorICAgICAgICByZXR1cm4gbG9naWNhbFdpZHRoOwogICAgIGF1 dG8gbWluTGVuZ3RoID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKTsKICAgICBpZiAoc3R5 bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNB dXRvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVE aXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgewogICAgICAgICAvLyBNYWtlIHN1cmUg d2UgYWN0dWFsbHkgdXNlZCB0aGUgYXNwZWN0IHJhdGlvLgpAQCAtMjYwMyw2ICsyNjA1LDE1IEBA IExheW91dFVuaXQgUmVuZGVyQm94OjpmaWxsQXZhaWxhYmxlTWVhc3VyZShMYXlvdXRVbml0IGF2 YWlsYWJsZUxvZ2ljYWxXaWR0aCwgTGF5CiAgICAgcmV0dXJuIGF2YWlsYWJsZUxvZ2ljYWxXaWR0 aCAtIG1hcmdpblN0YXJ0IC0gbWFyZ2luRW5kOwogfQogCit2b2lkIFJlbmRlckJveDo6Y29tcHV0 ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlv dXRVbml0JiBtYXhMb2dpY2FsV2lkdGgsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0Cit7Cisg ICAgaWYgKGFsbG93SW50cmluc2ljICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW8oKSkgeworICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGgg PSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisgICAgICAgIHJldHVybjsK KyAgICB9CisgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRo LCBtYXhMb2dpY2FsV2lkdGgpOworfQorCiBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhMZW5ndGgsIExheW91 dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcp IGNvbnN0CiB7CiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc0ZpbGxBdmFpbGFibGUoKSkK QEAgLTI2MTAsNyArMjYyMSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmlu c2ljTG9naWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0CiAKICAgICBMYXlv dXRVbml0IG1pbkxvZ2ljYWxXaWR0aDsKICAgICBMYXlvdXRVbml0IG1heExvZ2ljYWxXaWR0aDsK LSAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExv Z2ljYWxXaWR0aCk7CisgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNh bFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgsIHRydWUpOwogCiAgICAgaWYgKGxvZ2ljYWxXaWR0aExl bmd0aC5pc01pbkNvbnRlbnQoKSkKICAgICAgICAgcmV0dXJuIG1pbkxvZ2ljYWxXaWR0aCArIGJv cmRlckFuZFBhZGRpbmc7CkBAIC01MDkyLDcgKzUxMDMsNyBAQCBib29sIFJlbmRlckJveDo6c2hv dWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBjb25zdAogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICBhdXRvIGggPSBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKLSAg ICByZXR1cm4gaC5pc0F1dG8oKSB8fCAoIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIGguaXNQ ZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgIXBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZh YmxlKCkpOworICAgIHJldHVybiBoLmlzQXV0bygpIHx8IGguaXNJbnRyaW5zaWMoKSB8fCAoIWlz T3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgIXBl cmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpOwogfQogCiBib29sIFJlbmRlckJv eDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CkBAIC01 MTI4LDcgKzUxMzksNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0 aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRhaW5lcgogICAgIGF1dG8gbG9naWNh bFdpZHRoID0gaW5saW5lU2l6ZUZyb21Bc3BlY3RSYXRpbyhob3Jpem9udGFsQm9yZGVyQW5kUGFk ZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgTGF5b3V0VW5p dChzdHlsZSgpLmxvZ2ljYWxBc3BlY3RSYXRpbygpKSwgc3R5bGUoKS5ib3hTaXppbmdGb3JBc3Bl Y3RSYXRpbygpLCBsb2dpY2FsSGVpZ2h0Zm9yQXNwZWN0UmF0aW8pOwogCiAgICAgTGF5b3V0VW5p dCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uID0gc3RkOjptYXg8TGF5b3V0VW5pdD4o MCwgY29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudEluRnJhZ21lbnQoZnJhZ21l bnQpKTsKLSAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4 KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5p bmdCbG9jaygpLCBmcmFnbWVudCk7CisgICAgcmV0dXJuIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aElu RnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lkdGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJl Y3Rpb24sICpjb250YWluaW5nQmxvY2soKSwgZnJhZ21lbnQsIGZhbHNlKTsKIH0KIAogc3RkOjpw YWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+IFJlbmRlckJveDo6Y29tcHV0ZU1pbk1heExvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmgKaW5kZXggNmRlNmVkNmFjNmI5Njg4ZmNiMzY0OGRiYjRiMmVjOWEwOWJiMTQyNC4uY2Vi ZGQ5MWUzNWE2ZmUzNzQwOWQ2ZGQ5MGNhMDczYTk5ZmExZGM0NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guaApAQCAtODUsNyArODUsNyBAQCBwdWJsaWM6CiAgICAgTGF5b3V0VW5p dCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKCkgPyB3aWR0aCgpIDogaGVpZ2h0KCk7IH0KICAgICBMYXlvdXRVbml0IGxvZ2ljYWxI ZWlnaHQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg PyBoZWlnaHQoKSA6IHdpZHRoKCk7IH0KIAotICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNh bFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQsIExheW91dFVuaXQsIFJlbmRlckJs b2NrJiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CisgICAgTGF5 b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5p dCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciosIGJv b2wgYWxsb3dJbnRyaW5zaWMgPSB0cnVlKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbnN0cmFp bkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIE9wdGlvbmFs PExheW91dFVuaXQ+IGludHJpbnNpY0NvbnRlbnRIZWlnaHQpIGNvbnN0OwogICAgIExheW91dFVu aXQgY29uc3RyYWluQ29udGVudEJveExvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxv Z2ljYWxIZWlnaHQsIE9wdGlvbmFsPExheW91dFVuaXQ+IGludHJpbnNpY0NvbnRlbnRIZWlnaHQp IGNvbnN0OwogCkBAIC02NDksNiArNjQ5LDEwIEBAIG92ZXJyaWRlOwogCiAgICAgTGF5b3V0UmVj dCBhYnNvbHV0ZUFuY2hvclJlY3RXaXRoU2Nyb2xsTWFyZ2luKGJvb2wqIGluc2lkZUZpeGVkID0g bnVsbHB0cikgY29uc3Qgb3ZlcnJpZGU7CiAKKyAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2Fs SGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CisgICAgYm9vbCBzaG91bGRDb21wdXRlTG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBjb21wdXRl TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiA9IG51 bGxwdHIpIGNvbnN0OworCiBwcm90ZWN0ZWQ6CiAgICAgUmVuZGVyQm94KEVsZW1lbnQmLCBSZW5k ZXJTdHlsZSYmLCBCYXNlVHlwZUZsYWdzKTsKICAgICBSZW5kZXJCb3goRG9jdW1lbnQmLCBSZW5k ZXJTdHlsZSYmLCBCYXNlVHlwZUZsYWdzKTsKQEAgLTY5OCwxMCArNzAyLDcgQEAgcHJvdGVjdGVk OgogCiAgICAgdm9pZCBpbmNyZW1lbnRWaXN1YWxseU5vbkVtcHR5UGl4ZWxDb3VudElmTmVlZGVk KGNvbnN0IEludFNpemUmKTsKIAotICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRG cm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKLSAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKICAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2Fs V2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSBjb25zdDsKLSAgICBMYXlvdXRVbml0IGNv bXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIq ID0gbnVsbHB0cikgY29uc3Q7CiAgICAgc3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+ IGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKIAogICAg IHN0YXRpYyBMYXlvdXRVbml0IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0IGJv cmRlclBhZGRpbmdJbmxpbmVTdW0sIExheW91dFVuaXQgYm9yZGVyUGFkZGluZ0Jsb2NrU3VtLCBM YXlvdXRVbml0IGFzcGVjdFJhdGlvLCBCb3hTaXppbmcgYm94U2l6aW5nLCBMYXlvdXRVbml0IGlu bGluZVNpemUpCkBAIC03NDksNiArNzUwLDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IGZp bGxBdmFpbGFibGVNZWFzdXJlKExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMYXlv dXRVbml0JiBtYXJnaW5TdGFydCwgTGF5b3V0VW5pdCYgbWFyZ2luRW5kKSBjb25zdDsKIAogICAg IHZpcnR1YWwgdm9pZCBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBt aW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkgY29uc3Q7CisgICAg dm9pZCBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2Fs V2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCwgYm9vbCBhbGxvd0ludHJpbnNpYykg Y29uc3Q7CiAKICAgICAvLyBUaGlzIGZ1bmN0aW9uIGNhbGN1bGF0ZXMgdGhlIG1pbmltdW0gYW5k IG1heGltdW0gcHJlZmVycmVkIHdpZHRocyBmb3IgYW4gb2JqZWN0LgogICAgIC8vIFRoZXNlIHZh bHVlcyBhcmUgdXNlZCBpbiBzaHJpbmstdG8tZml0IGxheW91dCBzeXN0ZW1zLgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDFi YmY3YWU5MzhiOTUyM2YyMjNhZmJiODc2Zjg1ZTljZWU4ZDQwNjYuLmYwZjc0NjBiYzYxZTliNzgy ZDJjZGFlNDkwYjk5ZWI4ZjFmNmFlZGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMi0x OCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFN1cHBvcnQgYXNwZWN0 LXJhdGlvIGluIGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDg2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEVuYWJsZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAg ICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAyLTE4ICBNYXJ0aW4gUm9iaW5zb24g IDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSb290IHNjcm9sbCBzbmFwcGluZyBi cm9rZW4gd2hlbiBvdmVyZmxvdzpzY3JvbGwgaXMgc2V0IG9uIHRoZSA8Ym9keT4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0 YXRpb25zCmluZGV4IDQ2NzBiM2JlMjUxNThhMjA3MWI4NzE4M2UyOTQ5NjZkOWU3N2QwNmMuLjRl ZmViNzhmNjRmNjY3ZWNkMGVjODUyNjZjYzhiNWFiZjBlNGFjZmYgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u cwpAQCAtNDU2OSwxNCArNDU2OSw5IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0 LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2ludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAw NS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJp bnNpYy1zaXplLTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMS5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1l bnQtMDMxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v cmVwbGFjZWQtZWxlbWVudC0wMzIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby90YWJsZS1lbGVtZW50LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd Cg== 420831 2021-02-18 08:34:20 -0800 2021-02-19 02:10:11 -0800 Patch bug-220861-20210218173418.patch text/plain 12999 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzI3MzM2ZDZkZDM2Mjg1 MTM5MzAyY2RiNzg1YWFkMDE1ZGJhYTFlZS4uZTEyZmE0YTg2ZDVmOThlYjFkZWMyMDMzMmQ3YzIy YzE5NGRkNjliZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTE4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMS0wMi0xOCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+ CiAKICAgICAgICAgUm9vdCBzY3JvbGwgc25hcHBpbmcgYnJva2VuIG92ZXJmbG93OnNjcm9sbCBp cyBzZXQgb24gdGhlIDxib2R5PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAKaW5kZXggMWJmOTY5NGNjYjA2YmE2ZmQ1NzA2MjA2YmU5ZDkyNjIxZWVlYzczMi4uMWExOTA0 ODlmZWY1ZDg2YTM0NWE5NmY2NzJmYmM4OGM5ZTRhYTMxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0yNDI2LDYgKzI0MjYsOCBAQCB2b2lkIFJlbmRlckJs b2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKFJlbmRlck9iamVjdCYgY2hp bGQsIExheW91dAogICAgIAogICAgIGlmIChjaGlsZC5pc0JveCgpKSB7CiAgICAgICAgIGF1dG8m IGJveCA9IGRvd25jYXN0PFJlbmRlckJveD4oY2hpbGQpOworICAgICAgICBpZiAoYm94LnNob3Vs ZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIG1pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGJveC5jb21w dXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CiAgICAgICAgIGlmIChvdmVycmlkaW5n SGVpZ2h0KQogICAgICAgICAgICAgYm94LnNldE92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KG92ZXJy aWRpbmdIZWlnaHQudmFsdWUoKSk7CiAgICAgICAgIGlmIChvdmVycmlkaW5nV2lkdGgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGQyZDM3YTA5OWM5NGQ3YmU3M2E5 YTMwY2M3MDUzNzdlM2RhZTJjY2YuLmY5MTQ2NjcwMTE1NGNjNjQ4ZmY0NDIxMmI0ZTBiODY3OTgy OGQyOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC02NTEsNyAr NjUxLDcgQEAgdm9pZCBSZW5kZXJCb3g6OnVwZGF0ZUxheWVyVHJhbnNmb3JtKCkKICAgICAgICAg bGF5ZXIoKS0+dXBkYXRlVHJhbnNmb3JtKCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyQm94Ojpj b25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2Fs V2lkdGgsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIFJlbmRlckJsb2NrJiBjYiwgUmVuZGVy RnJhZ21lbnRDb250YWluZXIqIGZyYWdtZW50KSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJCb3g6 OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2lj YWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5k ZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0 CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlVG9Vc2UgPSBzdHlsZSgpOwogCkBAIC02 NjAsMTMgKzY2MCwxNSBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdp ZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbAogICAgICAgICBsb2dpY2Fs V2lkdGggPSBzdGQ6OmNsYW1wKGxvZ2ljYWxXaWR0aCwgbG9naWNhbE1pbldpZHRoLCBsb2dpY2Fs TWF4V2lkdGgpOwogICAgIH0KIAotICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgo KS5pc1VuZGVmaW5lZCgpKQorICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5p c1VuZGVmaW5lZCgpICYmIChhbGxvd0ludHJpbnNpYyB8fCAhc3R5bGVUb1VzZS5sb2dpY2FsTWF4 V2lkdGgoKS5pc0ludHJpbnNpYygpKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4o bG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUs IHN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21l bnQpKTsKKyAgICBpZiAoIWFsbG93SW50cmluc2ljICYmIHN0eWxlVG9Vc2UubG9naWNhbE1pbldp ZHRoKCkuaXNJbnRyaW5zaWMoKSkKKyAgICAgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aDsKICAgICBh dXRvIG1pbkxlbmd0aCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCk7CiAgICAgaWYgKHN0 eWxlVG9Vc2UuaGFzQXNwZWN0UmF0aW8oKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlz QXV0bygpICYmIG1pbkxlbmd0aC5pc0F1dG8oKSAmJiBzdHlsZVRvVXNlLm92ZXJmbG93SW5saW5l RGlyZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKICAgICAgICAgLy8gTWFrZSBzdXJl IHdlIGFjdHVhbGx5IHVzZWQgdGhlIGFzcGVjdCByYXRpby4KICAgICAgICAgaWYgKHNob3VsZENv bXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKLSAgICAgICAgICAgIG1pbkxlbmd0 aCA9IExlbmd0aChMZW5ndGhUeXBlOjpNaW5Db250ZW50KTsKKyAgICAgICAgICAgIG1pbkxlbmd0 aCA9IExlbmd0aChMZW5ndGhUeXBlOjpNaW5JbnRyaW5zaWMpOwogICAgIH0KICAgICByZXR1cm4g c3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5n KE1pblNpemUsIG1pbkxlbmd0aCwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOwogfQpA QCAtMjYwMyw2ICsyNjA1LDE1IEBAIExheW91dFVuaXQgUmVuZGVyQm94OjpmaWxsQXZhaWxhYmxl TWVhc3VyZShMYXlvdXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgTGF5CiAgICAgcmV0dXJu IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCAtIG1hcmdpblN0YXJ0IC0gbWFyZ2luRW5kOwogfQogCit2 b2lkIFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYg bWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgsIGJvb2wgYWxsb3dJ bnRyaW5zaWMpIGNvbnN0Cit7CisgICAgaWYgKGFsbG93SW50cmluc2ljICYmIHNob3VsZENvbXB1 dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkgeworICAgICAgICBtaW5Mb2dpY2FsV2lk dGggPSBtYXhMb2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlv KCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxX aWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOworfQorCiBMYXlvdXRVbml0 IFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dp Y2FsV2lkdGhMZW5ndGgsIExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMYXlvdXRV bml0IGJvcmRlckFuZFBhZGRpbmcpIGNvbnN0CiB7CiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0 aC5pc0ZpbGxBdmFpbGFibGUoKSkKQEAgLTI2MTAsOSArMjYyMSw5IEBAIExheW91dFVuaXQgUmVu ZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxX aWR0aExlbmd0CiAKICAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aDsKICAgICBMYXlvdXRV bml0IG1heExvZ2ljYWxXaWR0aDsKLSAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyht aW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CisgICAgY29tcHV0ZUludHJpbnNpY0xv Z2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgsICFsb2dpY2FsV2lk dGhMZW5ndGguaXNNaW5JbnRyaW5zaWMoKSk7CiAKLSAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3Ro LmlzTWluQ29udGVudCgpKQorICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250ZW50 KCkgfHwgbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVy biBtaW5Mb2dpY2FsV2lkdGggKyBib3JkZXJBbmRQYWRkaW5nOwogCiAgICAgaWYgKGxvZ2ljYWxX aWR0aExlbmd0aC5pc01heENvbnRlbnQoKSkKQEAgLTI2MzUsMTIgKzI2NDYsMTIgQEAgTGF5b3V0 VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoU2l6ZVR5 cGUgd2lkdGhUeXBlLCBMZW4KICAgICBpZiAod2lkdGhUeXBlID09IE1pblNpemUgJiYgbG9naWNh bFdpZHRoLmlzQXV0bygpKQogICAgICAgICByZXR1cm4gYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdp ZHRoRm9yQm94U2l6aW5nKDAsIGxvZ2ljYWxXaWR0aC50eXBlKCkpOwogCi0gICAgaWYgKCFsb2dp Y2FsV2lkdGguaXNJbnRyaW5zaWNPckF1dG8oKSkgeworICAgIGlmICghbG9naWNhbFdpZHRoLmlz SW50cmluc2ljT3JBdXRvKCkgJiYgIWxvZ2ljYWxXaWR0aC5pc01pbkludHJpbnNpYygpKSB7CiAg ICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgY29udGFpbmluZyBibG9jayBmbG93IGlzIHBlcnBlbmRp Y3VsYXIgdG8gb3VyIGRpcmVjdGlvbiB3ZSBuZWVkIHRvIHVzZSB0aGUgYXZhaWxhYmxlIGxvZ2lj YWwgaGVpZ2h0IGluc3RlYWQuCiAgICAgICAgIHJldHVybiBhZGp1c3RCb3JkZXJCb3hMb2dpY2Fs V2lkdGhGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgobG9naWNhbFdpZHRoLCBhdmFpbGFibGVM b2dpY2FsV2lkdGgpLCBsb2dpY2FsV2lkdGgudHlwZSgpKTsKICAgICB9CiAKLSAgICBpZiAobG9n aWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCisgICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNp YygpIHx8IGxvZ2ljYWxXaWR0aC5pc01pbkludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29t cHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9n aWNhbFdpZHRoLCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkpOwogCiAgICAgTGF5b3V0 VW5pdCBtYXJnaW5TdGFydDsKQEAgLTUwOTIsNyArNTEwMyw3IEBAIGJvb2wgUmVuZGVyQm94Ojpz aG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwot ICAgIHJldHVybiBoLmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5p c1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29s dmFibGUoKSk7CisgICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgaC5pc0ludHJpbnNpYygpIHx8ICgh aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAh cGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CiB9CiAKIGJvb2wgUmVuZGVy Qm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKQEAg LTUxMjgsNyArNTEzOSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdp ZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyCiAgICAgYXV0byBsb2dp Y2FsV2lkdGggPSBpbmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQ YWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRV bml0KHN0eWxlKCkubG9naWNhbEFzcGVjdFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFz cGVjdFJhdGlvKCksIGxvZ2ljYWxIZWlnaHRmb3JBc3BlY3RSYXRpbyk7CiAKICAgICBMYXlvdXRV bml0IGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24gPSBzdGQ6Om1heDxMYXlvdXRVbml0 PigwLCBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50SW5GcmFnbWVudChmcmFn bWVudCkpOwotICAgIHJldHVybiBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5N YXgobG9naWNhbFdpZHRoLCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFp bmluZ0Jsb2NrKCksIGZyYWdtZW50KTsKKyAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRo SW5GcmFnbWVudEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURp cmVjdGlvbiwgKmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCwgZmFsc2UpOwogfQogCiBzdGQ6 OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyQm94Ojpjb21wdXRlTWluTWF4TG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guaAppbmRleCA2ZGU2ZWQ2YWM2Yjk2ODhmY2IzNjQ4ZGJiNGIyZWM5YTA5YmIxNDI0Li5j ZWJkZDkxZTM1YTZmZTM3NDA5ZDZkZDkwY2EwNzNhOTlmYTFkYzQ2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5oCkBAIC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICBMYXlvdXRV bml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3Jp dGluZ01vZGUoKSA/IHdpZHRoKCkgOiBoZWlnaHQoKTsgfQogICAgIExheW91dFVuaXQgbG9naWNh bEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSA/IGhlaWdodCgpIDogd2lkdGgoKTsgfQogCi0gICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dp Y2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVy QmxvY2smLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICBM YXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRV bml0LCBMYXlvdXRVbml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiwg Ym9vbCBhbGxvd0ludHJpbnNpYyA9IHRydWUpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29uc3Ry YWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9u YWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAgICAgTGF5b3V0 VW5pdCBjb25zdHJhaW5Db250ZW50Qm94TG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQg bG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdo dCkgY29uc3Q7CiAKQEAgLTY0OSw2ICs2NDksMTAgQEAgb3ZlcnJpZGU7CiAKICAgICBMYXlvdXRS ZWN0IGFic29sdXRlQW5jaG9yUmVjdFdpdGhTY3JvbGxNYXJnaW4oYm9vbCogaW5zaWRlRml4ZWQg PSBudWxscHRyKSBjb25zdCBvdmVycmlkZTsKIAorICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2lj YWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKKyAgICBib29sIHNob3VsZENvbXB1dGVM b2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbXB1 dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0g bnVsbHB0cikgY29uc3Q7CisKIHByb3RlY3RlZDoKICAgICBSZW5kZXJCb3goRWxlbWVudCYsIFJl bmRlclN0eWxlJiYsIEJhc2VUeXBlRmxhZ3MpOwogICAgIFJlbmRlckJveChEb2N1bWVudCYsIFJl bmRlclN0eWxlJiYsIEJhc2VUeXBlRmxhZ3MpOwpAQCAtNjk4LDEwICs3MDIsNyBAQCBwcm90ZWN0 ZWQ6CiAKICAgICB2b2lkIGluY3JlbWVudFZpc3VhbGx5Tm9uRW1wdHlQaXhlbENvdW50SWZOZWVk ZWQoY29uc3QgSW50U2l6ZSYpOwogCi0gICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdo dEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwotICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0OwotICAgIExheW91dFVuaXQg Y29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRhaW5l ciogPSBudWxscHRyKSBjb25zdDsKICAgICBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5p dD4gY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwogCiAg ICAgc3RhdGljIExheW91dFVuaXQgYmxvY2tTaXplRnJvbUFzcGVjdFJhdGlvKExheW91dFVuaXQg Ym9yZGVyUGFkZGluZ0lubGluZVN1bSwgTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nQmxvY2tTdW0s IExheW91dFVuaXQgYXNwZWN0UmF0aW8sIEJveFNpemluZyBib3hTaXppbmcsIExheW91dFVuaXQg aW5saW5lU2l6ZSkKQEAgLTc0OSw2ICs3NTAsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQg ZmlsbEF2YWlsYWJsZU1lYXN1cmUoTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIExh eW91dFVuaXQmIG1hcmdpblN0YXJ0LCBMYXlvdXRVbml0JiBtYXJnaW5FbmQpIGNvbnN0OwogCiAg ICAgdmlydHVhbCB2b2lkIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQm IG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdDsKKyAg ICB2b2lkIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2lj YWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoLCBib29sIGFsbG93SW50cmluc2lj KSBjb25zdDsKIAogICAgIC8vIFRoaXMgZnVuY3Rpb24gY2FsY3VsYXRlcyB0aGUgbWluaW11bSBh bmQgbWF4aW11bSBwcmVmZXJyZWQgd2lkdGhzIGZvciBhbiBvYmplY3QuCiAgICAgLy8gVGhlc2Ug dmFsdWVzIGFyZSB1c2VkIGluIHNocmluay10by1maXQgbGF5b3V0IHN5c3RlbXMuCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg MWJiZjdhZTkzOGI5NTIzZjIyM2FmYmI4NzZmODVlOWNlZThkNDA2Ni4uZjBmNzQ2MGJjNjFlOWI3 ODJkMmNkYWU0OTBiOTllYjhmMWY2YWVkYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAy LTE4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3Bl Y3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRW5hYmxlIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKwor ICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDItMTggIE1hcnRpbiBSb2JpbnNv biAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJvb3Qgc2Nyb2xsIHNuYXBwaW5n IGJyb2tlbiB3aGVuIG92ZXJmbG93OnNjcm9sbCBpcyBzZXQgb24gdGhlIDxib2R5PgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBl Y3RhdGlvbnMKaW5kZXggNDY3MGIzYmUyNTE1OGEyMDcxYjg3MTgzZTI5NDk2NmQ5ZTc3ZDA2Yy4u NGVmZWI3OGY2NGY2NjdlY2QwZWM4NTI2NmNjOGI1YWJmMGU0YWNmZiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp b25zCkBAIC00NTY5LDE0ICs0NTY5LDkgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl Y3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vaW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUt MDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50 cmluc2ljLXNpemUtMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEwLmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDExLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxl bWVudC0wMzEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvL3RhYmxlLWVsZW1lbnQtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0K 420944 2021-02-19 02:10:16 -0800 2021-02-21 03:22:30 -0800 Patch bug-220861-20210219111014.patch text/plain 13880 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzY5ODBjNDRjOWZiMDYw M2UwMmVmNzRmNDQ5NTk1NTQ2MmNmZTFmMC4uNjE2MDJiOWI5MjNjYjE2ODAwZmQyZTgxNzRiOWIz Y2E1ODY1Y2YyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTE5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMS0wMi0xOSAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFBDTTogUmVxdWVzdCBzZXJ2ZXIgcHVibGljIGtleSB0byBnZW5lcmF0ZSBzZWNyZXQg dG9rZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IDFiZjk2 OTRjY2IwNmJhNmZkNTcwNjIwNmJlOWQ5MjYyMWVlZWM3MzIuLjFhMTkwNDg5ZmVmNWQ4NmEzNDVh OTZmNjcyZmJjODhjOWU0YWEzMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcApAQCAtMjQyNiw2ICsyNDI2LDggQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZUNo aWxkUHJlZmVycmVkTG9naWNhbFdpZHRocyhSZW5kZXJPYmplY3QmIGNoaWxkLCBMYXlvdXQKICAg ICAKICAgICBpZiAoY2hpbGQuaXNCb3goKSkgewogICAgICAgICBhdXRvJiBib3ggPSBkb3duY2Fz dDxSZW5kZXJCb3g+KGNoaWxkKTsKKyAgICAgICAgaWYgKGJveC5zaG91bGRDb21wdXRlTG9naWNh bFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICBtaW5QcmVmZXJyZWRMb2dpY2Fs V2lkdGggPSBtYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBib3guY29tcHV0ZUxvZ2ljYWxXaWR0 aEZyb21Bc3BlY3RSYXRpbygpOwogICAgICAgICBpZiAob3ZlcnJpZGluZ0hlaWdodCkKICAgICAg ICAgICAgIGJveC5zZXRPdmVycmlkaW5nTG9naWNhbEhlaWdodChvdmVycmlkaW5nSGVpZ2h0LnZh bHVlKCkpOwogICAgICAgICBpZiAob3ZlcnJpZGluZ1dpZHRoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcAppbmRleCBkMmQzN2EwOTljOTRkN2JlNzNhOWEzMGNjNzA1Mzc3ZTNk YWUyY2NmLi4wM2MwNjJhY2E4OTlmMjc5NTI5NjRiM2VlMzUxZTljODcyNTY3NWY5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjUxLDcgKzY1MSw3IEBAIHZvaWQg UmVuZGVyQm94Ojp1cGRhdGVMYXllclRyYW5zZm9ybSgpCiAgICAgICAgIGxheWVyKCktPnVwZGF0 ZVRyYW5zZm9ybSgpOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNh bFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbFdpZHRoLCBMYXlvdXRV bml0IGF2YWlsYWJsZVdpZHRoLCBSZW5kZXJCbG9jayYgY2IsIFJlbmRlckZyYWdtZW50Q29udGFp bmVyKiBmcmFnbWVudCkgY29uc3QKK0xheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dp Y2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExheW91 dFVuaXQgYXZhaWxhYmxlV2lkdGgsIFJlbmRlckJsb2NrJiBjYiwgUmVuZGVyRnJhZ21lbnRDb250 YWluZXIqIGZyYWdtZW50LCBib29sIGFsbG93SW50cmluc2ljKSBjb25zdAogewogICAgIGNvbnN0 IFJlbmRlclN0eWxlJiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKIApAQCAtNjYwLDEzICs2NjAsMTUg QEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRC eU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWwKICAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjpj bGFtcChsb2dpY2FsV2lkdGgsIGxvZ2ljYWxNaW5XaWR0aCwgbG9naWNhbE1heFdpZHRoKTsKICAg ICB9CiAKLSAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCkuaXNVbmRlZmluZWQo KSkKKyAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCkuaXNVbmRlZmluZWQoKSAm JiAoYWxsb3dJbnRyaW5zaWMgfHwgIXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCkuaXNJbnRy aW5zaWMoKSkpCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6bWluKGxvZ2ljYWxXaWR0aCwg Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNYXhTaXplLCBzdHlsZVRvVXNlLmxv Z2ljYWxNYXhXaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CisgICAgaWYg KCFhbGxvd0ludHJpbnNpYyAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpLmlzSW50cmlu c2ljKCkpCisgICAgICAgIHJldHVybiBsb2dpY2FsV2lkdGg7CiAgICAgYXV0byBtaW5MZW5ndGgg PSBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpOwotICAgIGlmIChzdHlsZVRvVXNlLmhhc0Fz cGVjdFJhdGlvKCkgJiYgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAmJiBtaW5M ZW5ndGguaXNBdXRvKCkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0lubGluZURpcmVjdGlvbigpID09 IE92ZXJmbG93OjpWaXNpYmxlKSB7CisgICAgaWYgKHN0eWxlVG9Vc2UuaGFzQXNwZWN0UmF0aW8o KSAmJiBtaW5MZW5ndGguaXNBdXRvKCkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0lubGluZURpcmVj dGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CiAgICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSBh Y3R1YWxseSB1c2VkIHRoZSBhc3BlY3QgcmF0aW8uCiAgICAgICAgIGlmIChzaG91bGRDb21wdXRl TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCi0gICAgICAgICAgICBtaW5MZW5ndGggPSBM ZW5ndGgoTGVuZ3RoVHlwZTo6TWluQ29udGVudCk7CisgICAgICAgICAgICBtaW5MZW5ndGggPSBM ZW5ndGgoTGVuZ3RoVHlwZTo6TWluSW50cmluc2ljKTsKICAgICB9CiAgICAgcmV0dXJuIHN0ZDo6 bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5T aXplLCBtaW5MZW5ndGgsIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKIH0KQEAgLTY4 MSw2ICs2ODMsOCBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbEhlaWdo dEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTwogICAgIGF1dG8gbG9naWNhbE1p bkhlaWdodCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpOwogICAgIGlmIChsb2dpY2Fs TWluSGVpZ2h0LmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVj dFJhdGlvKCkgJiYgaW50cmluc2ljQ29udGVudEhlaWdodCAmJiBzdHlsZVRvVXNlLm92ZXJmbG93 QmxvY2tEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkKICAgICAgICAgbG9naWNhbE1p bkhlaWdodCA9IExlbmd0aCgqaW50cmluc2ljQ29udGVudEhlaWdodCwgTGVuZ3RoVHlwZTo6Rml4 ZWQpOworICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzTWluQ29udGVudCgpIHx8IGxvZ2ljYWxN aW5IZWlnaHQuaXNNYXhDb250ZW50KCkgfHwgbG9naWNhbE1pbkhlaWdodC5pc0ZpdENvbnRlbnQo KSkKKyAgICAgICAgbG9naWNhbE1pbkhlaWdodCA9IExlbmd0aCgpOwogICAgIGlmIChPcHRpb25h bDxMYXlvdXRVbml0PiBjb21wdXRlZExvZ2ljYWxIZWlnaHQgPSBjb21wdXRlTG9naWNhbEhlaWdo dFVzaW5nKE1pblNpemUsIGxvZ2ljYWxNaW5IZWlnaHQsIGludHJpbnNpY0NvbnRlbnRIZWlnaHQp KQogICAgICAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbEhlaWdodCwgY29tcHV0ZWRMb2dpY2Fs SGVpZ2h0LnZhbHVlKCkpOwogICAgIHJldHVybiBsb2dpY2FsSGVpZ2h0OwpAQCAtMjYwMyw2ICsy NjA3LDE1IEBAIExheW91dFVuaXQgUmVuZGVyQm94OjpmaWxsQXZhaWxhYmxlTWVhc3VyZShMYXlv dXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgTGF5CiAgICAgcmV0dXJuIGF2YWlsYWJsZUxv Z2ljYWxXaWR0aCAtIG1hcmdpblN0YXJ0IC0gbWFyZ2luRW5kOwogfQogCit2b2lkIFJlbmRlckJv eDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdp ZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNv bnN0Cit7CisgICAgaWYgKGFsbG93SW50cmluc2ljICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8oKSkgeworICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dp Y2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisgICAgICAg IHJldHVybjsKKyAgICB9CisgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9n aWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOworfQorCiBMYXlvdXRVbml0IFJlbmRlckJveDo6 Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhMZW5n dGgsIExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGJvcmRlckFu ZFBhZGRpbmcpIGNvbnN0CiB7CiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc0ZpbGxBdmFp bGFibGUoKSkKQEAgLTI2MTAsOSArMjYyMyw5IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21w dXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0CiAK ICAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aDsKICAgICBMYXlvdXRVbml0IG1heExvZ2lj YWxXaWR0aDsKLSAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lk dGgsIG1heExvZ2ljYWxXaWR0aCk7CisgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMo bWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgsICFsb2dpY2FsV2lkdGhMZW5ndGguaXNN aW5JbnRyaW5zaWMoKSk7CiAKLSAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29udGVu dCgpKQorICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250ZW50KCkgfHwgbG9naWNh bFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBtaW5Mb2dpY2Fs V2lkdGggKyBib3JkZXJBbmRQYWRkaW5nOwogCiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5p c01heENvbnRlbnQoKSkKQEAgLTI2MzUsMTIgKzI2NDgsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJC b3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBl LCBMZW4KICAgICBpZiAod2lkdGhUeXBlID09IE1pblNpemUgJiYgbG9naWNhbFdpZHRoLmlzQXV0 bygpKQogICAgICAgICByZXR1cm4gYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6 aW5nKDAsIGxvZ2ljYWxXaWR0aC50eXBlKCkpOwogCi0gICAgaWYgKCFsb2dpY2FsV2lkdGguaXNJ bnRyaW5zaWNPckF1dG8oKSkgeworICAgIGlmICghbG9naWNhbFdpZHRoLmlzSW50cmluc2ljT3JB dXRvKCkgJiYgIWxvZ2ljYWxXaWR0aC5pc01pbkludHJpbnNpYygpKSB7CiAgICAgICAgIC8vIEZJ WE1FOiBJZiB0aGUgY29udGFpbmluZyBibG9jayBmbG93IGlzIHBlcnBlbmRpY3VsYXIgdG8gb3Vy IGRpcmVjdGlvbiB3ZSBuZWVkIHRvIHVzZSB0aGUgYXZhaWxhYmxlIGxvZ2ljYWwgaGVpZ2h0IGlu c3RlYWQuCiAgICAgICAgIHJldHVybiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hT aXppbmcodmFsdWVGb3JMZW5ndGgobG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgp LCBsb2dpY2FsV2lkdGgudHlwZSgpKTsKICAgICB9CiAKLSAgICBpZiAobG9naWNhbFdpZHRoLmlz SW50cmluc2ljKCkpCisgICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpIHx8IGxvZ2lj YWxXaWR0aC5pc01pbkludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNp Y0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBi b3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkpOwogCiAgICAgTGF5b3V0VW5pdCBtYXJnaW5T dGFydDsKQEAgLTUwOTIsNyArNTEwNSw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRl TG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgIGF1dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwotICAgIHJldHVybiBo LmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNh bGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7Cisg ICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgaC5pc0ludHJpbnNpYygpIHx8ICghaXNPdXRPZkZsb3dQ b3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxv Z2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRD b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKQEAgLTUxMjgsNyArNTE0 MSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyCiAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBp bmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50 KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCku bG9naWNhbEFzcGVjdFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCks IGxvZ2ljYWxIZWlnaHRmb3JBc3BlY3RSYXRpbyk7CiAKICAgICBMYXlvdXRVbml0IGNvbnRhaW5l cldpZHRoSW5JbmxpbmVEaXJlY3Rpb24gPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBjb250YWlu aW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50SW5GcmFnbWVudChmcmFnbWVudCkpOwotICAg IHJldHVybiBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdp ZHRoLCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCks IGZyYWdtZW50KTsKKyAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5 TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNv bnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCwgZmFsc2UpOwogfQogCiBzdGQ6OnBhaXI8TGF5b3V0 VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyQm94Ojpjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJv bUFzcGVjdFJhdGlvKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRl eCA2ZGU2ZWQ2YWM2Yjk2ODhmY2IzNjQ4ZGJiNGIyZWM5YTA5YmIxNDI0Li5jZWJkZDkxZTM1YTZm ZTM3NDA5ZDZkZDkwY2EwNzNhOTlmYTFkYzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5oCkBAIC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/ IHdpZHRoKCkgOiBoZWlnaHQoKTsgfQogICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNv bnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGhlaWdodCgp IDogd2lkdGgoKTsgfQogCi0gICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZy YWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5k ZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNv bnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRV bml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiwgYm9vbCBhbGxvd0lu dHJpbnNpYyA9IHRydWUpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhl aWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5p dD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJh aW5Db250ZW50Qm94TG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdo dCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAK QEAgLTY0OSw2ICs2NDksMTAgQEAgb3ZlcnJpZGU7CiAKICAgICBMYXlvdXRSZWN0IGFic29sdXRl QW5jaG9yUmVjdFdpdGhTY3JvbGxNYXJnaW4oYm9vbCogaW5zaWRlRml4ZWQgPSBudWxscHRyKSBj b25zdCBvdmVycmlkZTsKIAorICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9t QXNwZWN0UmF0aW8oKSBjb25zdDsKKyAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29u c3Q7CisKIHByb3RlY3RlZDoKICAgICBSZW5kZXJCb3goRWxlbWVudCYsIFJlbmRlclN0eWxlJiYs IEJhc2VUeXBlRmxhZ3MpOwogICAgIFJlbmRlckJveChEb2N1bWVudCYsIFJlbmRlclN0eWxlJiYs IEJhc2VUeXBlRmxhZ3MpOwpAQCAtNjk4LDEwICs3MDIsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2 b2lkIGluY3JlbWVudFZpc3VhbGx5Tm9uRW1wdHlQaXhlbENvdW50SWZOZWVkZWQoY29uc3QgSW50 U2l6ZSYpOwogCi0gICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RS YXRpbygpIGNvbnN0OwotICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl Y3RSYXRpbygpIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21B c3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0OwotICAgIExheW91dFVuaXQgY29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRy KSBjb25zdDsKICAgICBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gY29tcHV0ZU1p bk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwogCiAgICAgc3RhdGljIExh eW91dFVuaXQgYmxvY2tTaXplRnJvbUFzcGVjdFJhdGlvKExheW91dFVuaXQgYm9yZGVyUGFkZGlu Z0lubGluZVN1bSwgTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nQmxvY2tTdW0sIExheW91dFVuaXQg YXNwZWN0UmF0aW8sIEJveFNpemluZyBib3hTaXppbmcsIExheW91dFVuaXQgaW5saW5lU2l6ZSkK QEAgLTc0OSw2ICs3NTAsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgZmlsbEF2YWlsYWJs ZU1lYXN1cmUoTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1h cmdpblN0YXJ0LCBMYXlvdXRVbml0JiBtYXJnaW5FbmQpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2 b2lkIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxX aWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1 dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5 b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoLCBib29sIGFsbG93SW50cmluc2ljKSBjb25zdDsKIAog ICAgIC8vIFRoaXMgZnVuY3Rpb24gY2FsY3VsYXRlcyB0aGUgbWluaW11bSBhbmQgbWF4aW11bSBw cmVmZXJyZWQgd2lkdGhzIGZvciBhbiBvYmplY3QuCiAgICAgLy8gVGhlc2UgdmFsdWVzIGFyZSB1 c2VkIGluIHNocmluay10by1maXQgbGF5b3V0IHN5c3RlbXMuCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZTA3MjQyYzQzZGY1 Zjc4MjYwODNhZWE5YTRiYWI1MWI1YjU3N2UxMS4uY2Y3MDdiZWUwNjg1ODNhMzc3MDg0OTllNjU0 ODA0YmQ0NTE3Nzc5YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTE5ICBSb2IgQnVp cyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4g aW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRW5hYmxlIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRl c3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDItMTkgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBQQ006IFJlcXVlc3Qgc2VydmVyIHB1YmxpYyBrZXkgdG8gZ2Vu ZXJhdGUgc2VjcmV0IHRva2VuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp b25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA0NjcwYjNiZTI1MTU4YTIw NzFiODcxODNlMjk0OTY2ZDllNzdkMDZjLi5kZGQwNWE1MTA2ZGFkZDJlMTM0NGI3NTY2YzI3YjM2 NWQyM2U0YWM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBi L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ1NjksMTQgKzQ1NjksOCBAQCB3ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y YXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6 ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9p bnRyaW5zaWMtc2l6ZS0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDYuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDguaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMt c2l6ZS0wMTAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9pbnRyaW5zaWMtc2l6ZS0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vdGFibGUtZWxlbWVudC0w MDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo= 421135 2021-02-21 03:22:35 -0800 2021-02-21 12:56:48 -0800 Patch bug-220861-20210221122233.patch text/plain 13891 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWU4MWM4MzA2ZjZlMDkz M2E4NWVhZTYzNWYzZDVhNTFiN2M5ZTM3ZC4uNjAyYWI3NjQ4MDNhNmIyNGIxOGY0NGUxZWFiMzEw N2MxNDIxMmViNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTIxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMS0wMi0yMCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgog CiAgICAgICAgIEFYOiBJbWFnZSBzaG91bGQgcmVwb3J0IHRoZSBlbWJlZGRlZCBhY2Nlc3NpYmls aXR5IGRlc2NyaXB0aW9uIGlmIGF2YWlsYWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKaW5kZXggMWJmOTY5NGNjYjA2YmE2ZmQ1NzA2MjA2YmU5ZDkyNjIxZWVlYzcz Mi4uMWExOTA0ODlmZWY1ZDg2YTM0NWE5NmY2NzJmYmM4OGM5ZTRhYTMxOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0yNDI2LDYgKzI0MjYsOCBAQCB2b2lk IFJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKFJlbmRlck9i amVjdCYgY2hpbGQsIExheW91dAogICAgIAogICAgIGlmIChjaGlsZC5pc0JveCgpKSB7CiAgICAg ICAgIGF1dG8mIGJveCA9IGRvd25jYXN0PFJlbmRlckJveD4oY2hpbGQpOworICAgICAgICBpZiAo Ym94LnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAg ICAgIG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9 IGJveC5jb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CiAgICAgICAgIGlmIChv dmVycmlkaW5nSGVpZ2h0KQogICAgICAgICAgICAgYm94LnNldE92ZXJyaWRpbmdMb2dpY2FsSGVp Z2h0KG92ZXJyaWRpbmdIZWlnaHQudmFsdWUoKSk7CiAgICAgICAgIGlmIChvdmVycmlkaW5nV2lk dGgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDUzZmQwZjBmMzhj YTVhZmQxMDc5ZmRjMzQwNzQ4YjE0YzljMjkwMDAuLmYwMjViMGJiNjRhODQ2ODY3ZDI0OTVkMzU0 MTE5Y2YzMWZmN2E1MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBA IC02NTEsNyArNjUxLDcgQEAgdm9pZCBSZW5kZXJCb3g6OnVwZGF0ZUxheWVyVHJhbnNmb3JtKCkK ICAgICAgICAgbGF5ZXIoKS0+dXBkYXRlVHJhbnNmb3JtKCk7CiB9CiAKLUxheW91dFVuaXQgUmVu ZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5p dCBsb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIFJlbmRlckJsb2NrJiBj YiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGZyYWdtZW50KSBjb25zdAorTGF5b3V0VW5pdCBS ZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRV bml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2sm IGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQsIGJvb2wgYWxsb3dJbnRyaW5z aWMpIGNvbnN0CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlVG9Vc2UgPSBzdHlsZSgp OwogCkBAIC02NjAsMTMgKzY2MCwxNSBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWlu TG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbAogICAgICAg ICBsb2dpY2FsV2lkdGggPSBzdGQ6OmNsYW1wKGxvZ2ljYWxXaWR0aCwgbG9naWNhbE1pbldpZHRo LCBsb2dpY2FsTWF4V2lkdGgpOwogICAgIH0KIAotICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2Fs TWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpKQorICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4 V2lkdGgoKS5pc1VuZGVmaW5lZCgpICYmIChhbGxvd0ludHJpbnNpYyB8fCAhc3R5bGVUb1VzZS5s b2dpY2FsTWF4V2lkdGgoKS5pc0ludHJpbnNpYygpKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0g c3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5n KE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBj YiwgZnJhZ21lbnQpKTsKKyAgICBpZiAoIWFsbG93SW50cmluc2ljICYmIHN0eWxlVG9Vc2UubG9n aWNhbE1pbldpZHRoKCkuaXNJbnRyaW5zaWMoKSkKKyAgICAgICAgcmV0dXJuIGxvZ2ljYWxXaWR0 aDsKICAgICBhdXRvIG1pbkxlbmd0aCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCk7Ci0g ICAgaWYgKHN0eWxlVG9Vc2UuaGFzQXNwZWN0UmF0aW8oKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxX aWR0aCgpLmlzQXV0bygpICYmIG1pbkxlbmd0aC5pc0F1dG8oKSAmJiBzdHlsZVRvVXNlLm92ZXJm bG93SW5saW5lRGlyZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKKyAgICBpZiAoc3R5 bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIG1pbkxlbmd0aC5pc0F1dG8oKSAmJiBzdHlsZVRv VXNlLm92ZXJmbG93SW5saW5lRGlyZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKICAg ICAgICAgLy8gTWFrZSBzdXJlIHdlIGFjdHVhbGx5IHVzZWQgdGhlIGFzcGVjdCByYXRpby4KICAg ICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKLSAg ICAgICAgICAgIG1pbkxlbmd0aCA9IExlbmd0aChMZW5ndGhUeXBlOjpNaW5Db250ZW50KTsKKyAg ICAgICAgICAgIG1pbkxlbmd0aCA9IExlbmd0aChMZW5ndGhUeXBlOjpNaW5JbnRyaW5zaWMpOwog ICAgIH0KICAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdp ZHRoSW5GcmFnbWVudFVzaW5nKE1pblNpemUsIG1pbkxlbmd0aCwgYXZhaWxhYmxlV2lkdGgsIGNi LCBmcmFnbWVudCkpOwogfQpAQCAtMjYwNSw2ICsyNjA3LDE1IEBAIExheW91dFVuaXQgUmVuZGVy Qm94OjpmaWxsQXZhaWxhYmxlTWVhc3VyZShMYXlvdXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxXaWR0 aCwgTGF5CiAgICAgcmV0dXJuIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCAtIG1hcmdpblN0YXJ0IC0g bWFyZ2luRW5kOwogfQogCit2b2lkIFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxX aWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2Fs V2lkdGgsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0Cit7CisgICAgaWYgKGFsbG93SW50cmlu c2ljICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkgeworICAg ICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdp ZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgY29tcHV0 ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgp OworfQorCiBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0 aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhMZW5ndGgsIExheW91dFVuaXQgYXZhaWxhYmxlTG9n aWNhbFdpZHRoLCBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcpIGNvbnN0CiB7CiAgICAgaWYg KGxvZ2ljYWxXaWR0aExlbmd0aC5pc0ZpbGxBdmFpbGFibGUoKSkKQEAgLTI2MTIsOSArMjYyMyw5 IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNp bmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0CiAKICAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxX aWR0aDsKICAgICBMYXlvdXRVbml0IG1heExvZ2ljYWxXaWR0aDsKLSAgICBjb21wdXRlSW50cmlu c2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CisgICAg Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2Fs V2lkdGgsICFsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5JbnRyaW5zaWMoKSk7CiAKLSAgICBpZiAo bG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29udGVudCgpKQorICAgIGlmIChsb2dpY2FsV2lkdGhM ZW5ndGguaXNNaW5Db250ZW50KCkgfHwgbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2lj KCkpCiAgICAgICAgIHJldHVybiBtaW5Mb2dpY2FsV2lkdGggKyBib3JkZXJBbmRQYWRkaW5nOwog CiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01heENvbnRlbnQoKSkKQEAgLTI2MzcsMTIg KzI2NDgsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZy YWdtZW50VXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW4KICAgICBpZiAod2lkdGhUeXBlID09 IE1pblNpemUgJiYgbG9naWNhbFdpZHRoLmlzQXV0bygpKQogICAgICAgICByZXR1cm4gYWRqdXN0 Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKDAsIGxvZ2ljYWxXaWR0aC50eXBlKCkp OwogCi0gICAgaWYgKCFsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWNPckF1dG8oKSkgeworICAgIGlm ICghbG9naWNhbFdpZHRoLmlzSW50cmluc2ljT3JBdXRvKCkgJiYgIWxvZ2ljYWxXaWR0aC5pc01p bkludHJpbnNpYygpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgY29udGFpbmluZyBibG9j ayBmbG93IGlzIHBlcnBlbmRpY3VsYXIgdG8gb3VyIGRpcmVjdGlvbiB3ZSBuZWVkIHRvIHVzZSB0 aGUgYXZhaWxhYmxlIGxvZ2ljYWwgaGVpZ2h0IGluc3RlYWQuCiAgICAgICAgIHJldHVybiBhZGp1 c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgobG9naWNh bFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgpLCBsb2dpY2FsV2lkdGgudHlwZSgpKTsKICAg ICB9CiAKLSAgICBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCisgICAgaWYgKGxvZ2lj YWxXaWR0aC5pc0ludHJpbnNpYygpIHx8IGxvZ2ljYWxXaWR0aC5pc01pbkludHJpbnNpYygpKQog ICAgICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxX aWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRo KCkpOwogCiAgICAgTGF5b3V0VW5pdCBtYXJnaW5TdGFydDsKQEAgLTUwOTgsNyArNTEwOSw3IEBA IGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp bygpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gaCA9IHN0eWxlKCku bG9naWNhbEhlaWdodCgpOwotICAgIHJldHVybiBoLmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQ b3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxv Z2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CisgICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgaC5p c0ludHJpbnNpYygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRP ckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7 CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvKCkgY29uc3QKQEAgLTUxMzQsNyArNTE0NSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94 Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFp bmVyCiAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBpbmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhv cml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGlu Z0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9naWNhbEFzcGVjdFJhdGlvKCkpLCBzdHls ZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCksIGxvZ2ljYWxIZWlnaHRmb3JBc3BlY3RSYXRp byk7CiAKICAgICBMYXlvdXRVbml0IGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24gPSBz dGQ6Om1heDxMYXlvdXRVbml0PigwLCBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250 ZW50SW5GcmFnbWVudChmcmFnbWVudCkpOwotICAgIHJldHVybiBjb25zdHJhaW5Mb2dpY2FsV2lk dGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250YWluZXJXaWR0aEluSW5saW5l RGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50KTsKKyAgICByZXR1cm4gY29u c3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFp bmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCwg ZmFsc2UpOwogfQogCiBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyQm94 Ojpjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA2ZGU2ZWQ2YWM2Yjk2ODhmY2IzNjQ4ZGJi NGIyZWM5YTA5YmIxNDI0Li5jZWJkZDkxZTM1YTZmZTM3NDA5ZDZkZDkwY2EwNzNhOTlmYTFkYzQ2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC04NSw3ICs4NSw3IEBAIHB1 YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxl KCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHdpZHRoKCkgOiBoZWlnaHQoKTsgfQogICAg IExheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jp em9udGFsV3JpdGluZ01vZGUoKSA/IGhlaWdodCgpIDogd2lkdGgoKTsgfQogCi0gICAgTGF5b3V0 VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCwg TGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxs cHRyKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21l bnRCeU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRVbml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZy YWdtZW50Q29udGFpbmVyKiwgYm9vbCBhbGxvd0ludHJpbnNpYyA9IHRydWUpIGNvbnN0OwogICAg IExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9n aWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkg Y29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Db250ZW50Qm94TG9naWNhbEhlaWdodEJ5 TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50 cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAKQEAgLTY0OSw2ICs2NDksMTAgQEAgb3ZlcnJp ZGU7CiAKICAgICBMYXlvdXRSZWN0IGFic29sdXRlQW5jaG9yUmVjdFdpdGhTY3JvbGxNYXJnaW4o Ym9vbCogaW5zaWRlRml4ZWQgPSBudWxscHRyKSBjb25zdCBvdmVycmlkZTsKIAorICAgIGJvb2wg c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKKyAgICBi b29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKKyAg ICBMYXlvdXRVbml0IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJh Z21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CisKIHByb3RlY3RlZDoKICAgICBSZW5k ZXJCb3goRWxlbWVudCYsIFJlbmRlclN0eWxlJiYsIEJhc2VUeXBlRmxhZ3MpOwogICAgIFJlbmRl ckJveChEb2N1bWVudCYsIFJlbmRlclN0eWxlJiYsIEJhc2VUeXBlRmxhZ3MpOwpAQCAtNjk4LDEw ICs3MDIsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIGluY3JlbWVudFZpc3VhbGx5Tm9uRW1w dHlQaXhlbENvdW50SWZOZWVkZWQoY29uc3QgSW50U2l6ZSYpOwogCi0gICAgYm9vbCBzaG91bGRD b21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwotICAgIGJvb2wgc2hv dWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwogICAgIGJvb2wg c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0 OwotICAgIExheW91dFVuaXQgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5k ZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKICAgICBzdGQ6OnBhaXI8TGF5 b3V0VW5pdCwgTGF5b3V0VW5pdD4gY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RS YXRpbygpIGNvbnN0OwogCiAgICAgc3RhdGljIExheW91dFVuaXQgYmxvY2tTaXplRnJvbUFzcGVj dFJhdGlvKExheW91dFVuaXQgYm9yZGVyUGFkZGluZ0lubGluZVN1bSwgTGF5b3V0VW5pdCBib3Jk ZXJQYWRkaW5nQmxvY2tTdW0sIExheW91dFVuaXQgYXNwZWN0UmF0aW8sIEJveFNpemluZyBib3hT aXppbmcsIExheW91dFVuaXQgaW5saW5lU2l6ZSkKQEAgLTc0OSw2ICs3NTAsNyBAQCBwcml2YXRl OgogICAgIExheW91dFVuaXQgZmlsbEF2YWlsYWJsZU1lYXN1cmUoTGF5b3V0VW5pdCBhdmFpbGFi bGVMb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1hcmdpblN0YXJ0LCBMYXlvdXRVbml0JiBtYXJn aW5FbmQpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs V2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNh bFdpZHRoKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExh eW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoLCBi b29sIGFsbG93SW50cmluc2ljKSBjb25zdDsKIAogICAgIC8vIFRoaXMgZnVuY3Rpb24gY2FsY3Vs YXRlcyB0aGUgbWluaW11bSBhbmQgbWF4aW11bSBwcmVmZXJyZWQgd2lkdGhzIGZvciBhbiBvYmpl Y3QuCiAgICAgLy8gVGhlc2UgdmFsdWVzIGFyZSB1c2VkIGluIHNocmluay10by1maXQgbGF5b3V0 IHN5c3RlbXMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggZjcxNTJjNzBiMjNiODI1YmQyOGQ1NzdkZmQ2ZTMxOWI1OTZmZTE4 Yi4uMzQxMmRkYjdlNDcyNjc4ZTI5ZGM2MGVhNDg2ZjAwZTQ2NWNmMjA3MiAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDIxLTAyLTIxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAg ICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5hYmxlIHNvbWUgdGVzdHMg dGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDIt MjAgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDog SW1hZ2Ugc2hvdWxkIHJlcG9ydCB0aGUgZW1iZWRkZWQgYWNjZXNzaWJpbGl0eSBkZXNjcmlwdGlv biBpZiBhdmFpbGFibGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMg Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDg1N2M1MjA4M2E1MDk3M2U4Mzdm NmI2NDY3ZGM0MjJjNGIzY2YxNmEuLmIxMDAwZWNkMzY3MDEyMWYzMmQxMjJiZDc0ZDg0MDBjMjJl NzBjOTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5 b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU0Niw2ICs0NTQ2LDcgQEAgd2Via2l0Lm9y Zy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGlu Zy9zaGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFsaXR5LTAwMi50ZW50 YXRpdmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWNl aG9sZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAorIyAgY29udGFpbi1pbnRyaW5zaWMt c2l6ZQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFz cGVjdC1yYXRpby0wMjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtNDU1NSwxNCArNDU1 Niw4IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs ZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXpl LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2lu dHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3 ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNi5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1z aXplLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2ludHJpbnNpYy1zaXplLTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMxLmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0w MzIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby90YWJs ZS1lbGVtZW50LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 421148 2021-02-21 12:56:53 -0800 2021-02-22 10:31:39 -0800 Patch bug-220861-20210221215652.patch text/plain 14754 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmYwNDgxMDk2OGRjMWM1 OTk2MjdjZjIzZThkZDY1NjRiOTMzNzk1My4uYzViOWVkZmRmZjM4Y2RlMDk0YWZmZWU2MDBiOWU0 NTViYTY4ODJiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTIxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMS0wMi0yMSAgTm9hbSBSb3NlbnRoYWwgIDxub2FtQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgW1BhaW50IFRpbWluZ10gUmV0dXJuIGVhcmx5IGZyb20gY29udGVudGZ1bCBwYWludCBj aGVjayB3aGVuIG5vIGNvbnRlbnRmdWwgcGl4ZWxzL2NoYXJhY3RlcnMgYXQgYWxsCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCAxYmY5Njk0Y2NiMDZiYTZmZDU3 MDYyMDZiZTlkOTI2MjFlZWVjNzMyLi4xYTE5MDQ4OWZlZjVkODZhMzQ1YTk2ZjY3MmZiYzg4Yzll NGFhMzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTI0 MjYsNiArMjQyNiw4IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVDaGlsZFByZWZlcnJlZExv Z2ljYWxXaWR0aHMoUmVuZGVyT2JqZWN0JiBjaGlsZCwgTGF5b3V0CiAgICAgCiAgICAgaWYgKGNo aWxkLmlzQm94KCkpIHsKICAgICAgICAgYXV0byYgYm94ID0gZG93bmNhc3Q8UmVuZGVyQm94Pihj aGlsZCk7CisgICAgICAgIGlmIChib3guc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl Y3RSYXRpbygpKQorICAgICAgICAgICAgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbWF4UHJl ZmVycmVkTG9naWNhbFdpZHRoID0gYm94LmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW8oKTsKICAgICAgICAgaWYgKG92ZXJyaWRpbmdIZWlnaHQpCiAgICAgICAgICAgICBib3guc2V0 T3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQob3ZlcnJpZGluZ0hlaWdodC52YWx1ZSgpKTsKICAgICAg ICAgaWYgKG92ZXJyaWRpbmdXaWR0aCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAKaW5kZXggNTNmZDBmMGYzOGNhNWFmZDEwNzlmZGMzNDA3NDhiMTRjOWMyOTAwMC4uYzE5ZTgw YzQyYzc0MjY4ZGViY2MzNDBmMTA0MDE3ZGMyMzg4NzliYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAKQEAgLTY1MSw3ICs2NTEsNyBAQCB2b2lkIFJlbmRlckJveDo6dXBk YXRlTGF5ZXJUcmFuc2Zvcm0oKQogICAgICAgICBsYXllcigpLT51cGRhdGVUcmFuc2Zvcm0oKTsK IH0KIAotTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21l bnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVX aWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQp IGNvbnN0CitMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFn bWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2YWlsYWJs ZVdpZHRoLCBSZW5kZXJCbG9jayYgY2IsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVu dCwgYm9vbCBhbGxvd0ludHJpbnNpYykgY29uc3QKIHsKICAgICBjb25zdCBSZW5kZXJTdHlsZSYg c3R5bGVUb1VzZSA9IHN0eWxlKCk7CiAKQEAgLTY2MCwxMyArNjYwLDE1IEBAIExheW91dFVuaXQg UmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0 VW5pdCBsb2dpY2FsCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdp ZHRoLCBsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CiAgICAgfQogCi0gICAgaWYg KCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCisgICAgaWYgKCFz dHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgKGFsbG93SW50cmlu c2ljIHx8ICFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzSW50cmluc2ljKCkpKQogICAg ICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2Fs V2lkdGhJbkZyYWdtZW50VXNpbmcoTWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgo KSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOworICAgIGlmICghYWxsb3dJbnRyaW5z aWMgJiYgc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKQorICAgICAg ICByZXR1cm4gbG9naWNhbFdpZHRoOwogICAgIGF1dG8gbWluTGVuZ3RoID0gc3R5bGVUb1VzZS5s b2dpY2FsTWluV2lkdGgoKTsKLSAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYm IHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygp ICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6Vmlz aWJsZSkgeworICAgIGlmIChzdHlsZVRvVXNlLmhhc0FzcGVjdFJhdGlvKCkgJiYgbWluTGVuZ3Ro LmlzQXV0bygpICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVy Zmxvdzo6VmlzaWJsZSkgewogICAgICAgICAvLyBNYWtlIHN1cmUgd2UgYWN0dWFsbHkgdXNlZCB0 aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZy b21Bc3BlY3RSYXRpbygpKQotICAgICAgICAgICAgbWluTGVuZ3RoID0gTGVuZ3RoKExlbmd0aFR5 cGU6Ok1pbkNvbnRlbnQpOworICAgICAgICAgICAgbWluTGVuZ3RoID0gTGVuZ3RoKExlbmd0aFR5 cGU6Ok1pbkludHJpbnNpYyk7CiAgICAgfQogICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2FsV2lk dGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWluU2l6ZSwgbWluTGVuZ3Ro LCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CiB9CkBAIC02ODEsNyArNjgzLDcgQEAg TGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlv dXRVbml0IGxvZ2ljYWxIZWlnaHQsIE8KICAgICBhdXRvIGxvZ2ljYWxNaW5IZWlnaHQgPSBzdHls ZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKTsKICAgICBpZiAobG9naWNhbE1pbkhlaWdodC5pc0F1 dG8oKSAmJiBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpICYmIGlu dHJpbnNpY0NvbnRlbnRIZWlnaHQgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0Jsb2NrRGlyZWN0aW9u KCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpCiAgICAgICAgIGxvZ2ljYWxNaW5IZWlnaHQgPSBMZW5n dGgoKmludHJpbnNpY0NvbnRlbnRIZWlnaHQsIExlbmd0aFR5cGU6OkZpeGVkKTsKLSAgICBpZiAo bG9naWNhbE1pbkhlaWdodC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsTWluSGVpZ2h0LmlzTWF4 Q29udGVudCgpKQorICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzTWluQ29udGVudCgpIHx8IGxv Z2ljYWxNaW5IZWlnaHQuaXNNYXhDb250ZW50KCkgfHwgbG9naWNhbE1pbkhlaWdodC5pc01pbklu dHJpbnNpYygpKQogICAgICAgICBsb2dpY2FsTWluSGVpZ2h0ID0gTGVuZ3RoKCk7CiAgICAgaWYg KE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTG9naWNhbEhlaWdodCA9IGNvbXB1dGVMb2dp Y2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgbG9naWNhbE1pbkhlaWdodCwgaW50cmluc2ljQ29udGVu dEhlaWdodCkpCiAgICAgICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2FsSGVpZ2h0LCBjb21wdXRl ZExvZ2ljYWxIZWlnaHQudmFsdWUoKSk7CkBAIC0yNjA1LDYgKzI2MDcsMTUgQEAgTGF5b3V0VW5p dCBSZW5kZXJCb3g6OmZpbGxBdmFpbGFibGVNZWFzdXJlKExheW91dFVuaXQgYXZhaWxhYmxlTG9n aWNhbFdpZHRoLCBMYXkKICAgICByZXR1cm4gYXZhaWxhYmxlTG9naWNhbFdpZHRoIC0gbWFyZ2lu U3RhcnQgLSBtYXJnaW5FbmQ7CiB9CiAKK3ZvaWQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2lj TG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1h eExvZ2ljYWxXaWR0aCwgYm9vbCBhbGxvd0ludHJpbnNpYykgY29uc3QKK3sKKyAgICBpZiAoYWxs b3dJbnRyaW5zaWMgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygp KSB7CisgICAgICAgIG1pbkxvZ2ljYWxXaWR0aCA9IG1heExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVM b2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAg ICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2lj YWxXaWR0aCk7Cit9CisKIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9n aWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0aCwgTGF5b3V0VW5pdCBhdmFp bGFibGVMb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZykgY29uc3QKIHsK ICAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzRmlsbEF2YWlsYWJsZSgpKQpAQCAtMjYxMiw5 ICsyNjIzLDkgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs V2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRoTGVuZ3QKIAogICAgIExheW91dFVuaXQgbWlu TG9naWNhbFdpZHRoOwogICAgIExheW91dFVuaXQgbWF4TG9naWNhbFdpZHRoOwotICAgIGNvbXB1 dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRo KTsKKyAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1h eExvZ2ljYWxXaWR0aCwgIWxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNpYygpKTsKIAot ICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250ZW50KCkpCisgICAgaWYgKGxvZ2lj YWxXaWR0aExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5J bnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJuIG1pbkxvZ2ljYWxXaWR0aCArIGJvcmRlckFuZFBh ZGRpbmc7CiAKICAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWF4Q29udGVudCgpKQpAQCAt MjYzNywxMiArMjY0OCwxMiBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxX aWR0aEluRnJhZ21lbnRVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbgogICAgIGlmICh3aWR0 aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkpCiAgICAgICAgIHJldHVy biBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoMCwgbG9naWNhbFdpZHRo LnR5cGUoKSk7CiAKLSAgICBpZiAoIWxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpY09yQXV0bygpKSB7 CisgICAgaWYgKCFsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWNPckF1dG8oKSAmJiAhbG9naWNhbFdp ZHRoLmlzTWluSW50cmluc2ljKCkpIHsKICAgICAgICAgLy8gRklYTUU6IElmIHRoZSBjb250YWlu aW5nIGJsb2NrIGZsb3cgaXMgcGVycGVuZGljdWxhciB0byBvdXIgZGlyZWN0aW9uIHdlIG5lZWQg dG8gdXNlIHRoZSBhdmFpbGFibGUgbG9naWNhbCBoZWlnaHQgaW5zdGVhZC4KICAgICAgICAgcmV0 dXJuIGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0 aChsb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCksIGxvZ2ljYWxXaWR0aC50eXBl KCkpOwogICAgIH0KIAotICAgIGlmIChsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWMoKSkKKyAgICBp ZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkgfHwgbG9naWNhbFdpZHRoLmlzTWluSW50cmlu c2ljKCkpCiAgICAgICAgIHJldHVybiBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmco bG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIGJvcmRlckFuZFBhZGRpbmdMb2dp Y2FsV2lkdGgoKSk7CiAKICAgICBMYXlvdXRVbml0IG1hcmdpblN0YXJ0OwpAQCAtNTA5OCw3ICs1 MTA5LDcgQEAgYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFz cGVjdFJhdGlvKCkgY29uc3QKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgYXV0byBoID0g c3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7Ci0gICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgKCFpc091 dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmICFwZXJj ZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKTsKKyAgICByZXR1cm4gaC5pc0F1dG8o KSB8fCBoLmlzSW50cmluc2ljKCkgfHwgKCFpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBoLmlz UGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmICFwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2 YWJsZSgpKTsKIH0KIAogYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8oKSBjb25zdApAQCAtNTEzNCw3ICs1MTQ1LDcgQEAgTGF5b3V0VW5pdCBS ZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21l bnRDb250YWluZXIKICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IGlubGluZVNpemVGcm9tQXNwZWN0 UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJB bmRQYWRkaW5nRXh0ZW50KCksIExheW91dFVuaXQoc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8o KSksIHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSwgbG9naWNhbEhlaWdodGZvckFz cGVjdFJhdGlvKTsKIAogICAgIExheW91dFVuaXQgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVj dGlvbiA9IHN0ZDo6bWF4PExheW91dFVuaXQ+KDAsIGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0 aEZvckNvbnRlbnRJbkZyYWdtZW50KGZyYWdtZW50KSk7Ci0gICAgcmV0dXJuIGNvbnN0cmFpbkxv Z2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lkdGgsIGNvbnRhaW5lcldpZHRo SW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2soKSwgZnJhZ21lbnQpOworICAgIHJl dHVybiBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRo LCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZy YWdtZW50LCBmYWxzZSk7CiB9CiAKIHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBS ZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25z dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDZkZTZlZDZhYzZiOTY4OGZj YjM2NDhkYmI0YjJlYzlhMDliYjE0MjQuLmNlYmRkOTFlMzVhNmZlMzc0MDlkNmRkOTBjYTA3M2E5 OWZhMWRjNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTg1LDcgKzg1 LDcgQEAgcHVibGljOgogICAgIExheW91dFVuaXQgbG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1 cm4gc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gd2lkdGgoKSA6IGhlaWdodCgp OyB9CiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gc3R5bGUo KS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gaGVpZ2h0KCkgOiB3aWR0aCgpOyB9CiAKLSAg ICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlv dXRVbml0LCBMYXlvdXRVbml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZyYWdtZW50Q29udGFpbmVy KiA9IG51bGxwdHIpIGNvbnN0OworICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbFdpZHRo SW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQsIExheW91dFVuaXQsIFJlbmRlckJsb2NrJiwg UmVuZGVyRnJhZ21lbnRDb250YWluZXIqLCBib29sIGFsbG93SW50cmluc2ljID0gdHJ1ZSkgY29u c3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0 VW5pdCBsb2dpY2FsSGVpZ2h0LCBPcHRpb25hbDxMYXlvdXRVbml0PiBpbnRyaW5zaWNDb250ZW50 SGVpZ2h0KSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkNvbnRlbnRCb3hMb2dpY2Fs SGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBPcHRpb25hbDxMYXlvdXRV bml0PiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSBjb25zdDsKIApAQCAtNjQ5LDYgKzY0OSwxMCBA QCBvdmVycmlkZTsKIAogICAgIExheW91dFJlY3QgYWJzb2x1dGVBbmNob3JSZWN0V2l0aFNjcm9s bE1hcmdpbihib29sKiBpbnNpZGVGaXhlZCA9IG51bGxwdHIpIGNvbnN0IG92ZXJyaWRlOwogCisg ICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0 OworICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNv bnN0OworICAgIExheW91dFVuaXQgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhS ZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKwogcHJvdGVjdGVkOgog ICAgIFJlbmRlckJveChFbGVtZW50JiwgUmVuZGVyU3R5bGUmJiwgQmFzZVR5cGVGbGFncyk7CiAg ICAgUmVuZGVyQm94KERvY3VtZW50JiwgUmVuZGVyU3R5bGUmJiwgQmFzZVR5cGVGbGFncyk7CkBA IC02OTgsMTAgKzcwMiw3IEBAIHByb3RlY3RlZDoKIAogICAgIHZvaWQgaW5jcmVtZW50VmlzdWFs bHlOb25FbXB0eVBpeGVsQ291bnRJZk5lZWRlZChjb25zdCBJbnRTaXplJik7CiAKLSAgICBib29s IHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7Ci0gICAg Ym9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CiAg ICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRz KCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJh dGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiA9IG51bGxwdHIpIGNvbnN0OwogICAgIHN0ZDo6 cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJv bUFzcGVjdFJhdGlvKCkgY29uc3Q7CiAKICAgICBzdGF0aWMgTGF5b3V0VW5pdCBibG9ja1NpemVG cm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nSW5saW5lU3VtLCBMYXlvdXRV bml0IGJvcmRlclBhZGRpbmdCbG9ja1N1bSwgTGF5b3V0VW5pdCBhc3BlY3RSYXRpbywgQm94U2l6 aW5nIGJveFNpemluZywgTGF5b3V0VW5pdCBpbmxpbmVTaXplKQpAQCAtNzQ5LDYgKzc1MCw3IEBA IHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBmaWxsQXZhaWxhYmxlTWVhc3VyZShMYXlvdXRVbml0 IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWFyZ2luU3RhcnQsIExheW91dFVu aXQmIG1hcmdpbkVuZCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZUludHJpbnNp Y0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBt YXhMb2dpY2FsV2lkdGgpIGNvbnN0OworICAgIHZvaWQgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxX aWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2Fs V2lkdGgsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0OwogCiAgICAgLy8gVGhpcyBmdW5jdGlv biBjYWxjdWxhdGVzIHRoZSBtaW5pbXVtIGFuZCBtYXhpbXVtIHByZWZlcnJlZCB3aWR0aHMgZm9y IGFuIG9iamVjdC4KICAgICAvLyBUaGVzZSB2YWx1ZXMgYXJlIHVzZWQgaW4gc2hyaW5rLXRvLWZp dCBsYXlvdXQgc3lzdGVtcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmNzE1MmM3MGIyM2I4MjViZDI4ZDU3N2RmZDZlMzE5 YjU5NmZlMThiLi4zNDEyZGRiN2U0NzI2NzhlMjlkYzYwZWE0ODZmMDBlNDY1Y2YyMDcyIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDItMjEgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv bT4KKworICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBpbiBpbnRyaW5zaWMgc2l6aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA4NjEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgc29t ZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwog MjAyMS0wMi0yMCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAg ICAgIEFYOiBJbWFnZSBzaG91bGQgcmVwb3J0IHRoZSBlbWJlZGRlZCBhY2Nlc3NpYmlsaXR5IGRl c2NyaXB0aW9uIGlmIGF2YWlsYWJsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVj dGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggODU3YzUyMDgzYTUw OTczZTgzN2Y2YjY0NjdkYzQyMmM0YjNjZjE2YS4uYjEwMDBlY2QzNjcwMTIxZjMyZDEyMmJkNzRk ODQwMGMyMmU3MGM5MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwor KysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTQ2LDYgKzQ1NDYsNyBAQCB3 ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zY29waW5nL3NoYWRvdy1kaXJlYwogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWN0aW9uYWxpdHkt MDAyLnRlbnRhdGl2ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0 NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0 ZWQtcGxhY2Vob2xkZXIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCisjICBjb250YWluLWlu dHJpbnNpYy1zaXplCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0 aW8tMDI0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v YmxvY2stYXNwZWN0LXJhdGlvLTAyOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC00NTU1 LDE0ICs0NTU2LDggQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmlu c2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vaW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA1Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUt MDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50 cmluc2ljLXNpemUtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDExLmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzEuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1l bGVtZW50LTAzMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL3RhYmxlLWVsZW1lbnQtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 421210 2021-02-22 10:31:45 -0800 2021-02-22 12:50:21 -0800 Patch bug-220861-20210222193143.patch text/plain 15194 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZjYTEzMjQ2OWM1Mjdl NjBlYjJjMzZmNmEzNDc3MDg0N2Q2N2NmZi4uNDRhMTkyZDliMGMxNDdlZDc2NWMyOGZlMTM4NzU4 ZDc4MDZjNWIzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTIyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMS0wMi0yMiAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIGV4cGVyaW1lbnRhbCBzdXBwb3J0IGZvciBDU1MgQ29sb3IgNSBjb2xvci1taXgoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggMWJmOTY5NGNjYjA2 YmE2ZmQ1NzA2MjA2YmU5ZDkyNjIxZWVlYzczMi4uMWExOTA0ODlmZWY1ZDg2YTM0NWE5NmY2NzJm YmM4OGM5ZTRhYTMxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CkBAIC0yNDI2LDYgKzI0MjYsOCBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVm ZXJyZWRMb2dpY2FsV2lkdGhzKFJlbmRlck9iamVjdCYgY2hpbGQsIExheW91dAogICAgIAogICAg IGlmIChjaGlsZC5pc0JveCgpKSB7CiAgICAgICAgIGF1dG8mIGJveCA9IGRvd25jYXN0PFJlbmRl ckJveD4oY2hpbGQpOworICAgICAgICBpZiAoYm94LnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9 IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGJveC5jb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKCk7CiAgICAgICAgIGlmIChvdmVycmlkaW5nSGVpZ2h0KQogICAgICAgICAgICAg Ym94LnNldE92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KG92ZXJyaWRpbmdIZWlnaHQudmFsdWUoKSk7 CiAgICAgICAgIGlmIChvdmVycmlkaW5nV2lkdGgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCmluZGV4IDUzZmQwZjBmMzhjYTVhZmQxMDc5ZmRjMzQwNzQ4YjE0YzljMjkwMDAu LmMxOWU4MGM0MmM3NDI2OGRlYmNjMzQwZjEwNDAxN2RjMjM4ODc5YmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC02NTEsNyArNjUxLDcgQEAgdm9pZCBSZW5kZXJC b3g6OnVwZGF0ZUxheWVyVHJhbnNmb3JtKCkKICAgICAgICAgbGF5ZXIoKS0+dXBkYXRlVHJhbnNm b3JtKCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJ bkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYXZh aWxhYmxlV2lkdGgsIFJlbmRlckJsb2NrJiBjYiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGZy YWdtZW50KSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0 aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBh dmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciog ZnJhZ21lbnQsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0CiB7CiAgICAgY29uc3QgUmVuZGVy U3R5bGUmIHN0eWxlVG9Vc2UgPSBzdHlsZSgpOwogCkBAIC02NjAsMTMgKzY2MCwxNSBAQCBMYXlv dXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4 KExheW91dFVuaXQgbG9naWNhbAogICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6OmNsYW1wKGxv Z2ljYWxXaWR0aCwgbG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGgpOwogICAgIH0KIAot ICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpKQorICAg IGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpICYmIChhbGxv d0ludHJpbnNpYyB8fCAhc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc0ludHJpbnNpYygp KSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21wdXRl TG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1h eFdpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKKyAgICBpZiAoIWFsbG93 SW50cmluc2ljICYmIHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCkuaXNJbnRyaW5zaWMoKSkK KyAgICAgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aDsKICAgICBhdXRvIG1pbkxlbmd0aCA9IHN0eWxl VG9Vc2UubG9naWNhbE1pbldpZHRoKCk7Ci0gICAgaWYgKHN0eWxlVG9Vc2UuaGFzQXNwZWN0UmF0 aW8oKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYmIG1pbkxlbmd0aC5p c0F1dG8oKSAmJiBzdHlsZVRvVXNlLm92ZXJmbG93SW5saW5lRGlyZWN0aW9uKCkgPT0gT3ZlcmZs b3c6OlZpc2libGUpIHsKKyAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIG1p bkxlbmd0aC5pc0F1dG8oKSAmJiBzdHlsZVRvVXNlLm92ZXJmbG93SW5saW5lRGlyZWN0aW9uKCkg PT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKICAgICAgICAgLy8gTWFrZSBzdXJlIHdlIGFjdHVhbGx5 IHVzZWQgdGhlIGFzcGVjdCByYXRpby4KICAgICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2Fs V2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKLSAgICAgICAgICAgIG1pbkxlbmd0aCA9IExlbmd0aChM ZW5ndGhUeXBlOjpNaW5Db250ZW50KTsKKyAgICAgICAgICAgIG1pbkxlbmd0aCA9IExlbmd0aChM ZW5ndGhUeXBlOjpNaW5JbnRyaW5zaWMpOwogICAgIH0KICAgICByZXR1cm4gc3RkOjptYXgobG9n aWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1pblNpemUsIG1p bkxlbmd0aCwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOwogfQpAQCAtNjgxLDcgKzY4 Myw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5N YXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBPCiAgICAgYXV0byBsb2dpY2FsTWluSGVpZ2h0 ID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCk7CiAgICAgaWYgKGxvZ2ljYWxNaW5IZWln aHQuaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8o KSAmJiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0ICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dCbG9ja0Rp cmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKQogICAgICAgICBsb2dpY2FsTWluSGVpZ2h0 ID0gTGVuZ3RoKCppbnRyaW5zaWNDb250ZW50SGVpZ2h0LCBMZW5ndGhUeXBlOjpGaXhlZCk7Ci0g ICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQuaXNNaW5Db250ZW50KCkgfHwgbG9naWNhbE1pbkhlaWdo dC5pc01heENvbnRlbnQoKSkKKyAgICBpZiAobG9naWNhbE1pbkhlaWdodC5pc01pbkNvbnRlbnQo KSB8fCBsb2dpY2FsTWluSGVpZ2h0LmlzTWF4Q29udGVudCgpIHx8IGxvZ2ljYWxNaW5IZWlnaHQu aXNNaW5JbnRyaW5zaWMoKSkKICAgICAgICAgbG9naWNhbE1pbkhlaWdodCA9IExlbmd0aCgpOwog ICAgIGlmIChPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZExvZ2ljYWxIZWlnaHQgPSBjb21w dXRlTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIGxvZ2ljYWxNaW5IZWlnaHQsIGludHJpbnNp Y0NvbnRlbnRIZWlnaHQpKQogICAgICAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbEhlaWdodCwg Y29tcHV0ZWRMb2dpY2FsSGVpZ2h0LnZhbHVlKCkpOwpAQCAtMjYwNSw2ICsyNjA3LDE1IEBAIExh eW91dFVuaXQgUmVuZGVyQm94OjpmaWxsQXZhaWxhYmxlTWVhc3VyZShMYXlvdXRVbml0IGF2YWls YWJsZUxvZ2ljYWxXaWR0aCwgTGF5CiAgICAgcmV0dXJuIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCAt IG1hcmdpblN0YXJ0IC0gbWFyZ2luRW5kOwogfQogCit2b2lkIFJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRV bml0JiBtYXhMb2dpY2FsV2lkdGgsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0Cit7CisgICAg aWYgKGFsbG93SW50cmluc2ljICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0 UmF0aW8oKSkgeworICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGggPSBj b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBt YXhMb2dpY2FsV2lkdGgpOworfQorCiBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhMZW5ndGgsIExheW91dFVu aXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcpIGNv bnN0CiB7CiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc0ZpbGxBdmFpbGFibGUoKSkKQEAg LTI2MTIsOSArMjYyMyw5IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2lj TG9naWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0CiAKICAgICBMYXlvdXRV bml0IG1pbkxvZ2ljYWxXaWR0aDsKICAgICBMYXlvdXRVbml0IG1heExvZ2ljYWxXaWR0aDsKLSAg ICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2lj YWxXaWR0aCk7CisgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdp ZHRoLCBtYXhMb2dpY2FsV2lkdGgsICFsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5JbnRyaW5zaWMo KSk7CiAKLSAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29udGVudCgpKQorICAgIGlm IChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250ZW50KCkgfHwgbG9naWNhbFdpZHRoTGVuZ3Ro LmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBtaW5Mb2dpY2FsV2lkdGggKyBib3Jk ZXJBbmRQYWRkaW5nOwogCiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01heENvbnRlbnQo KSkKQEAgLTI2MzcsMTIgKzI2NDgsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVM b2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW4KICAgICBp ZiAod2lkdGhUeXBlID09IE1pblNpemUgJiYgbG9naWNhbFdpZHRoLmlzQXV0bygpKQogICAgICAg ICByZXR1cm4gYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKDAsIGxvZ2lj YWxXaWR0aC50eXBlKCkpOwogCi0gICAgaWYgKCFsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWNPckF1 dG8oKSkgeworICAgIGlmICghbG9naWNhbFdpZHRoLmlzSW50cmluc2ljT3JBdXRvKCkgJiYgIWxv Z2ljYWxXaWR0aC5pc01pbkludHJpbnNpYygpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUg Y29udGFpbmluZyBibG9jayBmbG93IGlzIHBlcnBlbmRpY3VsYXIgdG8gb3VyIGRpcmVjdGlvbiB3 ZSBuZWVkIHRvIHVzZSB0aGUgYXZhaWxhYmxlIGxvZ2ljYWwgaGVpZ2h0IGluc3RlYWQuCiAgICAg ICAgIHJldHVybiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcodmFsdWVG b3JMZW5ndGgobG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgpLCBsb2dpY2FsV2lk dGgudHlwZSgpKTsKICAgICB9CiAKLSAgICBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkp CisgICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpIHx8IGxvZ2ljYWxXaWR0aC5pc01p bkludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0 aFVzaW5nKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBib3JkZXJBbmRQYWRk aW5nTG9naWNhbFdpZHRoKCkpOwogCiAgICAgTGF5b3V0VW5pdCBtYXJnaW5TdGFydDsKQEAgLTUw OTgsNyArNTEwOSw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdo dEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1 dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwotICAgIHJldHVybiBoLmlzQXV0bygpIHx8 ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAm JiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CisgICAgcmV0dXJuIGgu aXNBdXRvKCkgfHwgaC5pc0ludHJpbnNpYygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkg JiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJ c1Jlc29sdmFibGUoKSk7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNh bFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKQEAgLTUxMzQsNyArNTE0NSw3IEBAIExheW91 dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRl ckZyYWdtZW50Q29udGFpbmVyCiAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBpbmxpbmVTaXplRnJv bUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2Fs Qm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9naWNhbEFzcGVj dFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCksIGxvZ2ljYWxIZWln aHRmb3JBc3BlY3RSYXRpbyk7CiAKICAgICBMYXlvdXRVbml0IGNvbnRhaW5lcldpZHRoSW5Jbmxp bmVEaXJlY3Rpb24gPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBjb250YWluaW5nQmxvY2tMb2dp Y2FsV2lkdGhGb3JDb250ZW50SW5GcmFnbWVudChmcmFnbWVudCkpOwotICAgIHJldHVybiBjb25z dHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250YWlu ZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50KTsK KyAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxvZ2lj YWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdCbG9j aygpLCBmcmFnbWVudCwgZmFsc2UpOwogfQogCiBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0 VW5pdD4gUmVuZGVyQm94Ojpjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlv KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA2ZGU2ZWQ2YWM2 Yjk2ODhmY2IzNjQ4ZGJiNGIyZWM5YTA5YmIxNDI0Li5jZWJkZDkxZTM1YTZmZTM3NDA5ZDZkZDkw Y2EwNzNhOTlmYTFkYzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC04 NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0 IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHdpZHRoKCkgOiBo ZWlnaHQoKTsgfQogICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJu IHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGhlaWdodCgpIDogd2lkdGgoKTsg fQogCi0gICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5N YXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5kZXJGcmFnbWVudENv bnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2lj YWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRVbml0LCBSZW5kZXJC bG9jayYsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiwgYm9vbCBhbGxvd0ludHJpbnNpYyA9IHRy dWUpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4 KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2lj Q29udGVudEhlaWdodCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Db250ZW50Qm94 TG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8 TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAKQEAgLTY0OSw2ICs2 NDksMTAgQEAgb3ZlcnJpZGU7CiAKICAgICBMYXlvdXRSZWN0IGFic29sdXRlQW5jaG9yUmVjdFdp dGhTY3JvbGxNYXJnaW4oYm9vbCogaW5zaWRlRml4ZWQgPSBudWxscHRyKSBjb25zdCBvdmVycmlk ZTsKIAorICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8o KSBjb25zdDsKKyAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW8oKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0 UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CisKIHByb3Rl Y3RlZDoKICAgICBSZW5kZXJCb3goRWxlbWVudCYsIFJlbmRlclN0eWxlJiYsIEJhc2VUeXBlRmxh Z3MpOwogICAgIFJlbmRlckJveChEb2N1bWVudCYsIFJlbmRlclN0eWxlJiYsIEJhc2VUeXBlRmxh Z3MpOwpAQCAtNjk4LDEwICs3MDIsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIGluY3JlbWVu dFZpc3VhbGx5Tm9uRW1wdHlQaXhlbENvdW50SWZOZWVkZWQoY29uc3QgSW50U2l6ZSYpOwogCi0g ICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0 OwotICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNv bnN0OwogICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0Fu ZEluc2V0cygpIGNvbnN0OwotICAgIExheW91dFVuaXQgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21B c3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKICAg ICBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gY29tcHV0ZU1pbk1heExvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwogCiAgICAgc3RhdGljIExheW91dFVuaXQgYmxv Y2tTaXplRnJvbUFzcGVjdFJhdGlvKExheW91dFVuaXQgYm9yZGVyUGFkZGluZ0lubGluZVN1bSwg TGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nQmxvY2tTdW0sIExheW91dFVuaXQgYXNwZWN0UmF0aW8s IEJveFNpemluZyBib3hTaXppbmcsIExheW91dFVuaXQgaW5saW5lU2l6ZSkKQEAgLTc0OSw2ICs3 NTAsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgZmlsbEF2YWlsYWJsZU1lYXN1cmUoTGF5 b3V0VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1hcmdpblN0YXJ0LCBM YXlvdXRVbml0JiBtYXJnaW5FbmQpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVJ bnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0 VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVJbnRyaW5zaWNM b2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4 TG9naWNhbFdpZHRoLCBib29sIGFsbG93SW50cmluc2ljKSBjb25zdDsKIAogICAgIC8vIFRoaXMg ZnVuY3Rpb24gY2FsY3VsYXRlcyB0aGUgbWluaW11bSBhbmQgbWF4aW11bSBwcmVmZXJyZWQgd2lk dGhzIGZvciBhbiBvYmplY3QuCiAgICAgLy8gVGhlc2UgdmFsdWVzIGFyZSB1c2VkIGluIHNocmlu ay10by1maXQgbGF5b3V0IHN5c3RlbXMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDFiYmM0YmEyZmM3ZGU2NzM1MTA5NTJi Y2E1ZTllNTcxMzUwNDRmNi4uYzBhM2EzMTc0ZjRjYWQxYjg1YTBjZjdiNmQxMGZjNGExZTBlN2Jl NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTIyICBSb2IgQnVpcyAgPHJidWlzQGln YWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNp emluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIw ODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5h YmxlIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlv bnM6CisKIDIwMjEtMDItMjIgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAg ICBSZXN5bmMgd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpbyBm cm9tIHVwc3RyZWFtCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA5YWIxNmIyODQyNzc1NjczOWI3OTk1 ZWRjNmFlY2Q4NTUyMmMxZmRiLi43OThjZmFlODBlMTBhN2U0NDE0OGY1ZWNlYWRkMTc0ZmUyNzMz MDVmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91 dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ1NDYsNiArNDU0Niw3IEBAIHdlYmtpdC5vcmcv Yi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcv c2hhZG93LWRpcmVjCiB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3NoYWRvdy1kaXJlY3Rpb25hbGl0eS0wMDIudGVudGF0 aXZlLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjZWhv bGRlci5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKKyMgIGNvbnRhaW4taW50cmluc2ljLXNp emUKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3Bl Y3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ1NTgsMTggKzQ1NTks OCBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlk LWFzcGVjdC1yYXRpby0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0w MDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRy aW5zaWMtc2l6ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDUuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDYuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6 ZS0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9p bnRyaW5zaWMtc2l6ZS0wMTAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTIuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTMuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMt c2l6ZS0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9pbnRyaW5zaWMtc2l6ZS0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVu dC0wMzMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo= 421228 2021-02-22 12:50:27 -0800 2021-02-24 03:39:06 -0800 Patch bug-220861-20210222215025.patch text/plain 15322 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZjYTEzMjQ2OWM1Mjdl NjBlYjJjMzZmNmEzNDc3MDg0N2Q2N2NmZi4uNDRhMTkyZDliMGMxNDdlZDc2NWMyOGZlMTM4NzU4 ZDc4MDZjNWIzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTIyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMS0wMi0yMiAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIGV4cGVyaW1lbnRhbCBzdXBwb3J0IGZvciBDU1MgQ29sb3IgNSBjb2xvci1taXgoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggMWJmOTY5NGNjYjA2 YmE2ZmQ1NzA2MjA2YmU5ZDkyNjIxZWVlYzczMi4uMWExOTA0ODlmZWY1ZDg2YTM0NWE5NmY2NzJm YmM4OGM5ZTRhYTMxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CkBAIC0yNDI2LDYgKzI0MjYsOCBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVm ZXJyZWRMb2dpY2FsV2lkdGhzKFJlbmRlck9iamVjdCYgY2hpbGQsIExheW91dAogICAgIAogICAg IGlmIChjaGlsZC5pc0JveCgpKSB7CiAgICAgICAgIGF1dG8mIGJveCA9IGRvd25jYXN0PFJlbmRl ckJveD4oY2hpbGQpOworICAgICAgICBpZiAoYm94LnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9 IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGJveC5jb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKCk7CiAgICAgICAgIGlmIChvdmVycmlkaW5nSGVpZ2h0KQogICAgICAgICAgICAg Ym94LnNldE92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KG92ZXJyaWRpbmdIZWlnaHQudmFsdWUoKSk7 CiAgICAgICAgIGlmIChvdmVycmlkaW5nV2lkdGgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCmluZGV4IDUzZmQwZjBmMzhjYTVhZmQxMDc5ZmRjMzQwNzQ4YjE0YzljMjkwMDAu LjA4ZDA2NTZlNDRhNDIwZTA0NWMzNGJkN2Q0OTdjZDUyYWY5NGQ2ZTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC02NTEsNyArNjUxLDcgQEAgdm9pZCBSZW5kZXJC b3g6OnVwZGF0ZUxheWVyVHJhbnNmb3JtKCkKICAgICAgICAgbGF5ZXIoKS0+dXBkYXRlVHJhbnNm b3JtKCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJ bkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYXZh aWxhYmxlV2lkdGgsIFJlbmRlckJsb2NrJiBjYiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGZy YWdtZW50KSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0 aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBh dmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciog ZnJhZ21lbnQsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0CiB7CiAgICAgY29uc3QgUmVuZGVy U3R5bGUmIHN0eWxlVG9Vc2UgPSBzdHlsZSgpOwogCkBAIC02NjAsMTMgKzY2MCwxNSBAQCBMYXlv dXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4 KExheW91dFVuaXQgbG9naWNhbAogICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6OmNsYW1wKGxv Z2ljYWxXaWR0aCwgbG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGgpOwogICAgIH0KIAot ICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpKQorICAg IGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpICYmIChhbGxv d0ludHJpbnNpYyB8fCAhc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc0ludHJpbnNpYygp KSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21wdXRl TG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1h eFdpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKKyAgICBpZiAoIWFsbG93 SW50cmluc2ljICYmIHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCkuaXNJbnRyaW5zaWMoKSkK KyAgICAgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aDsKICAgICBhdXRvIG1pbkxlbmd0aCA9IHN0eWxl VG9Vc2UubG9naWNhbE1pbldpZHRoKCk7Ci0gICAgaWYgKHN0eWxlVG9Vc2UuaGFzQXNwZWN0UmF0 aW8oKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYmIG1pbkxlbmd0aC5p c0F1dG8oKSAmJiBzdHlsZVRvVXNlLm92ZXJmbG93SW5saW5lRGlyZWN0aW9uKCkgPT0gT3ZlcmZs b3c6OlZpc2libGUpIHsKKyAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIG1p bkxlbmd0aC5pc0F1dG8oKSAmJiAoc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSB8 fCBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzTWluQ29udGVudCgpIHx8IHN0eWxlVG9Vc2Uu bG9naWNhbFdpZHRoKCkuaXNNYXhDb250ZW50KCkpICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxp bmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgewogICAgICAgICAvLyBNYWtlIHN1 cmUgd2UgYWN0dWFsbHkgdXNlZCB0aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICBpZiAoc2hvdWxk Q29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQotICAgICAgICAgICAgbWluTGVu Z3RoID0gTGVuZ3RoKExlbmd0aFR5cGU6Ok1pbkNvbnRlbnQpOworICAgICAgICAgICAgbWluTGVu Z3RoID0gTGVuZ3RoKExlbmd0aFR5cGU6Ok1pbkludHJpbnNpYyk7CiAgICAgfQogICAgIHJldHVy biBzdGQ6Om1heChsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNp bmcoTWluU2l6ZSwgbWluTGVuZ3RoLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CiB9 CkBAIC02ODEsNyArNjgzLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2lj YWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIE8KICAgICBhdXRvIGxv Z2ljYWxNaW5IZWlnaHQgPSBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKTsKICAgICBpZiAo bG9naWNhbE1pbkhlaWdodC5pc0F1dG8oKSAmJiBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZy b21Bc3BlY3RSYXRpbygpICYmIGludHJpbnNpY0NvbnRlbnRIZWlnaHQgJiYgc3R5bGVUb1VzZS5v dmVyZmxvd0Jsb2NrRGlyZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpCiAgICAgICAgIGxv Z2ljYWxNaW5IZWlnaHQgPSBMZW5ndGgoKmludHJpbnNpY0NvbnRlbnRIZWlnaHQsIExlbmd0aFR5 cGU6OkZpeGVkKTsKLSAgICBpZiAobG9naWNhbE1pbkhlaWdodC5pc01pbkNvbnRlbnQoKSB8fCBs b2dpY2FsTWluSGVpZ2h0LmlzTWF4Q29udGVudCgpKQorICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0 LmlzTWluQ29udGVudCgpIHx8IGxvZ2ljYWxNaW5IZWlnaHQuaXNNYXhDb250ZW50KCkgfHwgbG9n aWNhbE1pbkhlaWdodC5pc01pbkludHJpbnNpYygpKQogICAgICAgICBsb2dpY2FsTWluSGVpZ2h0 ID0gTGVuZ3RoKCk7CiAgICAgaWYgKE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTG9naWNh bEhlaWdodCA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgbG9naWNhbE1pbkhl aWdodCwgaW50cmluc2ljQ29udGVudEhlaWdodCkpCiAgICAgICAgIHJldHVybiBzdGQ6Om1heChs b2dpY2FsSGVpZ2h0LCBjb21wdXRlZExvZ2ljYWxIZWlnaHQudmFsdWUoKSk7CkBAIC0yNjA1LDYg KzI2MDcsMTUgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmZpbGxBdmFpbGFibGVNZWFzdXJlKExh eW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMYXkKICAgICByZXR1cm4gYXZhaWxhYmxl TG9naWNhbFdpZHRoIC0gbWFyZ2luU3RhcnQgLSBtYXJnaW5FbmQ7CiB9CiAKK3ZvaWQgUmVuZGVy Qm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2Fs V2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCwgYm9vbCBhbGxvd0ludHJpbnNpYykg Y29uc3QKK3sKKyAgICBpZiAoYWxsb3dJbnRyaW5zaWMgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgIG1pbkxvZ2ljYWxXaWR0aCA9IG1heExv Z2ljYWxXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKyAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5M b2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7Cit9CisKIExheW91dFVuaXQgUmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExl bmd0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYm9yZGVy QW5kUGFkZGluZykgY29uc3QKIHsKICAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzRmlsbEF2 YWlsYWJsZSgpKQpAQCAtMjYxMiw5ICsyNjIzLDkgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNv bXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRoTGVuZ3QK IAogICAgIExheW91dFVuaXQgbWluTG9naWNhbFdpZHRoOwogICAgIExheW91dFVuaXQgbWF4TG9n aWNhbFdpZHRoOwotICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxX aWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKyAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo cyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCwgIWxvZ2ljYWxXaWR0aExlbmd0aC5p c01pbkludHJpbnNpYygpKTsKIAotICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250 ZW50KCkpCisgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dp Y2FsV2lkdGhMZW5ndGguaXNNaW5JbnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJuIG1pbkxvZ2lj YWxXaWR0aCArIGJvcmRlckFuZFBhZGRpbmc7CiAKICAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3Ro LmlzTWF4Q29udGVudCgpKQpAQCAtMjYzNywxMiArMjY0OCwxMiBAQCBMYXlvdXRVbml0IFJlbmRl ckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhTaXplVHlwZSB3aWR0aFR5 cGUsIExlbgogICAgIGlmICh3aWR0aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNB dXRvKCkpCiAgICAgICAgIHJldHVybiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hT aXppbmcoMCwgbG9naWNhbFdpZHRoLnR5cGUoKSk7CiAKLSAgICBpZiAoIWxvZ2ljYWxXaWR0aC5p c0ludHJpbnNpY09yQXV0bygpKSB7CisgICAgaWYgKCFsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWNP ckF1dG8oKSAmJiAhbG9naWNhbFdpZHRoLmlzTWluSW50cmluc2ljKCkpIHsKICAgICAgICAgLy8g RklYTUU6IElmIHRoZSBjb250YWluaW5nIGJsb2NrIGZsb3cgaXMgcGVycGVuZGljdWxhciB0byBv dXIgZGlyZWN0aW9uIHdlIG5lZWQgdG8gdXNlIHRoZSBhdmFpbGFibGUgbG9naWNhbCBoZWlnaHQg aW5zdGVhZC4KICAgICAgICAgcmV0dXJuIGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJv eFNpemluZyh2YWx1ZUZvckxlbmd0aChsb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0 aCksIGxvZ2ljYWxXaWR0aC50eXBlKCkpOwogICAgIH0KIAotICAgIGlmIChsb2dpY2FsV2lkdGgu aXNJbnRyaW5zaWMoKSkKKyAgICBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkgfHwgbG9n aWNhbFdpZHRoLmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBjb21wdXRlSW50cmlu c2ljTG9naWNhbFdpZHRoVXNpbmcobG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgs IGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKSk7CiAKICAgICBMYXlvdXRVbml0IG1hcmdp blN0YXJ0OwpAQCAtNTA5OCw3ICs1MTA5LDcgQEAgYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1 dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgYXV0byBoID0gc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7Ci0gICAgcmV0dXJu IGguaXNBdXRvKCkgfHwgKCFpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBoLmlzUGVyY2VudE9y Q2FsY3VsYXRlZCgpICYmICFwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKTsK KyAgICByZXR1cm4gaC5pc0F1dG8oKSB8fCBoLmlzSW50cmluc2ljKCkgfHwgKCFpc091dE9mRmxv d1Bvc2l0aW9uZWQoKSAmJiBoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmICFwZXJjZW50YWdl TG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKTsKIH0KIAogYm9vbCBSZW5kZXJCb3g6OnNob3Vs ZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdApAQCAtNTEzNCw3ICs1 MTQ1LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIKICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9 IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRl bnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIExheW91dFVuaXQoc3R5bGUo KS5sb2dpY2FsQXNwZWN0UmF0aW8oKSksIHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8o KSwgbG9naWNhbEhlaWdodGZvckFzcGVjdFJhdGlvKTsKIAogICAgIExheW91dFVuaXQgY29udGFp bmVyV2lkdGhJbklubGluZURpcmVjdGlvbiA9IHN0ZDo6bWF4PExheW91dFVuaXQ+KDAsIGNvbnRh aW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnRJbkZyYWdtZW50KGZyYWdtZW50KSk7Ci0g ICAgcmV0dXJuIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2Fs V2lkdGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2so KSwgZnJhZ21lbnQpOworICAgIHJldHVybiBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50 QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAq Y29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50LCBmYWxzZSk7CiB9CiAKIHN0ZDo6cGFpcjxMYXlv dXRVbml0LCBMYXlvdXRVbml0PiBSZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmlu ZGV4IDZkZTZlZDZhYzZiOTY4OGZjYjM2NDhkYmI0YjJlYzlhMDliYjE0MjQuLmNlYmRkOTFlMzVh NmZlMzc0MDlkNmRkOTBjYTA3M2E5OWZhMWRjNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmgKQEAgLTg1LDcgKzg1LDcgQEAgcHVibGljOgogICAgIExheW91dFVuaXQgbG9naWNh bFdpZHRoKCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgp ID8gd2lkdGgoKSA6IGhlaWdodCgpOyB9CiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkg Y29uc3QgeyByZXR1cm4gc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gaGVpZ2h0 KCkgOiB3aWR0aCgpOyB9CiAKLSAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aElu RnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRVbml0LCBSZW5kZXJCbG9jayYsIFJl bmRlckZyYWdtZW50Q29udGFpbmVyKiA9IG51bGxwdHIpIGNvbnN0OworICAgIExheW91dFVuaXQg Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQsIExheW91 dFVuaXQsIFJlbmRlckJsb2NrJiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqLCBib29sIGFsbG93 SW50cmluc2ljID0gdHJ1ZSkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2Fs SGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBPcHRpb25hbDxMYXlvdXRV bml0PiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbnN0 cmFpbkNvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVp Z2h0LCBPcHRpb25hbDxMYXlvdXRVbml0PiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSBjb25zdDsK IApAQCAtNjQ5LDYgKzY0OSwxMCBAQCBvdmVycmlkZTsKIAogICAgIExheW91dFJlY3QgYWJzb2x1 dGVBbmNob3JSZWN0V2l0aFNjcm9sbE1hcmdpbihib29sKiBpbnNpZGVGaXhlZCA9IG51bGxwdHIp IGNvbnN0IG92ZXJyaWRlOwogCisgICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZy b21Bc3BlY3RSYXRpbygpIGNvbnN0OworICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0 aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OworICAgIExheW91dFVuaXQgY29tcHV0ZUxvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBj b25zdDsKKwogcHJvdGVjdGVkOgogICAgIFJlbmRlckJveChFbGVtZW50JiwgUmVuZGVyU3R5bGUm JiwgQmFzZVR5cGVGbGFncyk7CiAgICAgUmVuZGVyQm94KERvY3VtZW50JiwgUmVuZGVyU3R5bGUm JiwgQmFzZVR5cGVGbGFncyk7CkBAIC02OTgsMTAgKzcwMiw3IEBAIHByb3RlY3RlZDoKIAogICAg IHZvaWQgaW5jcmVtZW50VmlzdWFsbHlOb25FbXB0eVBpeGVsQ291bnRJZk5lZWRlZChjb25zdCBJ bnRTaXplJik7CiAKLSAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVj dFJhdGlvKCkgY29uc3Q7Ci0gICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKCkgY29uc3Q7CiAgICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJv bUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBjb21wdXRlTG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiA9IG51bGxw dHIpIGNvbnN0OwogICAgIHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBjb21wdXRl TWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CiAKICAgICBzdGF0aWMg TGF5b3V0VW5pdCBibG9ja1NpemVGcm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5pdCBib3JkZXJQYWRk aW5nSW5saW5lU3VtLCBMYXlvdXRVbml0IGJvcmRlclBhZGRpbmdCbG9ja1N1bSwgTGF5b3V0VW5p dCBhc3BlY3RSYXRpbywgQm94U2l6aW5nIGJveFNpemluZywgTGF5b3V0VW5pdCBpbmxpbmVTaXpl KQpAQCAtNzQ5LDYgKzc1MCw3IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBmaWxsQXZhaWxh YmxlTWVhc3VyZShMYXlvdXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYg bWFyZ2luU3RhcnQsIExheW91dFVuaXQmIG1hcmdpbkVuZCkgY29uc3Q7CiAKICAgICB2aXJ0dWFs IHZvaWQgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNh bFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0OworICAgIHZvaWQgY29t cHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBM YXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0Owog CiAgICAgLy8gVGhpcyBmdW5jdGlvbiBjYWxjdWxhdGVzIHRoZSBtaW5pbXVtIGFuZCBtYXhpbXVt IHByZWZlcnJlZCB3aWR0aHMgZm9yIGFuIG9iamVjdC4KICAgICAvLyBUaGVzZSB2YWx1ZXMgYXJl IHVzZWQgaW4gc2hyaW5rLXRvLWZpdCBsYXlvdXQgc3lzdGVtcy4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMWJiYzRiYTJm YzdkZTY3MzUxMDk1MmJjYTVlOWU1NzEzNTA0NGY2Li5jMGEzYTMxNzRmNGNhZDFiODVhMGNmN2I2 ZDEwZmM0YTFlMGU3YmU0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDItMjIgIFJvYiBC dWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBp biBpbnRyaW5zaWMgc2l6aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjA4NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBFbmFibGUgc29tZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICog VGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMi0yMiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFJlc3luYyB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvIGZyb20gdXBzdHJlYW0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDlhYjE2YjI4 NDI3NzU2NzM5Yjc5OTVlZGM2YWVjZDg1NTIyYzFmZGIuLjc5OGNmYWU4MGUxMGE3ZTQ0MTQ4ZjVl Y2VhZGQxNzRmZTI3MzMwNWYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv bnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU0Niw2ICs0NTQ2LDcg QEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFs aXR5LTAwMi50ZW50YXRpdmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9z bG90dGVkLXBsYWNlaG9sZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAorIyAgY29udGFp bi1pbnRyaW5zaWMtc2l6ZQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0 LXJhdGlvLTAyNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAt NDU1OCwxOCArNDU1OSw4IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNi5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlv LTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2lu dHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13 ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNS5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1z aXplLTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2ludHJpbnNpYy1zaXplLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMS5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMi5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNp Yy1zaXplLTAxMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2ludHJpbnNpYy1zaXplLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMxLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVu dC0wMzIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9y ZXBsYWNlZC1lbGVtZW50LTAzMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 421393 2021-02-24 03:39:12 -0800 2021-02-27 04:54:44 -0800 Patch bug-220861-20210224123911.patch text/plain 15582 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjFhZWE2NTNlMTk5ZGEx ZGFlZTE2ZDFkMDEzZWY3ZDQ3NmNiZWU1My4uMmM0NDI3YTQ3ZjczZWEzMzYxZWJmNWVlNmU1NjVh ZmJiNGZjNjFjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTI0ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMS0wMi0yMyAgRnJlZGVyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CiAKICAg ICAgICAgTnVsbHB0ciBjcmFzaCBpbiBSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6cmVtb3ZlUmVk dW5kYW50U3R5bGVzQW5kS2VlcFN0eWxlU3BhbklubGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAKaW5kZXggMWJmOTY5NGNjYjA2YmE2ZmQ1NzA2MjA2YmU5ZDkyNjIx ZWVlYzczMi4uMWExOTA0ODlmZWY1ZDg2YTM0NWE5NmY2NzJmYmM4OGM5ZTRhYTMxOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0yNDI2LDYgKzI0MjYsOCBA QCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKFJl bmRlck9iamVjdCYgY2hpbGQsIExheW91dAogICAgIAogICAgIGlmIChjaGlsZC5pc0JveCgpKSB7 CiAgICAgICAgIGF1dG8mIGJveCA9IGRvd25jYXN0PFJlbmRlckJveD4oY2hpbGQpOworICAgICAg ICBpZiAoYm94LnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAg ICAgICAgICAgIG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heFByZWZlcnJlZExvZ2ljYWxX aWR0aCA9IGJveC5jb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CiAgICAgICAg IGlmIChvdmVycmlkaW5nSGVpZ2h0KQogICAgICAgICAgICAgYm94LnNldE92ZXJyaWRpbmdMb2dp Y2FsSGVpZ2h0KG92ZXJyaWRpbmdIZWlnaHQudmFsdWUoKSk7CiAgICAgICAgIGlmIChvdmVycmlk aW5nV2lkdGgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDUzZmQw ZjBmMzhjYTVhZmQxMDc5ZmRjMzQwNzQ4YjE0YzljMjkwMDAuLjA4ZDA2NTZlNDRhNDIwZTA0NWMz NGJkN2Q0OTdjZDUyYWY5NGQ2ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCkBAIC02NTEsNyArNjUxLDcgQEAgdm9pZCBSZW5kZXJCb3g6OnVwZGF0ZUxheWVyVHJhbnNm b3JtKCkKICAgICAgICAgbGF5ZXIoKS0+dXBkYXRlVHJhbnNmb3JtKCk7CiB9CiAKLUxheW91dFVu aXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5 b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIFJlbmRlckJs b2NrJiBjYiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGZyYWdtZW50KSBjb25zdAorTGF5b3V0 VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChM YXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVy QmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQsIGJvb2wgYWxsb3dJ bnRyaW5zaWMpIGNvbnN0CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlVG9Vc2UgPSBz dHlsZSgpOwogCkBAIC02NjAsMTMgKzY2MCwxNSBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29u c3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbAog ICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6OmNsYW1wKGxvZ2ljYWxXaWR0aCwgbG9naWNhbE1p bldpZHRoLCBsb2dpY2FsTWF4V2lkdGgpOwogICAgIH0KIAotICAgIGlmICghc3R5bGVUb1VzZS5s b2dpY2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpKQorICAgIGlmICghc3R5bGVUb1VzZS5sb2dp Y2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpICYmIChhbGxvd0ludHJpbnNpYyB8fCAhc3R5bGVU b1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc0ludHJpbnNpYygpKSkKICAgICAgICAgbG9naWNhbFdp ZHRoID0gc3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVu dFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCksIGF2YWlsYWJsZVdp ZHRoLCBjYiwgZnJhZ21lbnQpKTsKKyAgICBpZiAoIWFsbG93SW50cmluc2ljICYmIHN0eWxlVG9V c2UubG9naWNhbE1pbldpZHRoKCkuaXNJbnRyaW5zaWMoKSkKKyAgICAgICAgcmV0dXJuIGxvZ2lj YWxXaWR0aDsKICAgICBhdXRvIG1pbkxlbmd0aCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRo KCk7Ci0gICAgaWYgKHN0eWxlVG9Vc2UuaGFzQXNwZWN0UmF0aW8oKSAmJiBzdHlsZVRvVXNlLmxv Z2ljYWxXaWR0aCgpLmlzQXV0bygpICYmIG1pbkxlbmd0aC5pc0F1dG8oKSAmJiBzdHlsZVRvVXNl Lm92ZXJmbG93SW5saW5lRGlyZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKKyAgICBp ZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIG1pbkxlbmd0aC5pc0F1dG8oKSAmJiAo c3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSB8fCBzdHlsZVRvVXNlLmxvZ2ljYWxX aWR0aCgpLmlzTWluQ29udGVudCgpIHx8IHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNNYXhD b250ZW50KCkpICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVy Zmxvdzo6VmlzaWJsZSkgewogICAgICAgICAvLyBNYWtlIHN1cmUgd2UgYWN0dWFsbHkgdXNlZCB0 aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZy b21Bc3BlY3RSYXRpbygpKQotICAgICAgICAgICAgbWluTGVuZ3RoID0gTGVuZ3RoKExlbmd0aFR5 cGU6Ok1pbkNvbnRlbnQpOworICAgICAgICAgICAgbWluTGVuZ3RoID0gTGVuZ3RoKExlbmd0aFR5 cGU6Ok1pbkludHJpbnNpYyk7CiAgICAgfQogICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2FsV2lk dGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWluU2l6ZSwgbWluTGVuZ3Ro LCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CiB9CkBAIC02ODEsNyArNjgzLDcgQEAg TGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlv dXRVbml0IGxvZ2ljYWxIZWlnaHQsIE8KICAgICBhdXRvIGxvZ2ljYWxNaW5IZWlnaHQgPSBzdHls ZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKTsKICAgICBpZiAobG9naWNhbE1pbkhlaWdodC5pc0F1 dG8oKSAmJiBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpICYmIGlu dHJpbnNpY0NvbnRlbnRIZWlnaHQgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0Jsb2NrRGlyZWN0aW9u KCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpCiAgICAgICAgIGxvZ2ljYWxNaW5IZWlnaHQgPSBMZW5n dGgoKmludHJpbnNpY0NvbnRlbnRIZWlnaHQsIExlbmd0aFR5cGU6OkZpeGVkKTsKLSAgICBpZiAo bG9naWNhbE1pbkhlaWdodC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsTWluSGVpZ2h0LmlzTWF4 Q29udGVudCgpKQorICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzTWluQ29udGVudCgpIHx8IGxv Z2ljYWxNaW5IZWlnaHQuaXNNYXhDb250ZW50KCkgfHwgbG9naWNhbE1pbkhlaWdodC5pc01pbklu dHJpbnNpYygpKQogICAgICAgICBsb2dpY2FsTWluSGVpZ2h0ID0gTGVuZ3RoKCk7CiAgICAgaWYg KE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTG9naWNhbEhlaWdodCA9IGNvbXB1dGVMb2dp Y2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgbG9naWNhbE1pbkhlaWdodCwgaW50cmluc2ljQ29udGVu dEhlaWdodCkpCiAgICAgICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2FsSGVpZ2h0LCBjb21wdXRl ZExvZ2ljYWxIZWlnaHQudmFsdWUoKSk7CkBAIC0yNjA1LDYgKzI2MDcsMTUgQEAgTGF5b3V0VW5p dCBSZW5kZXJCb3g6OmZpbGxBdmFpbGFibGVNZWFzdXJlKExheW91dFVuaXQgYXZhaWxhYmxlTG9n aWNhbFdpZHRoLCBMYXkKICAgICByZXR1cm4gYXZhaWxhYmxlTG9naWNhbFdpZHRoIC0gbWFyZ2lu U3RhcnQgLSBtYXJnaW5FbmQ7CiB9CiAKK3ZvaWQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2lj TG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1h eExvZ2ljYWxXaWR0aCwgYm9vbCBhbGxvd0ludHJpbnNpYykgY29uc3QKK3sKKyAgICBpZiAoYWxs b3dJbnRyaW5zaWMgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygp KSB7CisgICAgICAgIG1pbkxvZ2ljYWxXaWR0aCA9IG1heExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVM b2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAg ICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2lj YWxXaWR0aCk7Cit9CisKIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9n aWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0aCwgTGF5b3V0VW5pdCBhdmFp bGFibGVMb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZykgY29uc3QKIHsK ICAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzRmlsbEF2YWlsYWJsZSgpKQpAQCAtMjYxMiw5 ICsyNjIzLDkgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs V2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRoTGVuZ3QKIAogICAgIExheW91dFVuaXQgbWlu TG9naWNhbFdpZHRoOwogICAgIExheW91dFVuaXQgbWF4TG9naWNhbFdpZHRoOwotICAgIGNvbXB1 dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRo KTsKKyAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1h eExvZ2ljYWxXaWR0aCwgIWxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNpYygpKTsKIAot ICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250ZW50KCkpCisgICAgaWYgKGxvZ2lj YWxXaWR0aExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5J bnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJuIG1pbkxvZ2ljYWxXaWR0aCArIGJvcmRlckFuZFBh ZGRpbmc7CiAKICAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWF4Q29udGVudCgpKQpAQCAt MjYzNywxMiArMjY0OCwxMiBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxX aWR0aEluRnJhZ21lbnRVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbgogICAgIGlmICh3aWR0 aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkpCiAgICAgICAgIHJldHVy biBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoMCwgbG9naWNhbFdpZHRo LnR5cGUoKSk7CiAKLSAgICBpZiAoIWxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpY09yQXV0bygpKSB7 CisgICAgaWYgKCFsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWNPckF1dG8oKSAmJiAhbG9naWNhbFdp ZHRoLmlzTWluSW50cmluc2ljKCkpIHsKICAgICAgICAgLy8gRklYTUU6IElmIHRoZSBjb250YWlu aW5nIGJsb2NrIGZsb3cgaXMgcGVycGVuZGljdWxhciB0byBvdXIgZGlyZWN0aW9uIHdlIG5lZWQg dG8gdXNlIHRoZSBhdmFpbGFibGUgbG9naWNhbCBoZWlnaHQgaW5zdGVhZC4KICAgICAgICAgcmV0 dXJuIGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0 aChsb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCksIGxvZ2ljYWxXaWR0aC50eXBl KCkpOwogICAgIH0KIAotICAgIGlmIChsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWMoKSkKKyAgICBp ZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkgfHwgbG9naWNhbFdpZHRoLmlzTWluSW50cmlu c2ljKCkpCiAgICAgICAgIHJldHVybiBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmco bG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIGJvcmRlckFuZFBhZGRpbmdMb2dp Y2FsV2lkdGgoKSk7CiAKICAgICBMYXlvdXRVbml0IG1hcmdpblN0YXJ0OwpAQCAtNTA5OCw3ICs1 MTA5LDcgQEAgYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFz cGVjdFJhdGlvKCkgY29uc3QKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgYXV0byBoID0g c3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7Ci0gICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgKCFpc091 dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmICFwZXJj ZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKTsKKyAgICByZXR1cm4gaC5pc0F1dG8o KSB8fCBoLmlzSW50cmluc2ljKCkgfHwgKCFpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBoLmlz UGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmICFwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2 YWJsZSgpKTsKIH0KIAogYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8oKSBjb25zdApAQCAtNTEzNCw3ICs1MTQ1LDcgQEAgTGF5b3V0VW5pdCBS ZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21l bnRDb250YWluZXIKICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IGlubGluZVNpemVGcm9tQXNwZWN0 UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJB bmRQYWRkaW5nRXh0ZW50KCksIExheW91dFVuaXQoc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8o KSksIHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSwgbG9naWNhbEhlaWdodGZvckFz cGVjdFJhdGlvKTsKIAogICAgIExheW91dFVuaXQgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVj dGlvbiA9IHN0ZDo6bWF4PExheW91dFVuaXQ+KDAsIGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0 aEZvckNvbnRlbnRJbkZyYWdtZW50KGZyYWdtZW50KSk7Ci0gICAgcmV0dXJuIGNvbnN0cmFpbkxv Z2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lkdGgsIGNvbnRhaW5lcldpZHRo SW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2soKSwgZnJhZ21lbnQpOworICAgIHJl dHVybiBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRo LCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZy YWdtZW50LCBmYWxzZSk7CiB9CiAKIHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBS ZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25z dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDZkZTZlZDZhYzZiOTY4OGZj YjM2NDhkYmI0YjJlYzlhMDliYjE0MjQuLmNlYmRkOTFlMzVhNmZlMzc0MDlkNmRkOTBjYTA3M2E5 OWZhMWRjNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTg1LDcgKzg1 LDcgQEAgcHVibGljOgogICAgIExheW91dFVuaXQgbG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1 cm4gc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gd2lkdGgoKSA6IGhlaWdodCgp OyB9CiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gc3R5bGUo KS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gaGVpZ2h0KCkgOiB3aWR0aCgpOyB9CiAKLSAg ICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlv dXRVbml0LCBMYXlvdXRVbml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZyYWdtZW50Q29udGFpbmVy KiA9IG51bGxwdHIpIGNvbnN0OworICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbFdpZHRo SW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQsIExheW91dFVuaXQsIFJlbmRlckJsb2NrJiwg UmVuZGVyRnJhZ21lbnRDb250YWluZXIqLCBib29sIGFsbG93SW50cmluc2ljID0gdHJ1ZSkgY29u c3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0 VW5pdCBsb2dpY2FsSGVpZ2h0LCBPcHRpb25hbDxMYXlvdXRVbml0PiBpbnRyaW5zaWNDb250ZW50 SGVpZ2h0KSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkNvbnRlbnRCb3hMb2dpY2Fs SGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBPcHRpb25hbDxMYXlvdXRV bml0PiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSBjb25zdDsKIApAQCAtNjQ5LDYgKzY0OSwxMCBA QCBvdmVycmlkZTsKIAogICAgIExheW91dFJlY3QgYWJzb2x1dGVBbmNob3JSZWN0V2l0aFNjcm9s bE1hcmdpbihib29sKiBpbnNpZGVGaXhlZCA9IG51bGxwdHIpIGNvbnN0IG92ZXJyaWRlOwogCisg ICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0 OworICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNv bnN0OworICAgIExheW91dFVuaXQgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhS ZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKwogcHJvdGVjdGVkOgog ICAgIFJlbmRlckJveChFbGVtZW50JiwgUmVuZGVyU3R5bGUmJiwgQmFzZVR5cGVGbGFncyk7CiAg ICAgUmVuZGVyQm94KERvY3VtZW50JiwgUmVuZGVyU3R5bGUmJiwgQmFzZVR5cGVGbGFncyk7CkBA IC02OTgsMTAgKzcwMiw3IEBAIHByb3RlY3RlZDoKIAogICAgIHZvaWQgaW5jcmVtZW50VmlzdWFs bHlOb25FbXB0eVBpeGVsQ291bnRJZk5lZWRlZChjb25zdCBJbnRTaXplJik7CiAKLSAgICBib29s IHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7Ci0gICAg Ym9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CiAg ICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRz KCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJh dGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiA9IG51bGxwdHIpIGNvbnN0OwogICAgIHN0ZDo6 cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJv bUFzcGVjdFJhdGlvKCkgY29uc3Q7CiAKICAgICBzdGF0aWMgTGF5b3V0VW5pdCBibG9ja1NpemVG cm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nSW5saW5lU3VtLCBMYXlvdXRV bml0IGJvcmRlclBhZGRpbmdCbG9ja1N1bSwgTGF5b3V0VW5pdCBhc3BlY3RSYXRpbywgQm94U2l6 aW5nIGJveFNpemluZywgTGF5b3V0VW5pdCBpbmxpbmVTaXplKQpAQCAtNzQ5LDYgKzc1MCw3IEBA IHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBmaWxsQXZhaWxhYmxlTWVhc3VyZShMYXlvdXRVbml0 IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWFyZ2luU3RhcnQsIExheW91dFVu aXQmIG1hcmdpbkVuZCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZUludHJpbnNp Y0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBt YXhMb2dpY2FsV2lkdGgpIGNvbnN0OworICAgIHZvaWQgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxX aWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2Fs V2lkdGgsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0OwogCiAgICAgLy8gVGhpcyBmdW5jdGlv biBjYWxjdWxhdGVzIHRoZSBtaW5pbXVtIGFuZCBtYXhpbXVtIHByZWZlcnJlZCB3aWR0aHMgZm9y IGFuIG9iamVjdC4KICAgICAvLyBUaGVzZSB2YWx1ZXMgYXJlIHVzZWQgaW4gc2hyaW5rLXRvLWZp dCBsYXlvdXQgc3lzdGVtcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2ZTg5OTAyYzg1NjJkZDM0NDdlMGFjMGY2YmE4NzE4 YTlmOWVhNTY5Li4wNDNmMWYxZDFmNGQxMmQwNjE2N2RkNjc5MTMyN2FjYWIyYmVkOGE3IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDItMjQgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv bT4KKworICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBpbiBpbnRyaW5zaWMgc2l6aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA4NjEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgc29t ZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwog MjAyMS0wMi0yNCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIE51bGwg Y2hlY2sgQXJyYXlCdWZmZXJWaWV3IFJlZlB0cgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVz dEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYjc2MDQ4 MTQzNmM2MTA0MWViOTc1YWQ3ZjVmYjIxNjhlZTFhNWU2ZS4uZTkxNTZkNThkYjMyYmMxMjEwYTVk YTI0ZTg4Yzk5OWQ5ODViMzZkOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0 aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTQ2LDYgKzQ1NDYs NyBAQCB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zY29waW5nL3NoYWRvdy1kaXJlYwogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWN0aW9u YWxpdHktMDAyLnRlbnRhdGl2ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn L2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5n L3Nsb3R0ZWQtcGxhY2Vob2xkZXIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCisjICBjb250 YWluLWludHJpbnNpYy1zaXplCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3Bl Y3QtcmF0aW8tMDI0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCkBA IC00NTU2LDIwICs0NTU3LDkgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0 aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v Z3JpZC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUt MDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50 cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA2Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA4Lmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNp emUtMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v aW50cmluc2ljLXNpemUtMDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEzLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDE0Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2lj LXNpemUtMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vcmVwbGFjZWQtZWxlbWVudC0wMzEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMzLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0K 421744 2021-02-27 04:54:48 -0800 2021-02-27 10:44:24 -0800 Patch bug-220861-20210227135447.patch text/plain 15954 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjcwYmYzZWNjMmY3ZWRk Mjk0YThmZmZkMDI2MWExYTQyNWVmNjZmMi4uYmEzMTU1MGMwMjU3MDE0YWI0ZGVlMDZiNzAxYTc3 MzQ5Njk4NmEwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTI3ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUlu dHJpbnNpY0xvZ2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMS0wMi0yNyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVuZGVyIHRyZWUgdXBkYXRlcyBmb3IgVGV4dCBub2RlIGNvbnRlbnQgbXV0YXRpb25z IHNob3VsZCBoYXBwZW4gZHVyaW5nIHJlbmRlcmluZyB1cGRhdGUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IDFiZjk2OTRjY2IwNmJhNmZkNTcwNjIwNmJlOWQ5 MjYyMWVlZWM3MzIuLjE0ODcxNGNiOWNjNWUzYmI3OGI4NDg3NTM3MWJkYTRjNDBiYjBhM2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMjI4Miw2ICsyMjgy LDggQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQog ICAgIGlmICghaXNUYWJsZUNlbGwoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzRml4 ZWQoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLnZhbHVlKCkgPj0gMAogICAgICAgICAm JiAhKGlzRGVwcmVjYXRlZEZsZXhJdGVtKCkgJiYgIXN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCku aW50VmFsdWUoKSkpCiAgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbV9tYXhQ cmVmZXJyZWRMb2dpY2FsV2lkdGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94 U2l6aW5nKHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkpOworICAgIGVsc2UgaWYgKHNob3VsZENv bXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgbV9taW5QcmVmZXJy ZWRMb2dpY2FsV2lkdGggPSBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVMb2dp Y2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKICAgICBlbHNlCiAgICAgICAgIGNvbXB1dGVJbnRy aW5zaWNMb2dpY2FsV2lkdGhzKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBtX21heFByZWZl cnJlZExvZ2ljYWxXaWR0aCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK aW5kZXggNTNmZDBmMGYzOGNhNWFmZDEwNzlmZGMzNDA3NDhiMTRjOWMyOTAwMC4uMDhkMDY1NmU0 NGE0MjBlMDQ1YzM0YmQ3ZDQ5N2NkNTJhZjk0ZDZlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5jcHAKQEAgLTY1MSw3ICs2NTEsNyBAQCB2b2lkIFJlbmRlckJveDo6dXBkYXRl TGF5ZXJUcmFuc2Zvcm0oKQogICAgICAgICBsYXllcigpLT51cGRhdGVUcmFuc2Zvcm0oKTsKIH0K IAotTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRC eU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0 aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQpIGNv bnN0CitMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdp ZHRoLCBSZW5kZXJCbG9jayYgY2IsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCwg Ym9vbCBhbGxvd0ludHJpbnNpYykgY29uc3QKIHsKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5 bGVUb1VzZSA9IHN0eWxlKCk7CiAKQEAgLTY2MCwxMyArNjYwLDE1IEBAIExheW91dFVuaXQgUmVu ZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5p dCBsb2dpY2FsCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRo LCBsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CiAgICAgfQogCi0gICAgaWYgKCFz dHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCisgICAgaWYgKCFzdHls ZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgKGFsbG93SW50cmluc2lj IHx8ICFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzSW50cmluc2ljKCkpKQogICAgICAg ICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lk dGhJbkZyYWdtZW50VXNpbmcoTWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwg YXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOworICAgIGlmICghYWxsb3dJbnRyaW5zaWMg JiYgc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKQorICAgICAgICBy ZXR1cm4gbG9naWNhbFdpZHRoOwogICAgIGF1dG8gbWluTGVuZ3RoID0gc3R5bGVUb1VzZS5sb2dp Y2FsTWluV2lkdGgoKTsKLSAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIHN0 eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYm IHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJs ZSkgeworICAgIGlmIChzdHlsZVRvVXNlLmhhc0FzcGVjdFJhdGlvKCkgJiYgbWluTGVuZ3RoLmlz QXV0bygpICYmIChzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8IHN0eWxlVG9V c2UubG9naWNhbFdpZHRoKCkuaXNNaW5Db250ZW50KCkgfHwgc3R5bGVUb1VzZS5sb2dpY2FsV2lk dGgoKS5pc01heENvbnRlbnQoKSkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0lubGluZURpcmVjdGlv bigpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CiAgICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSBhY3R1 YWxseSB1c2VkIHRoZSBhc3BlY3QgcmF0aW8uCiAgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCi0gICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5n dGgoTGVuZ3RoVHlwZTo6TWluQ29udGVudCk7CisgICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5n dGgoTGVuZ3RoVHlwZTo6TWluSW50cmluc2ljKTsKICAgICB9CiAgICAgcmV0dXJuIHN0ZDo6bWF4 KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXpl LCBtaW5MZW5ndGgsIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKIH0KQEAgLTY4MSw3 ICs2ODMsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5 TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTwogICAgIGF1dG8gbG9naWNhbE1pbkhl aWdodCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpOwogICAgIGlmIChsb2dpY2FsTWlu SGVpZ2h0LmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJh dGlvKCkgJiYgaW50cmluc2ljQ29udGVudEhlaWdodCAmJiBzdHlsZVRvVXNlLm92ZXJmbG93Qmxv Y2tEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkKICAgICAgICAgbG9naWNhbE1pbkhl aWdodCA9IExlbmd0aCgqaW50cmluc2ljQ29udGVudEhlaWdodCwgTGVuZ3RoVHlwZTo6Rml4ZWQp OwotICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzTWluQ29udGVudCgpIHx8IGxvZ2ljYWxNaW5I ZWlnaHQuaXNNYXhDb250ZW50KCkpCisgICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQuaXNNaW5Db250 ZW50KCkgfHwgbG9naWNhbE1pbkhlaWdodC5pc01heENvbnRlbnQoKSB8fCBsb2dpY2FsTWluSGVp Z2h0LmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIGxvZ2ljYWxNaW5IZWlnaHQgPSBMZW5ndGgo KTsKICAgICBpZiAoT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29tcHV0ZWRMb2dpY2FsSGVpZ2h0ID0g Y29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhNaW5TaXplLCBsb2dpY2FsTWluSGVpZ2h0LCBpbnRy aW5zaWNDb250ZW50SGVpZ2h0KSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxIZWln aHQsIGNvbXB1dGVkTG9naWNhbEhlaWdodC52YWx1ZSgpKTsKQEAgLTI2MDUsNiArMjYwNywxNSBA QCBMYXlvdXRVbml0IFJlbmRlckJveDo6ZmlsbEF2YWlsYWJsZU1lYXN1cmUoTGF5b3V0VW5pdCBh dmFpbGFibGVMb2dpY2FsV2lkdGgsIExheQogICAgIHJldHVybiBhdmFpbGFibGVMb2dpY2FsV2lk dGggLSBtYXJnaW5TdGFydCAtIG1hcmdpbkVuZDsKIH0KIAordm9pZCBSZW5kZXJCb3g6OmNvbXB1 dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5 b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoLCBib29sIGFsbG93SW50cmluc2ljKSBjb25zdAorewor ICAgIGlmIChhbGxvd0ludHJpbnNpYyAmJiBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKCkpIHsKKyAgICAgICAgbWluTG9naWNhbFdpZHRoID0gbWF4TG9naWNhbFdpZHRo ID0gY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpOworICAgICAgICByZXR1cm47 CisgICAgfQorICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0 aCwgbWF4TG9naWNhbFdpZHRoKTsKK30KKwogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVJ bnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRoTGVuZ3RoLCBMYXlv dXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5n KSBjb25zdAogewogICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNGaWxsQXZhaWxhYmxlKCkp CkBAIC0yNjEyLDkgKzI2MjMsOSBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhMZW5ndAogCiAgICAgTGF5 b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGg7CiAgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGg7 Ci0gICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhM b2dpY2FsV2lkdGgpOworICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2lj YWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoLCAhbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmlu c2ljKCkpOwogCi0gICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkNvbnRlbnQoKSkKKyAg ICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29udGVudCgpIHx8IGxvZ2ljYWxXaWR0aExl bmd0aC5pc01pbkludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gbWluTG9naWNhbFdpZHRoICsg Ym9yZGVyQW5kUGFkZGluZzsKIAogICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNYXhDb250 ZW50KCkpCkBAIC0yNjM3LDEyICsyNjQ4LDEyIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21w dXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuCiAg ICAgaWYgKHdpZHRoVHlwZSA9PSBNaW5TaXplICYmIGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSkKICAg ICAgICAgcmV0dXJuIGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZygwLCBs b2dpY2FsV2lkdGgudHlwZSgpKTsKIAotICAgIGlmICghbG9naWNhbFdpZHRoLmlzSW50cmluc2lj T3JBdXRvKCkpIHsKKyAgICBpZiAoIWxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpY09yQXV0bygpICYm ICFsb2dpY2FsV2lkdGguaXNNaW5JbnRyaW5zaWMoKSkgewogICAgICAgICAvLyBGSVhNRTogSWYg dGhlIGNvbnRhaW5pbmcgYmxvY2sgZmxvdyBpcyBwZXJwZW5kaWN1bGFyIHRvIG91ciBkaXJlY3Rp b24gd2UgbmVlZCB0byB1c2UgdGhlIGF2YWlsYWJsZSBsb2dpY2FsIGhlaWdodCBpbnN0ZWFkLgog ICAgICAgICByZXR1cm4gYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZh bHVlRm9yTGVuZ3RoKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoKSwgbG9naWNh bFdpZHRoLnR5cGUoKSk7CiAgICAgfQogCi0gICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNp YygpKQorICAgIGlmIChsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWMoKSB8fCBsb2dpY2FsV2lkdGgu aXNNaW5JbnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJuIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs V2lkdGhVc2luZyhsb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgYm9yZGVyQW5k UGFkZGluZ0xvZ2ljYWxXaWR0aCgpKTsKIAogICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQ7CkBA IC01MDk4LDcgKzUxMDksNyBAQCBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxI ZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICBhdXRvIGggPSBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKLSAgICByZXR1cm4gaC5pc0F1dG8o KSB8fCAoIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIGguaXNQZXJjZW50T3JDYWxjdWxhdGVk KCkgJiYgIXBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpOworICAgIHJldHVy biBoLmlzQXV0bygpIHx8IGguaXNJbnRyaW5zaWMoKSB8fCAoIWlzT3V0T2ZGbG93UG9zaXRpb25l ZCgpICYmIGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgIXBlcmNlbnRhZ2VMb2dpY2FsSGVp Z2h0SXNSZXNvbHZhYmxlKCkpOwogfQogCiBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxv Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CkBAIC01MTM0LDcgKzUxNDUsNyBAQCBM YXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhS ZW5kZXJGcmFnbWVudENvbnRhaW5lcgogICAgIGF1dG8gbG9naWNhbFdpZHRoID0gaW5saW5lU2l6 ZUZyb21Bc3BlY3RSYXRpbyhob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0 aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgTGF5b3V0VW5pdChzdHlsZSgpLmxvZ2ljYWxB c3BlY3RSYXRpbygpKSwgc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpLCBsb2dpY2Fs SGVpZ2h0Zm9yQXNwZWN0UmF0aW8pOwogCiAgICAgTGF5b3V0VW5pdCBjb250YWluZXJXaWR0aElu SW5saW5lRGlyZWN0aW9uID0gc3RkOjptYXg8TGF5b3V0VW5pdD4oMCwgY29udGFpbmluZ0Jsb2Nr TG9naWNhbFdpZHRoRm9yQ29udGVudEluRnJhZ21lbnQoZnJhZ21lbnQpKTsKLSAgICByZXR1cm4g Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29u dGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVu dCk7CisgICAgcmV0dXJuIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChs b2dpY2FsV2lkdGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5n QmxvY2soKSwgZnJhZ21lbnQsIGZhbHNlKTsKIH0KIAogc3RkOjpwYWlyPExheW91dFVuaXQsIExh eW91dFVuaXQ+IFJlbmRlckJveDo6Y29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RS YXRpbygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggNmRlNmVk NmFjNmI5Njg4ZmNiMzY0OGRiYjRiMmVjOWEwOWJiMTQyNC4uY2ViZGQ5MWUzNWE2ZmUzNzQwOWQ2 ZGQ5MGNhMDczYTk5ZmExZGM0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApA QCAtODUsNyArODUsNyBAQCBwdWJsaWM6CiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBj b25zdCB7IHJldHVybiBzdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyB3aWR0aCgp IDogaGVpZ2h0KCk7IH0KICAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJl dHVybiBzdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBoZWlnaHQoKSA6IHdpZHRo KCk7IH0KIAotICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5 TWluTWF4KExheW91dFVuaXQsIExheW91dFVuaXQsIFJlbmRlckJsb2NrJiwgUmVuZGVyRnJhZ21l bnRDb250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5M b2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVu ZGVyQmxvY2smLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciosIGJvb2wgYWxsb3dJbnRyaW5zaWMg PSB0cnVlKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1p bk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIE9wdGlvbmFsPExheW91dFVuaXQ+IGludHJp bnNpY0NvbnRlbnRIZWlnaHQpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29uc3RyYWluQ29udGVu dEJveExvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIE9wdGlv bmFsPExheW91dFVuaXQ+IGludHJpbnNpY0NvbnRlbnRIZWlnaHQpIGNvbnN0OwogCkBAIC02NDks NiArNjQ5LDEwIEBAIG92ZXJyaWRlOwogCiAgICAgTGF5b3V0UmVjdCBhYnNvbHV0ZUFuY2hvclJl Y3RXaXRoU2Nyb2xsTWFyZ2luKGJvb2wqIGluc2lkZUZpeGVkID0gbnVsbHB0cikgY29uc3Qgb3Zl cnJpZGU7CiAKKyAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJh dGlvKCkgY29uc3Q7CisgICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvKCkgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiA9IG51bGxwdHIpIGNvbnN0OworCiBw cm90ZWN0ZWQ6CiAgICAgUmVuZGVyQm94KEVsZW1lbnQmLCBSZW5kZXJTdHlsZSYmLCBCYXNlVHlw ZUZsYWdzKTsKICAgICBSZW5kZXJCb3goRG9jdW1lbnQmLCBSZW5kZXJTdHlsZSYmLCBCYXNlVHlw ZUZsYWdzKTsKQEAgLTY5OCwxMCArNzAyLDcgQEAgcHJvdGVjdGVkOgogCiAgICAgdm9pZCBpbmNy ZW1lbnRWaXN1YWxseU5vbkVtcHR5UGl4ZWxDb3VudElmTmVlZGVkKGNvbnN0IEludFNpemUmKTsK IAotICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBj b25zdDsKLSAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8o KSBjb25zdDsKICAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW9BbmRJbnNldHMoKSBjb25zdDsKLSAgICBMYXlvdXRVbml0IGNvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7 CiAgICAgc3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+IGNvbXB1dGVNaW5NYXhMb2dp Y2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKIAogICAgIHN0YXRpYyBMYXlvdXRVbml0 IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0IGJvcmRlclBhZGRpbmdJbmxpbmVT dW0sIExheW91dFVuaXQgYm9yZGVyUGFkZGluZ0Jsb2NrU3VtLCBMYXlvdXRVbml0IGFzcGVjdFJh dGlvLCBCb3hTaXppbmcgYm94U2l6aW5nLCBMYXlvdXRVbml0IGlubGluZVNpemUpCkBAIC03NDks NiArNzUwLDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IGZpbGxBdmFpbGFibGVNZWFzdXJl KExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXJnaW5TdGFy dCwgTGF5b3V0VW5pdCYgbWFyZ2luRW5kKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9pZCBjb21w dXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExh eW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkgY29uc3Q7CisgICAgdm9pZCBjb21wdXRlSW50cmlu c2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQm IG1heExvZ2ljYWxXaWR0aCwgYm9vbCBhbGxvd0ludHJpbnNpYykgY29uc3Q7CiAKICAgICAvLyBU aGlzIGZ1bmN0aW9uIGNhbGN1bGF0ZXMgdGhlIG1pbmltdW0gYW5kIG1heGltdW0gcHJlZmVycmVk IHdpZHRocyBmb3IgYW4gb2JqZWN0LgogICAgIC8vIFRoZXNlIHZhbHVlcyBhcmUgdXNlZCBpbiBz aHJpbmstdG8tZml0IGxheW91dCBzeXN0ZW1zLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJjMDMwYzk0Y2VlM2MwNTQwNjY3 ZmU3NDI1ZDlhNmZiM2E4NzAwZDMuLjVlMTgyYWFlMTU5NGUzY2M4NmQ4YjRiZjkzZjVjMGE5Mzdj Mjc1ZjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMi0yNyAgUm9iIEJ1aXMgIDxyYnVp c0BpZ2FsaWEuY29tPgorCisgICAgICAgIFN1cHBvcnQgYXNwZWN0LXJhdGlvIGluIGludHJpbnNp YyBzaXppbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyMDg2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEVuYWJsZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0 YXRpb25zOgorCiAyMDIxLTAyLTI3ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW5kZXIgdHJlZSB1cGRhdGVzIGZvciBUZXh0IG5vZGUgY29udGVudCBtdXRh dGlvbnMgc2hvdWxkIGhhcHBlbiBkdXJpbmcgcmVuZGVyaW5nIHVwZGF0ZQpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv bnMKaW5kZXggZDk1ZDQwZjYxM2NmNzc4MWU0MWNlZjAzZGY3OWU3YjYzNjQ2OTRmMy4uNDUzNzMw MzdkNDI3MDY1NzExZjc2OGI5OTljMjI5Y2MwNTcyODE4YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBA IC00NTQ3LDYgKzQ1NDcsNyBAQCB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3NoYWRvdy1kaXJlYwogd2Via2l0Lm9yZy9i LzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9z aGFkb3ctZGlyZWN0aW9uYWxpdHktMDAyLnRlbnRhdGl2ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQtcGxhY2Vob2xkZXIuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogCisjICBjb250YWluLWludHJpbnNpYy1zaXplCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyOC5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCkBAIC00NTU2LDIxICs0NTU3LDggQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0 aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v ZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3Qt cmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vaW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA1 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmlu c2ljLXNpemUtMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vaW50cmluc2ljLXNpemUtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDExLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUt MDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50 cmluc2ljLXNpemUtMDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDE1Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzEuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1l bGVtZW50LTAzMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 421751 2021-02-27 10:44:28 -0800 2021-02-27 12:56:43 -0800 Patch bug-220861-20210227194427.patch text/plain 13346 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjcwYmYzZWNjMmY3ZWRk Mjk0YThmZmZkMDI2MWExYTQyNWVmNjZmMi4uNjUwZWFmMTgyZjcwMjQ2NGYxNGIzODc4N2ExMWE0 MGU3OWI2ZDQ4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAyLTI3ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZyBjYWxj dWxhdGlvbnMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4IGNvbnN0KToK KyAgICAgICAgQWRkIGFuIGFsbG93SW50cmluc2ljIHBhcmFtZXRlciB0byBwcmV2ZW50IHJlY3Vy c2lvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2lj YWxXaWR0aFVzaW5nIGNvbnN0KToKKyAgICAgICAgQ29tcHV0ZSBpbnRyaW5zaWMgbG9naWNhbCB3 aWR0aCBmcm9tIGFzcGVjdCByYXRpbyBpZiBwb3NzaWJsZS4KKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFz cGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgSGVpZ2h0cyB0aGF0IHVzZSBpbnRyaW5zaWMgc2l6 ZXMgbWVhbiB3ZSBjYW4gY29tcHV0ZSB0aGVtIHVzaW5nIGFzcGVjdCByYXRpby4KKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyBj b25zdCk6CisgICAgICAgIFByZXZlbnQgcmVjdXJzaW9uIGJ5IHBhc3NpbmcgZmFsc2UgZm9yIGFs bG93SW50cmluc2ljLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAyMS0w Mi0yNyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuZGVy IHRyZWUgdXBkYXRlcyBmb3IgVGV4dCBub2RlIGNvbnRlbnQgbXV0YXRpb25zIHNob3VsZCBoYXBw ZW4gZHVyaW5nIHJlbmRlcmluZyB1cGRhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwCmluZGV4IDFiZjk2OTRjY2IwNmJhNmZkNTcwNjIwNmJlOWQ5MjYyMWVlZWM3MzIu LjE0ODcxNGNiOWNjNWUzYmI3OGI4NDg3NTM3MWJkYTRjNDBiYjBhM2UgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMjI4Miw2ICsyMjgyLDggQEAgdm9pZCBS ZW5kZXJCbG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIGlmICghaXNU YWJsZUNlbGwoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzRml4ZWQoKSAmJiBzdHls ZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLnZhbHVlKCkgPj0gMAogICAgICAgICAmJiAhKGlzRGVwcmVj YXRlZEZsZXhJdGVtKCkgJiYgIXN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaW50VmFsdWUoKSkp CiAgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dp Y2FsV2lkdGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxl VG9Vc2UubG9naWNhbFdpZHRoKCkpOworICAgIGVsc2UgaWYgKHNob3VsZENvbXB1dGVMb2dpY2Fs V2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lk dGggPSBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9t QXNwZWN0UmF0aW8oKTsKICAgICBlbHNlCiAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs V2lkdGhzKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJlZExvZ2ljYWxX aWR0aCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNTNmZDBm MGYzOGNhNWFmZDEwNzlmZGMzNDA3NDhiMTRjOWMyOTAwMC4uYmQ2NjIwNDYwZGM5N2U2MDMyNzA3 NDY0MjA0OWRlM2ZiMGNiN2MzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAKQEAgLTY1MSw3ICs2NTEsNyBAQCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTGF5ZXJUcmFuc2Zv cm0oKQogICAgICAgICBsYXllcigpLT51cGRhdGVUcmFuc2Zvcm0oKTsKIH0KIAotTGF5b3V0VW5p dCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxv Y2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQpIGNvbnN0CitMYXlvdXRV bml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExh eW91dFVuaXQgbG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBSZW5kZXJC bG9jayYgY2IsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCwgYm9vbCBhbGxvd0lu dHJpbnNpYykgY29uc3QKIHsKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9IHN0 eWxlKCk7CiAKQEAgLTY2MCwxMyArNjYwLDE1IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25z dHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsCiAg ICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRoLCBsb2dpY2FsTWlu V2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CiAgICAgfQogCi0gICAgaWYgKCFzdHlsZVRvVXNlLmxv Z2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCisgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2lj YWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgKGFsbG93SW50cmluc2ljIHx8ICFzdHlsZVRv VXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzSW50cmluc2ljKCkpKQogICAgICAgICBsb2dpY2FsV2lk dGggPSBzdGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50 VXNpbmcoTWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwgYXZhaWxhYmxlV2lk dGgsIGNiLCBmcmFnbWVudCkpOworICAgIGlmICghYWxsb3dJbnRyaW5zaWMgJiYgc3R5bGVUb1Vz ZS5sb2dpY2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKQorICAgICAgICByZXR1cm4gbG9naWNh bFdpZHRoOwogICAgIGF1dG8gbWluTGVuZ3RoID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgo KTsKLSAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIHN0eWxlVG9Vc2UubG9n aWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIHN0eWxlVG9Vc2Uu b3ZlcmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgeworICAgIGlm IChzdHlsZVRvVXNlLmhhc0FzcGVjdFJhdGlvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIChz dHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8IHN0eWxlVG9Vc2UubG9naWNhbFdp ZHRoKCkuaXNNaW5Db250ZW50KCkgfHwgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc01heENv bnRlbnQoKSkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0lubGluZURpcmVjdGlvbigpID09IE92ZXJm bG93OjpWaXNpYmxlKSB7CiAgICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSBhY3R1YWxseSB1c2VkIHRo ZSBhc3BlY3QgcmF0aW8uCiAgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJv bUFzcGVjdFJhdGlvKCkpCi0gICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlw ZTo6TWluQ29udGVudCk7CisgICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlw ZTo6TWluSW50cmluc2ljKTsKICAgICB9CiAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0 aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBtaW5MZW5ndGgs IGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKIH0KQEAgLTI2MTIsOSArMjYxNCwxMiBA QCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5n KExlbmd0aCBsb2dpY2FsV2lkdGhMZW5ndAogCiAgICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lk dGg7CiAgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGg7Ci0gICAgY29tcHV0ZUludHJpbnNp Y0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOworICAgIGlm ICghbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkgJiYgc2hvdWxkQ29tcHV0ZUxv Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBt YXhMb2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7Cisg ICAgZWxzZQorICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2Fs V2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CiAKLSAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlz TWluQ29udGVudCgpKQorICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250ZW50KCkg fHwgbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBt aW5Mb2dpY2FsV2lkdGggKyBib3JkZXJBbmRQYWRkaW5nOwogCiAgICAgaWYgKGxvZ2ljYWxXaWR0 aExlbmd0aC5pc01heENvbnRlbnQoKSkKQEAgLTI2MzcsMTQgKzI2NDIsMTQgQEAgTGF5b3V0VW5p dCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoU2l6ZVR5cGUg d2lkdGhUeXBlLCBMZW4KICAgICBpZiAod2lkdGhUeXBlID09IE1pblNpemUgJiYgbG9naWNhbFdp ZHRoLmlzQXV0bygpKQogICAgICAgICByZXR1cm4gYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRo Rm9yQm94U2l6aW5nKDAsIGxvZ2ljYWxXaWR0aC50eXBlKCkpOwogCi0gICAgaWYgKCFsb2dpY2Fs V2lkdGguaXNJbnRyaW5zaWNPckF1dG8oKSkgeworICAgIGlmIChsb2dpY2FsV2lkdGguaXNJbnRy aW5zaWMoKSB8fCBsb2dpY2FsV2lkdGguaXNNaW5JbnRyaW5zaWMoKSkKKyAgICAgICAgcmV0dXJu IGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhsb2dpY2FsV2lkdGgsIGF2YWlsYWJs ZUxvZ2ljYWxXaWR0aCwgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpKTsKKworICAgIGlm ICghbG9naWNhbFdpZHRoLmlzQXV0bygpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgY29u dGFpbmluZyBibG9jayBmbG93IGlzIHBlcnBlbmRpY3VsYXIgdG8gb3VyIGRpcmVjdGlvbiB3ZSBu ZWVkIHRvIHVzZSB0aGUgYXZhaWxhYmxlIGxvZ2ljYWwgaGVpZ2h0IGluc3RlYWQuCiAgICAgICAg IHJldHVybiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcodmFsdWVGb3JM ZW5ndGgobG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgpLCBsb2dpY2FsV2lkdGgu dHlwZSgpKTsKICAgICB9CiAKLSAgICBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCi0g ICAgICAgIHJldHVybiBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcobG9naWNhbFdp ZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgo KSk7Ci0KICAgICBMYXlvdXRVbml0IG1hcmdpblN0YXJ0OwogICAgIExheW91dFVuaXQgbWFyZ2lu RW5kOwogICAgIExheW91dFVuaXQgbG9naWNhbFdpZHRoUmVzdWx0ID0gZmlsbEF2YWlsYWJsZU1l YXN1cmUoYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBtYXJnaW5TdGFydCwgbWFyZ2luRW5kKTsKQEAg LTUwOTgsNyArNTEwMyw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhl aWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg IGF1dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwotICAgIHJldHVybiBoLmlzQXV0bygp IHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQo KSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CisgICAgcmV0dXJu IGguaXNBdXRvKCkgfHwgaC5pc0ludHJpbnNpYygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVk KCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWln aHRJc1Jlc29sdmFibGUoKSk7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKQEAgLTUxMzQsNyArNTEzOSw3IEBAIExh eW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJl bmRlckZyYWdtZW50Q29udGFpbmVyCiAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBpbmxpbmVTaXpl RnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRp Y2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9naWNhbEFz cGVjdFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCksIGxvZ2ljYWxI ZWlnaHRmb3JBc3BlY3RSYXRpbyk7CiAKICAgICBMYXlvdXRVbml0IGNvbnRhaW5lcldpZHRoSW5J bmxpbmVEaXJlY3Rpb24gPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBjb250YWluaW5nQmxvY2tM b2dpY2FsV2lkdGhGb3JDb250ZW50SW5GcmFnbWVudChmcmFnbWVudCkpOwotICAgIHJldHVybiBj b25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250 YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50 KTsKKyAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxv Z2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdC bG9jaygpLCBmcmFnbWVudCwgZmFsc2UpOwogfQogCiBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5 b3V0VW5pdD4gUmVuZGVyQm94Ojpjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJh dGlvKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA2ZGU2ZWQ2 YWM2Yjk2ODhmY2IzNjQ4ZGJiNGIyZWM5YTA5YmIxNDI0Li44MGEzYjg5MzFiZTM0YmIxMDE1MDEy YzUzY2RhN2Q5NDMzOGMxMzI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBA IC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNv bnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHdpZHRoKCkg OiBoZWlnaHQoKTsgfQogICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0 dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGhlaWdodCgpIDogd2lkdGgo KTsgfQogCi0gICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlN aW5NYXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5kZXJGcmFnbWVu dENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkxv Z2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRVbml0LCBSZW5k ZXJCbG9jayYsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiwgYm9vbCBhbGxvd0ludHJpbnNpYyA9 IHRydWUpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWlu TWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmlu c2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Db250ZW50 Qm94TG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9u YWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAy YzAzMGM5NGNlZTNjMDU0MDY2N2ZlNzQyNWQ5YTZmYjNhODcwMGQzLi5kY2VlNGU1Yzk4NTUwODFj MWVkZWIyYWU5NDVjM2E1ZTNlMzUwYjgwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDIt MjcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBTdXBwb3J0IGFzcGVj dC1yYXRpbyBpbiBpbnRyaW5zaWMgc2l6aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA4NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBFbmFibGUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAg ICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDItMjcgIEFudHRpIEtvaXZpc3RvICA8YW50 dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmRlciB0cmVlIHVwZGF0ZXMgZm9yIFRleHQgbm9k ZSBjb250ZW50IG11dGF0aW9ucyBzaG91bGQgaGFwcGVuIGR1cmluZyByZW5kZXJpbmcgdXBkYXRl CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMv VGVzdEV4cGVjdGF0aW9ucwppbmRleCBkOTVkNDBmNjEzY2Y3NzgxZTQxY2VmMDNkZjc5ZTdiNjM2 NDY5NGYzLi40NTM3MzAzN2Q0MjcwNjU3MTFmNzY4Yjk5OWMyMjljYzA1NzI4MThhIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKQEAgLTQ1NDcsNiArNDU0Nyw3IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVj CiB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zY29waW5nL3NoYWRvdy1kaXJlY3Rpb25hbGl0eS0wMDIudGVudGF0aXZlLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjZWhvbGRlci5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCiAKKyMgIGNvbnRhaW4taW50cmluc2ljLXNpemUKIHdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ1NTYsMjEgKzQ1NTcsOCBAQCB3ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp by0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m bGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTUuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1y YXRpby0wMTYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9ncmlkLWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDIuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0w MDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRy aW5zaWMtc2l6ZS0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDguaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTAuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6 ZS0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9p bnRyaW5zaWMtc2l6ZS0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTQuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTUuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1l bGVtZW50LTAzMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQo= 421754 2021-02-27 12:56:48 -0800 2021-02-28 13:01:34 -0800 Patch bug-220861-20210227215646.patch text/plain 12651 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGI2YjIzMDMwNTk0ZmUx YzRmYmYzOGMzNTcwYzRiOGM0YzA5MDdmMi4uNmQ1OTI0MmM2ZjVlYmJkNzRiZmJjZWY2YzU5Nzk5 ZjhmZDNjODMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAyLTI3ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZyBjYWxj dWxhdGlvbnMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4IGNvbnN0KToK KyAgICAgICAgQWRkIGFuIGFsbG93SW50cmluc2ljIHBhcmFtZXRlciB0byBwcmV2ZW50IHJlY3Vy c2lvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2lj YWxXaWR0aFVzaW5nIGNvbnN0KToKKyAgICAgICAgQ29tcHV0ZSBpbnRyaW5zaWMgbG9naWNhbCB3 aWR0aCBmcm9tIGFzcGVjdCByYXRpbyBpZiBwb3NzaWJsZS4KKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFz cGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgSGVpZ2h0cyB0aGF0IHVzZSBpbnRyaW5zaWMgc2l6 ZXMgbWVhbiB3ZSBjYW4gY29tcHV0ZSB0aGVtIHVzaW5nIGFzcGVjdCByYXRpby4KKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyBj b25zdCk6CisgICAgICAgIFByZXZlbnQgcmVjdXJzaW9uIGJ5IHBhc3NpbmcgZmFsc2UgZm9yIGFs bG93SW50cmluc2ljLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAyMS0w Mi0yNyAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHN1 cHBvcnQgZm9yICdwaXhlbCcgYW5kICdwb3MnIENTU09NIHByZWZpeGVzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCAxYmY5Njk0Y2NiMDZiYTZmZDU3MDYyMDZi ZTlkOTI2MjFlZWVjNzMyLi4xNDg3MTRjYjljYzVlM2JiNzhiODQ4NzUzNzFiZGE0YzQwYmIwYTNl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTIyODIsNiAr MjI4Miw4IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhz KCkKICAgICBpZiAoIWlzVGFibGVDZWxsKCkgJiYgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5p c0ZpeGVkKCkgJiYgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS52YWx1ZSgpID49IDAKICAgICAg ICAgJiYgIShpc0RlcHJlY2F0ZWRGbGV4SXRlbSgpICYmICFzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0 aCgpLmludFZhbHVlKCkpKQogICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1f bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZv ckJveFNpemluZyhzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpKTsKKyAgICBlbHNlIGlmIChzaG91 bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCisgICAgICAgIG1fbWluUHJl ZmVycmVkTG9naWNhbFdpZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBjb21wdXRl TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CiAgICAgZWxzZQogICAgICAgICBjb21wdXRl SW50cmluc2ljTG9naWNhbFdpZHRocyhtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgbV9tYXhQ cmVmZXJyZWRMb2dpY2FsV2lkdGgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCmluZGV4IDUzZmQwZjBmMzhjYTVhZmQxMDc5ZmRjMzQwNzQ4YjE0YzljMjkwMDAuLjM5MGUx NzlmNjVlNTljYjViNDA1YmNiNDc3ZTcwZmRjYjI4ZTIzZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCkBAIC02NTEsNyArNjUxLDcgQEAgdm9pZCBSZW5kZXJCb3g6OnVw ZGF0ZUxheWVyVHJhbnNmb3JtKCkKICAgICAgICAgbGF5ZXIoKS0+dXBkYXRlVHJhbnNmb3JtKCk7 CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdt ZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYXZhaWxhYmxl V2lkdGgsIFJlbmRlckJsb2NrJiBjYiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGZyYWdtZW50 KSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJh Z21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFi bGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21l bnQsIGJvb2wgYWxsb3dJbnRyaW5zaWMpIGNvbnN0CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUm IHN0eWxlVG9Vc2UgPSBzdHlsZSgpOwogCkBAIC02NjAsMTMgKzY2MCwxNSBAQCBMYXlvdXRVbml0 IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91 dFVuaXQgbG9naWNhbAogICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6OmNsYW1wKGxvZ2ljYWxX aWR0aCwgbG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGgpOwogICAgIH0KIAotICAgIGlm ICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpKQorICAgIGlmICgh c3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpICYmIChhbGxvd0ludHJp bnNpYyB8fCAhc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc0ludHJpbnNpYygpKSkKICAg ICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNh bFdpZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRo KCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKKyAgICBpZiAoIWFsbG93SW50cmlu c2ljICYmIHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCkuaXNJbnRyaW5zaWMoKSkKKyAgICAg ICAgcmV0dXJuIGxvZ2ljYWxXaWR0aDsKICAgICBhdXRvIG1pbkxlbmd0aCA9IHN0eWxlVG9Vc2Uu bG9naWNhbE1pbldpZHRoKCk7Ci0gICAgaWYgKHN0eWxlVG9Vc2UuaGFzQXNwZWN0UmF0aW8oKSAm JiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYmIG1pbkxlbmd0aC5pc0F1dG8o KSAmJiBzdHlsZVRvVXNlLm92ZXJmbG93SW5saW5lRGlyZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZp c2libGUpIHsKKyAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIG1pbkxlbmd0 aC5pc0F1dG8oKSAmJiAoc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSB8fCBzdHls ZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzTWluQ29udGVudCgpIHx8IHN0eWxlVG9Vc2UubG9naWNh bFdpZHRoKCkuaXNNYXhDb250ZW50KCkpICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVEaXJl Y3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgewogICAgICAgICAvLyBNYWtlIHN1cmUgd2Ug YWN0dWFsbHkgdXNlZCB0aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICBpZiAoc2hvdWxkQ29tcHV0 ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQotICAgICAgICAgICAgbWluTGVuZ3RoID0g TGVuZ3RoKExlbmd0aFR5cGU6Ok1pbkNvbnRlbnQpOworICAgICAgICAgICAgbWluTGVuZ3RoID0g TGVuZ3RoKExlbmd0aFR5cGU6Ok1pbkludHJpbnNpYyk7CiAgICAgfQogICAgIHJldHVybiBzdGQ6 Om1heChsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWlu U2l6ZSwgbWluTGVuZ3RoLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CiB9CkBAIC0y NjEyLDkgKzI2MTQsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVJbnRyaW5zaWNM b2dpY2FsV2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRoTGVuZ3QKIAogICAgIExheW91dFVu aXQgbWluTG9naWNhbFdpZHRoOwogICAgIExheW91dFVuaXQgbWF4TG9naWNhbFdpZHRoOwotICAg IGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNh bFdpZHRoKTsKKyAgICBpZiAoIWxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNpYygpICYm IHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgbWlu TG9naWNhbFdpZHRoID0gbWF4TG9naWNhbFdpZHRoID0gY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21B c3BlY3RSYXRpbygpOworICAgIGVsc2UKKyAgICAgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxX aWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOwogCi0gICAgaWYgKGxvZ2lj YWxXaWR0aExlbmd0aC5pc01pbkNvbnRlbnQoKSkKKyAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3Ro LmlzTWluQ29udGVudCgpIHx8IGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNpYygpKQog ICAgICAgICByZXR1cm4gbWluTG9naWNhbFdpZHRoICsgYm9yZGVyQW5kUGFkZGluZzsKIAogICAg IGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNYXhDb250ZW50KCkpCkBAIC0yNjQyLDcgKzI2NDcs NyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRV c2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbgogICAgICAgICByZXR1cm4gYWRqdXN0Qm9yZGVy Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGxvZ2ljYWxXaWR0aCwg YXZhaWxhYmxlTG9naWNhbFdpZHRoKSwgbG9naWNhbFdpZHRoLnR5cGUoKSk7CiAgICAgfQogCi0g ICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpKQorICAgIGlmIChsb2dpY2FsV2lkdGgu aXNJbnRyaW5zaWMoKSB8fCBsb2dpY2FsV2lkdGguaXNNaW5JbnRyaW5zaWMoKSkKICAgICAgICAg cmV0dXJuIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhsb2dpY2FsV2lkdGgsIGF2 YWlsYWJsZUxvZ2ljYWxXaWR0aCwgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpKTsKIAog ICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQ7CkBAIC01MDk4LDcgKzUxMDMsNyBAQCBib29sIFJl bmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBjb25z dAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBhdXRvIGggPSBzdHlsZSgpLmxvZ2ljYWxI ZWlnaHQoKTsKLSAgICByZXR1cm4gaC5pc0F1dG8oKSB8fCAoIWlzT3V0T2ZGbG93UG9zaXRpb25l ZCgpICYmIGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgIXBlcmNlbnRhZ2VMb2dpY2FsSGVp Z2h0SXNSZXNvbHZhYmxlKCkpOworICAgIHJldHVybiBoLmlzQXV0bygpIHx8IGguaXNJbnRyaW5z aWMoKSB8fCAoIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIGguaXNQZXJjZW50T3JDYWxjdWxh dGVkKCkgJiYgIXBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpOwogfQogCiBi b29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygp IGNvbnN0CkBAIC01MTM0LDcgKzUxMzksNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0 ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRhaW5lcgogICAg IGF1dG8gbG9naWNhbFdpZHRoID0gaW5saW5lU2l6ZUZyb21Bc3BlY3RSYXRpbyhob3Jpem9udGFs Qm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQo KSwgTGF5b3V0VW5pdChzdHlsZSgpLmxvZ2ljYWxBc3BlY3RSYXRpbygpKSwgc3R5bGUoKS5ib3hT aXppbmdGb3JBc3BlY3RSYXRpbygpLCBsb2dpY2FsSGVpZ2h0Zm9yQXNwZWN0UmF0aW8pOwogCiAg ICAgTGF5b3V0VW5pdCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uID0gc3RkOjptYXg8 TGF5b3V0VW5pdD4oMCwgY29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudEluRnJh Z21lbnQoZnJhZ21lbnQpKTsKLSAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFn bWVudEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlv biwgKmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCk7CisgICAgcmV0dXJuIGNvbnN0cmFpbkxv Z2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lkdGgsIGNvbnRhaW5lcldpZHRo SW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2soKSwgZnJhZ21lbnQsIGZhbHNlKTsK IH0KIAogc3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+IFJlbmRlckJveDo6Y29tcHV0 ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggNmRlNmVkNmFjNmI5Njg4ZmNiMzY0OGRiYjRiMmVjOWEw OWJiMTQyNC4uODBhM2I4OTMxYmUzNGJiMTAxNTAxMmM1M2NkYTdkOTQzMzhjMTMyNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtODUsNyArODUsNyBAQCBwdWJsaWM6CiAg ICAgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkgPyB3aWR0aCgpIDogaGVpZ2h0KCk7IH0KICAgICBMYXlvdXRV bml0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmlzSG9yaXpvbnRhbFdy aXRpbmdNb2RlKCkgPyBoZWlnaHQoKSA6IHdpZHRoKCk7IH0KIAotICAgIExheW91dFVuaXQgY29u c3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQsIExheW91dFVu aXQsIFJlbmRlckJsb2NrJiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29u c3Q7CisgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5N YXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5kZXJGcmFnbWVudENv bnRhaW5lciosIGJvb2wgYWxsb3dJbnRyaW5zaWMgPSB0cnVlKSBjb25zdDsKICAgICBMYXlvdXRV bml0IGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWln aHQsIE9wdGlvbmFsPExheW91dFVuaXQ+IGludHJpbnNpY0NvbnRlbnRIZWlnaHQpIGNvbnN0Owog ICAgIExheW91dFVuaXQgY29uc3RyYWluQ29udGVudEJveExvZ2ljYWxIZWlnaHRCeU1pbk1heChM YXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIE9wdGlvbmFsPExheW91dFVuaXQ+IGludHJpbnNpY0Nv bnRlbnRIZWlnaHQpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNDYwOTQwN2RiZjNjY2RmNmZhY2IwZDgxNjE3 NDUyY2NjYTBjYWQyYi4uODM0NDk3MmE1ZDdkMWJhY2FlYzhmMzBjZWQ5YjkwMmNlY2EyZTZjZCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTI3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxp YS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemlu ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwODYx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5hYmxl IHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAy MDIxLTAyLTI3ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgIFJlbW92 ZSBzdXBwb3J0IGZvciAncGl4ZWwnIGFuZCAncG9zJyBDU1NPTSBwcmVmaXhlcwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh dGlvbnMKaW5kZXggZDk1ZDQwZjYxM2NmNzc4MWU0MWNlZjAzZGY3OWU3YjYzNjQ2OTRmMy4uNDUz NzMwMzdkNDI3MDY1NzExZjc2OGI5OTljMjI5Y2MwNTcyODE4YSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z CkBAIC00NTQ3LDYgKzQ1NDcsNyBAQCB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3NoYWRvdy1kaXJlYwogd2Via2l0Lm9y Zy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGlu Zy9zaGFkb3ctZGlyZWN0aW9uYWxpdHktMDAyLnRlbnRhdGl2ZS5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQtcGxhY2Vob2xkZXIuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogCisjICBjb250YWluLWludHJpbnNpYy1zaXplCiB3ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyOC5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCkBAIC00NTU2LDIxICs0NTU3LDggQEAgd2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt cmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE2Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3Bl Y3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vaW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUt MDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50 cmluc2ljLXNpemUtMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEwLmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDExLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNp emUtMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v aW50cmluc2ljLXNpemUtMDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDE1Lmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzEu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNl ZC1lbGVtZW50LTAzMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 421779 2021-02-28 13:01:41 -0800 2021-03-03 02:52:01 -0800 Patch bug-220861-20210228220138.patch text/plain 12671 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE1MDQ1MjA5NmZhNjA4 Y2I4MTg3NDMyYWUyOWE5NTBhZTJlOTJjYS4uMGZlNWFlNWYwOWIyMmIzM2MzZWQ3MTU3YzA1NDJj MmM3ZDFiOWQ1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAyLTI4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZyBjYWxj dWxhdGlvbnMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4IGNvbnN0KToK KyAgICAgICAgQWRkIGFuIGFsbG93SW50cmluc2ljIHBhcmFtZXRlciB0byBwcmV2ZW50IHJlY3Vy c2lvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2lj YWxXaWR0aFVzaW5nIGNvbnN0KToKKyAgICAgICAgQ29tcHV0ZSBpbnRyaW5zaWMgbG9naWNhbCB3 aWR0aCBmcm9tIGFzcGVjdCByYXRpbyBpZiBwb3NzaWJsZS4KKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFz cGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgbWluL21heC9maXQtY29udGVudCBpbiB0aGUgYmxv Y2sgYXhpcyBpcyB0cmVhdGVkIGFzIGF1dG8uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6 OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICBQcmV2 ZW50IHJlY3Vyc2lvbiBieSBwYXNzaW5nIGZhbHNlIGZvciBhbGxvd0ludHJpbnNpYy4KKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKIDIwMjEtMDItMjggIERhcmluIEFkbGVyICA8 ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFJlZHVjZSB1c2Ugb2YgcmV0YWluL3Jl bGVhc2UgaW4gV0FLV2luZG93IGFuZCByZW1vdmUgdW5uZWVkZWQgbWV0aG9kcyBmcm9tIHRoYXQg Y2xhc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IDFiZjk2 OTRjY2IwNmJhNmZkNTcwNjIwNmJlOWQ5MjYyMWVlZWM3MzIuLjE0ODcxNGNiOWNjNWUzYmI3OGI4 NDg3NTM3MWJkYTRjNDBiYjBhM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcApAQCAtMjI4Miw2ICsyMjgyLDggQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZVBy ZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIGlmICghaXNUYWJsZUNlbGwoKSAmJiBzdHlsZVRv VXNlLmxvZ2ljYWxXaWR0aCgpLmlzRml4ZWQoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgp LnZhbHVlKCkgPj0gMAogICAgICAgICAmJiAhKGlzRGVwcmVjYXRlZEZsZXhJdGVtKCkgJiYgIXN0 eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaW50VmFsdWUoKSkpCiAgICAgICAgIG1fbWluUHJlZmVy cmVkTG9naWNhbFdpZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBhZGp1c3RDb250 ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkp OworICAgIGVsc2UgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8o KSkKKyAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtX21heFByZWZlcnJlZExv Z2ljYWxXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKICAgICBl bHNlCiAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1fbWluUHJlZmVycmVk TG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNTNmZDBmMGYzOGNhNWFmZDEwNzlmZGMzNDA3 NDhiMTRjOWMyOTAwMC4uMzkwZTE3OWY2NWU1OWNiNWI0MDViY2I0NzdlNzBmZGNiMjhlMjNlMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTY1MSw3ICs2NTEsNyBA QCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTGF5ZXJUcmFuc2Zvcm0oKQogICAgICAgICBsYXllcigp LT51cGRhdGVUcmFuc2Zvcm0oKTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFp bkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwg TGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVu dENvbnRhaW5lciogZnJhZ21lbnQpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3Ry YWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbFdpZHRo LCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBSZW5kZXJCbG9jayYgY2IsIFJlbmRlckZyYWdt ZW50Q29udGFpbmVyKiBmcmFnbWVudCwgYm9vbCBhbGxvd0ludHJpbnNpYykgY29uc3QKIHsKICAg ICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxlKCk7CiAKQEAgLTY2MCwxMyAr NjYwLDE1IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZy YWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9 IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0 aCk7CiAgICAgfQogCi0gICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5k ZWZpbmVkKCkpCisgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZp bmVkKCkgJiYgKGFsbG93SW50cmluc2ljIHx8ICFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgp LmlzSW50cmluc2ljKCkpKQogICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihsb2dpY2Fs V2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWF4U2l6ZSwgc3R5bGVU b1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOwor ICAgIGlmICghYWxsb3dJbnRyaW5zaWMgJiYgc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKS5p c0ludHJpbnNpYygpKQorICAgICAgICByZXR1cm4gbG9naWNhbFdpZHRoOwogICAgIGF1dG8gbWlu TGVuZ3RoID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKTsKLSAgICBpZiAoc3R5bGVUb1Vz ZS5oYXNBc3BlY3RSYXRpbygpICYmIHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkg JiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVEaXJlY3Rp b24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgeworICAgIGlmIChzdHlsZVRvVXNlLmhhc0FzcGVj dFJhdGlvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIChzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0 aCgpLmlzQXV0bygpIHx8IHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNNaW5Db250ZW50KCkg fHwgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc01heENvbnRlbnQoKSkgJiYgc3R5bGVUb1Vz ZS5vdmVyZmxvd0lubGluZURpcmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CiAgICAg ICAgIC8vIE1ha2Ugc3VyZSB3ZSBhY3R1YWxseSB1c2VkIHRoZSBhc3BlY3QgcmF0aW8uCiAgICAg ICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCi0gICAg ICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWluQ29udGVudCk7CisgICAg ICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWluSW50cmluc2ljKTsKICAg ICB9CiAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0 aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBtaW5MZW5ndGgsIGF2YWlsYWJsZVdpZHRoLCBjYiwg ZnJhZ21lbnQpKTsKIH0KQEAgLTI2MTIsOSArMjYxNCwxMiBAQCBMYXlvdXRVbml0IFJlbmRlckJv eDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhM ZW5ndAogCiAgICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGg7CiAgICAgTGF5b3V0VW5pdCBt YXhMb2dpY2FsV2lkdGg7Ci0gICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9n aWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOworICAgIGlmICghbG9naWNhbFdpZHRoTGVuZ3Ro LmlzTWluSW50cmluc2ljKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RS YXRpbygpKQorICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGggPSBjb21w dXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisgICAgZWxzZQorICAgICAgICBjb21w dXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0 aCk7CiAKLSAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29udGVudCgpKQorICAgIGlm IChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250ZW50KCkgfHwgbG9naWNhbFdpZHRoTGVuZ3Ro LmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBtaW5Mb2dpY2FsV2lkdGggKyBib3Jk ZXJBbmRQYWRkaW5nOwogCiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01heENvbnRlbnQo KSkKQEAgLTI2NDIsNyArMjY0Nyw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9n aWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuCiAgICAgICAg IHJldHVybiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcodmFsdWVGb3JM ZW5ndGgobG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgpLCBsb2dpY2FsV2lkdGgu dHlwZSgpKTsKICAgICB9CiAKLSAgICBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCisg ICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpIHx8IGxvZ2ljYWxXaWR0aC5pc01pbklu dHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVz aW5nKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBib3JkZXJBbmRQYWRkaW5n TG9naWNhbFdpZHRoKCkpOwogCiAgICAgTGF5b3V0VW5pdCBtYXJnaW5TdGFydDsKQEAgLTUwOTgs NyArNTEwMyw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZy b21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8g aCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwotICAgIHJldHVybiBoLmlzQXV0bygpIHx8ICgh aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAh cGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CisgICAgcmV0dXJuIGguaXNB dXRvKCkgfHwgaC5pc0ludHJpbnNpYygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYg aC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jl c29sdmFibGUoKSk7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdp ZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKQEAgLTUxMzQsNyArNTEzOSw3IEBAIExheW91dFVu aXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZy YWdtZW50Q29udGFpbmVyCiAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBpbmxpbmVTaXplRnJvbUFz cGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9y ZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9naWNhbEFzcGVjdFJh dGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCksIGxvZ2ljYWxIZWlnaHRm b3JBc3BlY3RSYXRpbyk7CiAKICAgICBMYXlvdXRVbml0IGNvbnRhaW5lcldpZHRoSW5JbmxpbmVE aXJlY3Rpb24gPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBjb250YWluaW5nQmxvY2tMb2dpY2Fs V2lkdGhGb3JDb250ZW50SW5GcmFnbWVudChmcmFnbWVudCkpOwotICAgIHJldHVybiBjb25zdHJh aW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250YWluZXJX aWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50KTsKKyAg ICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxvZ2ljYWxX aWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdCbG9jaygp LCBmcmFnbWVudCwgZmFsc2UpOwogfQogCiBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5p dD4gUmVuZGVyQm94Ojpjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkg Y29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA2ZGU2ZWQ2YWM2Yjk2 ODhmY2IzNjQ4ZGJiNGIyZWM5YTA5YmIxNDI0Li44MGEzYjg5MzFiZTM0YmIxMDE1MDEyYzUzY2Rh N2Q5NDMzOGMxMzI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC04NSw3 ICs4NSw3IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsg cmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHdpZHRoKCkgOiBoZWln aHQoKTsgfQogICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHN0 eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGhlaWdodCgpIDogd2lkdGgoKTsgfQog Ci0gICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgo TGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5kZXJGcmFnbWVudENvbnRh aW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxX aWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRVbml0LCBSZW5kZXJCbG9j ayYsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiwgYm9vbCBhbGxvd0ludHJpbnNpYyA9IHRydWUp IGNvbnN0OwogICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExh eW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29u dGVudEhlaWdodCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Db250ZW50Qm94TG9n aWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5 b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0NjA5NDA3 ZGJmM2NjZGY2ZmFjYjBkODE2MTc0NTJjY2NhMGNhZDJiLi5jYmIwYjUzMmExZWFhMzI4MzE0ODEz NGQ5MWRjNjYwODQxNzYwN2FkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDItMjggIFJv YiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRp byBpbiBpbnRyaW5zaWMgc2l6aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjA4NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBFbmFibGUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRl c3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDItMjcgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUu Y29tPgogCiAgICAgICAgUmVtb3ZlIHN1cHBvcnQgZm9yICdwaXhlbCcgYW5kICdwb3MnIENTU09N IHByZWZpeGVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5 b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBkOTVkNDBmNjEzY2Y3NzgxZTQxY2VmMDNk Zjc5ZTdiNjM2NDY5NGYzLi40NTM3MzAzN2Q0MjcwNjU3MTFmNzY4Yjk5OWMyMjljYzA1NzI4MThh IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRl c3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ1NDcsNiArNDU0Nyw3IEBAIHdlYmtpdC5vcmcvYi8y MTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hh ZG93LWRpcmVjCiB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zY29waW5nL3NoYWRvdy1kaXJlY3Rpb25hbGl0eS0wMDIudGVudGF0aXZl Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjZWhvbGRl ci5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKKyMgIGNvbnRhaW4taW50cmluc2ljLXNpemUK IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3Qt cmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ1NTYsMjEgKzQ1NTcsOCBA QCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz cGVjdC1yYXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0w MTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlk LWFzcGVjdC1yYXRpby0wMTYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDIu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5z aWMtc2l6ZS0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9pbnRyaW5zaWMtc2l6ZS0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDYuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDguaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0w MTAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRy aW5zaWMtc2l6ZS0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTMuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTQuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6 ZS0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9y ZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQo= 422053 2021-03-03 02:52:06 -0800 2021-03-07 08:01:57 -0800 Patch bug-220861-20210303115205.patch text/plain 12663 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWJkNjE2NDJlZmJlNmE2 MzIzNjgxYjg4Mjg1OWViMTg5NjIwODk4ZC4uZWYxMjU3MzlhYjMyNDk0NGRhMTgxMDFiMDVjNzY0 YTk1ZDQwZGUzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAzLTAzICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZyBjYWxj dWxhdGlvbnMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4IGNvbnN0KToK KyAgICAgICAgQWRkIGFuIGFsbG93SW50cmluc2ljIHBhcmFtZXRlciB0byBwcmV2ZW50IHJlY3Vy c2lvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2lj YWxXaWR0aFVzaW5nIGNvbnN0KToKKyAgICAgICAgQ29tcHV0ZSBpbnRyaW5zaWMgbG9naWNhbCB3 aWR0aCBmcm9tIGFzcGVjdCByYXRpbyBpZiBwb3NzaWJsZS4KKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFz cGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgbWluL21heC9maXQtY29udGVudCBpbiB0aGUgYmxv Y2sgYXhpcyBpcyB0cmVhdGVkIGFzIGF1dG8uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6 OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICBQcmV2 ZW50IHJlY3Vyc2lvbiBieSBwYXNzaW5nIGZhbHNlIGZvciBhbGxvd0ludHJpbnNpYy4KKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKIDIwMjEtMDMtMDIgIE1hbnVlbCBSZWdvIENh c2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW3NlbGVjdG9yc10gOmZvY3Vz LXZpc2libGUgaW1wbGVtZW50YXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwCmluZGV4IGMwNDc5ODdmYjllNDYzZGIwYmVjY2YyMTc2ZTViNmE5ODhlZDNlOWMuLjQ2 YjVjNjlmZDRkNDliZDkwZDZkNTNkODg4N2Q5ZDg5YjNhNDBlNzEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMjI4Miw2ICsyMjgyLDggQEAgdm9pZCBSZW5k ZXJCbG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIGlmICghaXNUYWJs ZUNlbGwoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzRml4ZWQoKSAmJiBzdHlsZVRv VXNlLmxvZ2ljYWxXaWR0aCgpLnZhbHVlKCkgPj0gMAogICAgICAgICAmJiAhKGlzRGVwcmVjYXRl ZEZsZXhJdGVtKCkgJiYgIXN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaW50VmFsdWUoKSkpCiAg ICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2Fs V2lkdGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlVG9V c2UubG9naWNhbFdpZHRoKCkpOworICAgIGVsc2UgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgg PSBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW8oKTsKICAgICBlbHNlCiAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lk dGhzKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0 aCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZjU4MmI1Njdh ZGFlOTBjZDRkNGEwY2VmMmM5YjhkNjExYjMwMjgzMy4uNjJhM2QzZmJmNzkyYzA4MjUwYzg4NmJh NTM4ZjcwZjRhMzI1MjIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK QEAgLTY1MSw3ICs2NTEsNyBAQCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTGF5ZXJUcmFuc2Zvcm0o KQogICAgICAgICBsYXllcigpLT51cGRhdGVUcmFuc2Zvcm0oKTsKIH0KIAotTGF5b3V0VW5pdCBS ZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRV bml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2sm IGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQpIGNvbnN0CitMYXlvdXRVbml0 IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91 dFVuaXQgbG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBSZW5kZXJCbG9j ayYgY2IsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCwgYm9vbCBhbGxvd0ludHJp bnNpYykgY29uc3QKIHsKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxl KCk7CiAKQEAgLTY2MCwxMyArNjYwLDE1IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJh aW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsCiAgICAg ICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lk dGgsIGxvZ2ljYWxNYXhXaWR0aCk7CiAgICAgfQogCi0gICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2lj YWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCisgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxN YXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgKGFsbG93SW50cmluc2ljIHx8ICFzdHlsZVRvVXNl LmxvZ2ljYWxNYXhXaWR0aCgpLmlzSW50cmluc2ljKCkpKQogICAgICAgICBsb2dpY2FsV2lkdGgg PSBzdGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNp bmcoTWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgs IGNiLCBmcmFnbWVudCkpOworICAgIGlmICghYWxsb3dJbnRyaW5zaWMgJiYgc3R5bGVUb1VzZS5s b2dpY2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKQorICAgICAgICByZXR1cm4gbG9naWNhbFdp ZHRoOwogICAgIGF1dG8gbWluTGVuZ3RoID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKTsK LSAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIHN0eWxlVG9Vc2UubG9naWNh bFdpZHRoKCkuaXNBdXRvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIHN0eWxlVG9Vc2Uub3Zl cmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgeworICAgIGlmIChz dHlsZVRvVXNlLmhhc0FzcGVjdFJhdGlvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIChzdHls ZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8IHN0eWxlVG9Vc2UubG9naWNhbFdpZHRo KCkuaXNNaW5Db250ZW50KCkgfHwgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc01heENvbnRl bnQoKSkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0lubGluZURpcmVjdGlvbigpID09IE92ZXJmbG93 OjpWaXNpYmxlKSB7CiAgICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSBhY3R1YWxseSB1c2VkIHRoZSBh c3BlY3QgcmF0aW8uCiAgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKCkpCi0gICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6 TWluQ29udGVudCk7CisgICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6 TWluSW50cmluc2ljKTsKICAgICB9CiAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwg Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBtaW5MZW5ndGgsIGF2 YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKIH0KQEAgLTI2MTIsOSArMjYxNCwxMiBAQCBM YXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExl bmd0aCBsb2dpY2FsV2lkdGhMZW5ndAogCiAgICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGg7 CiAgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGg7Ci0gICAgY29tcHV0ZUludHJpbnNpY0xv Z2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOworICAgIGlmICgh bG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhM b2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisgICAg ZWxzZQorICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lk dGgsIG1heExvZ2ljYWxXaWR0aCk7CiAKLSAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWlu Q29udGVudCgpKQorICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250ZW50KCkgfHwg bG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBtaW5M b2dpY2FsV2lkdGggKyBib3JkZXJBbmRQYWRkaW5nOwogCiAgICAgaWYgKGxvZ2ljYWxXaWR0aExl bmd0aC5pc01heENvbnRlbnQoKSkKQEAgLTI2NDIsNyArMjY0Nyw3IEBAIExheW91dFVuaXQgUmVu ZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKFNpemVUeXBlIHdpZHRo VHlwZSwgTGVuCiAgICAgICAgIHJldHVybiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JC b3hTaXppbmcodmFsdWVGb3JMZW5ndGgobG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lk dGgpLCBsb2dpY2FsV2lkdGgudHlwZSgpKTsKICAgICB9CiAKLSAgICBpZiAobG9naWNhbFdpZHRo LmlzSW50cmluc2ljKCkpCisgICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpIHx8IGxv Z2ljYWxXaWR0aC5pc01pbkludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRo LCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkpOwogCiAgICAgTGF5b3V0VW5pdCBtYXJn aW5TdGFydDsKQEAgLTUwOTgsNyArNTEwMyw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21w dXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgIGF1dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwotICAgIHJldHVy biBoLmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRP ckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7 CisgICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgaC5pc0ludHJpbnNpYygpIHx8ICghaXNPdXRPZkZs b3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFn ZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91 bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKQEAgLTUxMzQsNyAr NTEzOSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyCiAgICAgYXV0byBsb2dpY2FsV2lkdGgg PSBpbmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0 ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxl KCkubG9naWNhbEFzcGVjdFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlv KCksIGxvZ2ljYWxIZWlnaHRmb3JBc3BlY3RSYXRpbyk7CiAKICAgICBMYXlvdXRVbml0IGNvbnRh aW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24gPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBjb250 YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50SW5GcmFnbWVudChmcmFnbWVudCkpOwot ICAgIHJldHVybiBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNh bFdpZHRoLCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2Nr KCksIGZyYWdtZW50KTsKKyAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVu dEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwg KmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCwgZmFsc2UpOwogfQogCiBzdGQ6OnBhaXI8TGF5 b3V0VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyQm94Ojpjb21wdXRlTWluTWF4TG9naWNhbFdpZHRo RnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApp bmRleCA2ZGU2ZWQ2YWM2Yjk2ODhmY2IzNjQ4ZGJiNGIyZWM5YTA5YmIxNDI0Li44MGEzYjg5MzFi ZTM0YmIxMDE1MDEyYzUzY2RhN2Q5NDMzOGMxMzI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5oCkBAIC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2lj YWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSA/IHdpZHRoKCkgOiBoZWlnaHQoKTsgfQogICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCgp IGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGhlaWdo dCgpIDogd2lkdGgoKTsgfQogCi0gICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJ bkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBS ZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICBMYXlvdXRVbml0 IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0LCBMYXlv dXRVbml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiwgYm9vbCBhbGxv d0ludHJpbnNpYyA9IHRydWUpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNh bEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0 VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb25z dHJhaW5Db250ZW50Qm94TG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhl aWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7 CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCAwMTY5YjQ4MGFkYTU2YzAwMmY4YjVmOGNjN2JhY2Y2Mjc0OWU3MDNlLi44ZTQ4 YzRhZDUwYzk4OTllY2FhOWUxMWEzMjQzOWU2NmMyYTA4ZDEwIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMjEtMDMtMDMgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBT dXBwb3J0IGFzcGVjdC1yYXRpbyBpbiBpbnRyaW5zaWMgc2l6aW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA4NjEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgdGVzdHMgdGhhdCBwYXNzIG5v dy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDMtMDIgIE1hbnVlbCBS ZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW3NlbGVjdG9yc10g OmZvY3VzLXZpc2libGUgaW1wbGVtZW50YXRpb24KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rl c3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGQ1MTcy YmVmZTU1MmY1ZGZiZjEyMDQ5M2U4YjgzYjQzNWU1NDFmZjQuLjQ5M2M3ODVjNjI0NmI3NGM3NTli MDllYzQ5MGQ2MzZjNDg1NmRmNzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh dGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU0Nyw2ICs0NTQ3 LDcgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlv bmFsaXR5LTAwMi50ZW50YXRpdmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGlu Zy9zbG90dGVkLXBsYWNlaG9sZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAorIyAgY29u dGFpbi1pbnRyaW5zaWMtc2l6ZQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNw ZWN0LXJhdGlvLTAyNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpA QCAtNDU1NiwyMSArNDU1Nyw4IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh dGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2dyaWQtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNi5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNy5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1z aXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2ludHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNS5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNi5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNp Yy1zaXplLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2ludHJpbnNpYy1zaXplLTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMi5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAx My5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJp bnNpYy1zaXplLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL3RhYmxlLWVsZW1lbnQtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2lj LXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9jb250YWluLWlu dHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0K 422528 2021-03-07 08:02:02 -0800 2021-03-08 03:02:41 -0800 Patch bug-220861-20210307170201.patch text/plain 13329 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI4OTQ5Y2FiYmNjZmE0 YzNlY2M0ZGFhODE3ZTJkNzRlNGZiMTFkMC4uNWFmMTYxZGExZTkzYTM2M2ZkZmMzNzZiNTA4Mjk0 OTQzMTZiOWNhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTAzLTA3ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZyBjYWxj dWxhdGlvbnMuCisgICAgICAgIFRoZSB2YWx1ZXMgbWluLWNvbnRlbnQvbWF4LWNvbnRlbnQvZml0 LWNvbnRlbnQKKyAgICAgICAgZ2V0IHNldCBhIHZhbHVlIHRocm91Z2ggYXNwZWN0LXJhdGlvIFsx XS4KKyAgICAgICAgSG93ZXZlciBtaW4td2lkdGg6YXV0byBpcyBzcGVjaWFsLCBpdCBzaG91bGQg dGFrZSBjb250ZW50CisgICAgICAgIGludG8gYWNjb3VudCBbMl0uIEluIG9yZGVyIHRvIHN1cHBv cnQgdGhpcywgY29tcHV0ZQorICAgICAgICBsb2dpY2FsIChpbnRyaW5zaWMpIHdpZHRoIHVzaW5n IE1pbkludHJpbnNpYywgc2luY2Ugc3RheWluZworICAgICAgICB3aXRoIE1pbkNvbnRlbnQvTWF4 Q29udGVudCB3b3VsZCBjYXVzZSBhbiBpbmZpbml0ZSBsb29wLgorCisgICAgICAgIEJlaGF2aW9y IG1hdGNoZXMgRmlyZWZveCBhbmQgQ2hyb21lLgorCisgICAgICAgIFsxXSBodHRwczovL3d3dy53 My5vcmcvVFIvY3NzLXNpemluZy00LyNwcm9wZGVmLWFzcGVjdC1yYXRpbworICAgICAgICBbMl0g aHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvLW1pbmltdW0K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICBD b21wdXRlIGNoaWxkIG1pbi9tYXggcHJlZiB3aWR0aHMgZnJvbSBhc3BlY3QtcmF0aW8gaWYgaXQg YXBwbGllcy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4 IGNvbnN0KToKKyAgICAgICAgQWRkIGFuIGFsbG93SW50cmluc2ljIHBhcmFtZXRlciB0byBwcmV2 ZW50IHJlY3Vyc2lvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aFVzaW5nIGNvbnN0KToKKyAgICAgICAgQ29tcHV0ZSBpbnRyaW5zaWMg bG9naWNhbCB3aWR0aCBmcm9tIGFzcGVjdCByYXRpbyBpZiBwb3NzaWJsZS4KKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVp Z2h0RnJvbUFzcGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgbWluL21heC9maXQtY29udGVudCBp biB0aGUgYmxvY2sgYXhpcyBpcyB0cmVhdGVkIGFzIGF1dG8uCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAg ICAgICBQcmV2ZW50IHJlY3Vyc2lvbiBieSBwYXNzaW5nIGZhbHNlIGZvciBhbGxvd0ludHJpbnNp Yy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKIDIwMjEtMDMtMDYgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBPbmx5IHBvc2l0aXZlIGludGVn ZXJzIGFyZSBhbGxvd2VkIGFzIHZhbHVlcyBvZiBvcnBoYW5zIGFuZCB3aWRvd3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IGMwNDc5ODdmYjllNDYzZGIwYmVj Y2YyMTc2ZTViNmE5ODhlZDNlOWMuLjQ2YjVjNjlmZDRkNDliZDkwZDZkNTNkODg4N2Q5ZDg5YjNh NDBlNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMjI4 Miw2ICsyMjgyLDggQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxX aWR0aHMoKQogICAgIGlmICghaXNUYWJsZUNlbGwoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0 aCgpLmlzRml4ZWQoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLnZhbHVlKCkgPj0gMAog ICAgICAgICAmJiAhKGlzRGVwcmVjYXRlZEZsZXhJdGVtKCkgJiYgIXN0eWxlVG9Vc2UubG9naWNh bFdpZHRoKCkuaW50VmFsdWUoKSkpCiAgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRo ID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdp ZHRoRm9yQm94U2l6aW5nKHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkpOworICAgIGVsc2UgaWYg KHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgbV9t aW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNv bXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKICAgICBlbHNlCiAgICAgICAgIGNv bXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBt X21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAKaW5kZXggZjU4MmI1NjdhZGFlOTBjZDRkNGEwY2VmMmM5YjhkNjExYjMwMjgzMy4u NjJhM2QzZmJmNzkyYzA4MjUwYzg4NmJhNTM4ZjcwZjRhMzI1MjIyNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTY1MSw3ICs2NTEsNyBAQCB2b2lkIFJlbmRlckJv eDo6dXBkYXRlTGF5ZXJUcmFuc2Zvcm0oKQogICAgICAgICBsYXllcigpLT51cGRhdGVUcmFuc2Zv cm0oKTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aElu RnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFp bGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJh Z21lbnQpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRo SW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2 YWlsYWJsZVdpZHRoLCBSZW5kZXJCbG9jayYgY2IsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBm cmFnbWVudCwgYm9vbCBhbGxvd0ludHJpbnNpYykgY29uc3QKIHsKICAgICBjb25zdCBSZW5kZXJT dHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxlKCk7CiAKQEAgLTY2MCwxMyArNjYwLDE1IEBAIExheW91 dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgo TGF5b3V0VW5pdCBsb2dpY2FsCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9n aWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CiAgICAgfQogCi0g ICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCisgICAg aWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgKGFsbG93 SW50cmluc2ljIHx8ICFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzSW50cmluc2ljKCkp KQogICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVM b2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4 V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOworICAgIGlmICghYWxsb3dJ bnRyaW5zaWMgJiYgc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKQor ICAgICAgICByZXR1cm4gbG9naWNhbFdpZHRoOwogICAgIGF1dG8gbWluTGVuZ3RoID0gc3R5bGVU b1VzZS5sb2dpY2FsTWluV2lkdGgoKTsKLSAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRp bygpICYmIHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgbWluTGVuZ3RoLmlz QXV0bygpICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxv dzo6VmlzaWJsZSkgeworICAgIGlmIChzdHlsZVRvVXNlLmhhc0FzcGVjdFJhdGlvKCkgJiYgbWlu TGVuZ3RoLmlzQXV0bygpICYmIChzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8 IHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNNaW5Db250ZW50KCkgfHwgc3R5bGVUb1VzZS5s b2dpY2FsV2lkdGgoKS5pc01heENvbnRlbnQoKSkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0lubGlu ZURpcmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CiAgICAgICAgIC8vIE1ha2Ugc3Vy ZSB3ZSBhY3R1YWxseSB1c2VkIHRoZSBhc3BlY3QgcmF0aW8uCiAgICAgICAgIGlmIChzaG91bGRD b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCi0gICAgICAgICAgICBtaW5MZW5n dGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWluQ29udGVudCk7CisgICAgICAgICAgICBtaW5MZW5n dGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWluSW50cmluc2ljKTsKICAgICB9CiAgICAgcmV0dXJu IHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2lu ZyhNaW5TaXplLCBtaW5MZW5ndGgsIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKIH0K QEAgLTI2MTIsOSArMjYxNCwxMiBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhMZW5ndAogCiAgICAgTGF5 b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGg7CiAgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGg7 Ci0gICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhM b2dpY2FsV2lkdGgpOworICAgIGlmICghbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2lj KCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAg ICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRo RnJvbUFzcGVjdFJhdGlvKCk7CisgICAgZWxzZQorICAgICAgICBjb21wdXRlSW50cmluc2ljTG9n aWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CiAKLSAgICBpZiAo bG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29udGVudCgpKQorICAgIGlmIChsb2dpY2FsV2lkdGhM ZW5ndGguaXNNaW5Db250ZW50KCkgfHwgbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2lj KCkpCiAgICAgICAgIHJldHVybiBtaW5Mb2dpY2FsV2lkdGggKyBib3JkZXJBbmRQYWRkaW5nOwog CiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01heENvbnRlbnQoKSkKQEAgLTI2NDIsNyAr MjY0Nyw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFn bWVudFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuCiAgICAgICAgIHJldHVybiBhZGp1c3RC b3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgobG9naWNhbFdp ZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgpLCBsb2dpY2FsV2lkdGgudHlwZSgpKTsKICAgICB9 CiAKLSAgICBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCisgICAgaWYgKGxvZ2ljYWxX aWR0aC5pc0ludHJpbnNpYygpIHx8IGxvZ2ljYWxXaWR0aC5pc01pbkludHJpbnNpYygpKQogICAg ICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0 aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkp OwogCiAgICAgTGF5b3V0VW5pdCBtYXJnaW5TdGFydDsKQEAgLTUwOTgsNyArNTEwMyw3IEBAIGJv b2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygp IGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gaCA9IHN0eWxlKCkubG9n aWNhbEhlaWdodCgpOwotICAgIHJldHVybiBoLmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQb3Np dGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2lj YWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CisgICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgaC5pc0lu dHJpbnNpYygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNh bGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CiB9 CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJh dGlvKCkgY29uc3QKQEAgLTUxMzQsNyArNTEzOSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpj b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVy CiAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBpbmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6 b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4 dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9naWNhbEFzcGVjdFJhdGlvKCkpLCBzdHlsZSgp LmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCksIGxvZ2ljYWxIZWlnaHRmb3JBc3BlY3RSYXRpbyk7 CiAKICAgICBMYXlvdXRVbml0IGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24gPSBzdGQ6 Om1heDxMYXlvdXRVbml0PigwLCBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50 SW5GcmFnbWVudChmcmFnbWVudCkpOwotICAgIHJldHVybiBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJ bkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250YWluZXJXaWR0aEluSW5saW5lRGly ZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50KTsKKyAgICByZXR1cm4gY29uc3Ry YWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVy V2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCwgZmFs c2UpOwogfQogCiBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyQm94Ojpj b21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA2ZGU2ZWQ2YWM2Yjk2ODhmY2IzNjQ4ZGJiNGIy ZWM5YTA5YmIxNDI0Li44MGEzYjg5MzFiZTM0YmIxMDE1MDEyYzUzY2RhN2Q5NDMzOGMxMzI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC04NSw3ICs4NSw3IEBAIHB1Ymxp YzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCku aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHdpZHRoKCkgOiBoZWlnaHQoKTsgfQogICAgIExh eW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSA/IGhlaWdodCgpIDogd2lkdGgoKTsgfQogCi0gICAgTGF5b3V0VW5p dCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCwgTGF5 b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRy KSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRC eU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRVbml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZyYWdt ZW50Q29udGFpbmVyKiwgYm9vbCBhbGxvd0ludHJpbnNpYyA9IHRydWUpIGNvbnN0OwogICAgIExh eW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNh bEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29u c3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Db250ZW50Qm94TG9naWNhbEhlaWdodEJ5TWlu TWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmlu c2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkNDZlZTRkYzRiZjk1OWNhZjE1NWYx M2VjZGI4MDk1OTVjMWU4MmIyLi5kMTFmYzI4MmNlYmJkZGJiZDhjMjhiMTE1MWI5ZGJhOWUzNmM2 MzhiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDMtMDcgIFJvYiBCdWlzICA8cmJ1aXNA aWdhbGlhLmNvbT4KKworICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBpbiBpbnRyaW5zaWMg c2l6aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjA4NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBF bmFibGUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6 CisKIDIwMjEtMDMtMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBPbmx5IHBvc2l0aXZlIGludGVnZXJzIGFyZSBhbGxvd2VkIGFzIHZhbHVlcyBvZiBvcnBoYW5z IGFuZCB3aWRvd3MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9M YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDQ0ZDA5NWM5MDQzYjBhNGE2OTExOTNk OTYzYmJkMDEzN2RjYjUwMmQuLmFjYmRjZjY0ZmQ3YjNhYWNhMzhmN2E3ZGE5OTQ2YzYyYTcxM2E0 NzQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU1MCw2ICs0NTUwLDcgQEAgd2Via2l0Lm9yZy9i LzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9z aGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFsaXR5LTAwMi50ZW50YXRp dmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWNlaG9s ZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAorIyAgY29udGFpbi1pbnRyaW5zaWMtc2l6 ZQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVj dC1yYXRpby0wMjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtNDU1OCwyMSArNDU1OSw4 IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt YXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlv LTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dy aWQtYXNwZWN0LXJhdGlvLTAxNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAw Mi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJp bnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwOC5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXpl LTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2lu dHJpbnNpYy1zaXplLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13 ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMy5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxNC5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1z aXplLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L3RhYmxlLWVsZW1lbnQtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9j b250YWluLWludHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRh aW4taW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 422552 2021-03-08 03:02:48 -0800 2021-03-08 04:37:52 -0800 Patch bug-220861-20210308120246.patch text/plain 13526 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjgyNmNkMDRlNTc1M2Jh Y2Y5ZDc3YmQyZGMwODdjMDIwMTdjNjU3ZC4uOTlhZmUxYzVhYjdjNDZlMTA5Y2VjMGZmMTg5YmYx YTU4YWUyZWI3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTAzLTA4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g aW4gaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8u CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZyBjYWxj dWxhdGlvbnMuCisgICAgICAgIFRoZSB2YWx1ZXMgbWluLWNvbnRlbnQvbWF4LWNvbnRlbnQvZml0 LWNvbnRlbnQKKyAgICAgICAgZ2V0IHNldCBhIHZhbHVlIHRocm91Z2ggYXNwZWN0LXJhdGlvIFsx XS4KKyAgICAgICAgSG93ZXZlciBtaW4td2lkdGg6YXV0byBpcyBzcGVjaWFsLCBpdCBzaG91bGQg dGFrZSBjb250ZW50CisgICAgICAgIGludG8gYWNjb3VudCBbMl0uIEluIG9yZGVyIHRvIHN1cHBv cnQgdGhpcywgY29tcHV0ZQorICAgICAgICBsb2dpY2FsIChpbnRyaW5zaWMpIHdpZHRoIHVzaW5n IE1pbkludHJpbnNpYywgc2luY2Ugc3RheWluZworICAgICAgICB3aXRoIE1pbkNvbnRlbnQvTWF4 Q29udGVudCB3b3VsZCBjYXVzZSBhbiBpbmZpbml0ZSBsb29wLgorCisgICAgICAgIEJlaGF2aW9y IG1hdGNoZXMgRmlyZWZveCBhbmQgQ2hyb21lLgorCisgICAgICAgIFsxXSBodHRwczovL3d3dy53 My5vcmcvVFIvY3NzLXNpemluZy00LyNwcm9wZGVmLWFzcGVjdC1yYXRpbworICAgICAgICBbMl0g aHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvLW1pbmltdW0K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICBD b21wdXRlIGNoaWxkIG1pbi9tYXggcHJlZiB3aWR0aHMgZnJvbSBhc3BlY3QtcmF0aW8gaWYgaXQg YXBwbGllcy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4 IGNvbnN0KToKKyAgICAgICAgQWRkIGFuIGFsbG93SW50cmluc2ljIHBhcmFtZXRlciB0byBwcmV2 ZW50IHJlY3Vyc2lvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aFVzaW5nIGNvbnN0KToKKyAgICAgICAgQ29tcHV0ZSBpbnRyaW5zaWMg bG9naWNhbCB3aWR0aCBmcm9tIGFzcGVjdCByYXRpbyBpZiBwb3NzaWJsZS4KKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVp Z2h0RnJvbUFzcGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgbWluL21heC9maXQtY29udGVudCBp biB0aGUgYmxvY2sgYXhpcyBpcyB0cmVhdGVkIGFzIGF1dG8uCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAg ICAgICBQcmV2ZW50IHJlY3Vyc2lvbiBieSBwYXNzaW5nIGZhbHNlIGZvciBhbGxvd0ludHJpbnNp Yy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKIDIwMjEtMDMtMDggIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJ T04ocjI3MjkwMCk6IE51bGxwdHIgY3Jhc2ggaW4gQ29tcG9zZWRUcmVlSXRlcmF0b3I6OnRyYXZl cnNlTmV4dEluU2hhZG93VHJlZSgpIHZpYSBTaGFkb3dSb290Ojpob3N0Q2hpbGRFbGVtZW50RGlk Q2hhbmdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCBjMDQ3 OTg3ZmI5ZTQ2M2RiMGJlY2NmMjE3NmU1YjZhOTg4ZWQzZTljLi40NmI1YzY5ZmQ0ZDQ5YmQ5MGQ2 ZDUzZDg4ODdkOWQ4OWIzYTQwZTcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAKQEAgLTIyODIsNiArMjI4Miw4IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVQ cmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKICAgICBpZiAoIWlzVGFibGVDZWxsKCkgJiYgc3R5bGVU b1VzZS5sb2dpY2FsV2lkdGgoKS5pc0ZpeGVkKCkgJiYgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgo KS52YWx1ZSgpID49IDAKICAgICAgICAgJiYgIShpc0RlcHJlY2F0ZWRGbGV4SXRlbSgpICYmICFz dHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmludFZhbHVlKCkpKQogICAgICAgICBtX21pblByZWZl cnJlZExvZ2ljYWxXaWR0aCA9IG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gYWRqdXN0Q29u dGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgp KTsKKyAgICBlbHNlIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlv KCkpCisgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbV9tYXhQcmVmZXJyZWRM b2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CiAgICAg ZWxzZQogICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtX21pblByZWZlcnJl ZExvZ2ljYWxXaWR0aCwgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGY1ODJiNTY3YWRhZTkwY2Q0ZDRhMGNlZjJj OWI4ZDYxMWIzMDI4MzMuLjVkY2ViYWFiZWQ5NGY3NzE2M2E3ZjRiM2RiMDVjZjE2MzRhZWVjZjQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC02NTEsNyArNjUxLDcg QEAgdm9pZCBSZW5kZXJCb3g6OnVwZGF0ZUxheWVyVHJhbnNmb3JtKCkKICAgICAgICAgbGF5ZXIo KS0+dXBkYXRlVHJhbnNmb3JtKCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJh aW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgs IExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIFJlbmRlckJsb2NrJiBjYiwgUmVuZGVyRnJhZ21l bnRDb250YWluZXIqIGZyYWdtZW50KSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0 cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0 aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFn bWVudENvbnRhaW5lciogZnJhZ21lbnQsIEFsbG93SW50cmluc2ljIGFsbG93SW50cmluc2ljKSBj b25zdAogewogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKIApA QCAtNjYwLDEzICs2NjAsMTUgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2lj YWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWwKICAgICAgICAgbG9n aWNhbFdpZHRoID0gc3RkOjpjbGFtcChsb2dpY2FsV2lkdGgsIGxvZ2ljYWxNaW5XaWR0aCwgbG9n aWNhbE1heFdpZHRoKTsKICAgICB9CiAKLSAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1heFdp ZHRoKCkuaXNVbmRlZmluZWQoKSkKKyAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRo KCkuaXNVbmRlZmluZWQoKSAmJiAoYWxsb3dJbnRyaW5zaWMgPT0gQWxsb3dJbnRyaW5zaWM6Olll cyB8fCAhc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc0ludHJpbnNpYygpKSkKICAgICAg ICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdp ZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCks IGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKKyAgICBpZiAoYWxsb3dJbnRyaW5zaWMg PT0gQWxsb3dJbnRyaW5zaWM6Ok5vICYmIHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCkuaXNJ bnRyaW5zaWMoKSkKKyAgICAgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aDsKICAgICBhdXRvIG1pbkxl bmd0aCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCk7Ci0gICAgaWYgKHN0eWxlVG9Vc2Uu aGFzQXNwZWN0UmF0aW8oKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYm IG1pbkxlbmd0aC5pc0F1dG8oKSAmJiBzdHlsZVRvVXNlLm92ZXJmbG93SW5saW5lRGlyZWN0aW9u KCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKKyAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RS YXRpbygpICYmIG1pbkxlbmd0aC5pc0F1dG8oKSAmJiAoc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgo KS5pc0F1dG8oKSB8fCBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzTWluQ29udGVudCgpIHx8 IHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNNYXhDb250ZW50KCkpICYmIHN0eWxlVG9Vc2Uu b3ZlcmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgewogICAgICAg ICAvLyBNYWtlIHN1cmUgd2UgYWN0dWFsbHkgdXNlZCB0aGUgYXNwZWN0IHJhdGlvLgogICAgICAg ICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQotICAgICAg ICAgICAgbWluTGVuZ3RoID0gTGVuZ3RoKExlbmd0aFR5cGU6Ok1pbkNvbnRlbnQpOworICAgICAg ICAgICAgbWluTGVuZ3RoID0gTGVuZ3RoKExlbmd0aFR5cGU6Ok1pbkludHJpbnNpYyk7CiAgICAg fQogICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJ bkZyYWdtZW50VXNpbmcoTWluU2l6ZSwgbWluTGVuZ3RoLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZy YWdtZW50KSk7CiB9CkBAIC0yNjEyLDkgKzI2MTQsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6 OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRoTGVu Z3QKIAogICAgIExheW91dFVuaXQgbWluTG9naWNhbFdpZHRoOwogICAgIExheW91dFVuaXQgbWF4 TG9naWNhbFdpZHRoOwotICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2lj YWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKyAgICBpZiAoIWxvZ2ljYWxXaWR0aExlbmd0aC5p c01pbkludHJpbnNpYygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW8oKSkKKyAgICAgICAgbWluTG9naWNhbFdpZHRoID0gbWF4TG9naWNhbFdpZHRoID0gY29tcHV0 ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpOworICAgIGVsc2UKKyAgICAgICAgY29tcHV0 ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgp OwogCi0gICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkNvbnRlbnQoKSkKKyAgICBpZiAo bG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29udGVudCgpIHx8IGxvZ2ljYWxXaWR0aExlbmd0aC5p c01pbkludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gbWluTG9naWNhbFdpZHRoICsgYm9yZGVy QW5kUGFkZGluZzsKIAogICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNYXhDb250ZW50KCkp CkBAIC0yNjQyLDcgKzI2NDcsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxvZ2lj YWxXaWR0aEluRnJhZ21lbnRVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbgogICAgICAgICBy ZXR1cm4gYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9yTGVu Z3RoKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoKSwgbG9naWNhbFdpZHRoLnR5 cGUoKSk7CiAgICAgfQogCi0gICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpKQorICAg IGlmIChsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWMoKSB8fCBsb2dpY2FsV2lkdGguaXNNaW5JbnRy aW5zaWMoKSkKICAgICAgICAgcmV0dXJuIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2lu Zyhsb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgYm9yZGVyQW5kUGFkZGluZ0xv Z2ljYWxXaWR0aCgpKTsKIAogICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQ7CkBAIC01MDk4LDcg KzUxMDMsNyBAQCBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9t QXNwZWN0UmF0aW8oKSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBhdXRvIGgg PSBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKLSAgICByZXR1cm4gaC5pc0F1dG8oKSB8fCAoIWlz T3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgIXBl cmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpOworICAgIHJldHVybiBoLmlzQXV0 bygpIHx8IGguaXNJbnRyaW5zaWMoKSB8fCAoIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIGgu aXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgIXBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNv bHZhYmxlKCkpOwogfQogCiBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0 aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CkBAIC01MTM0LDcgKzUxMzksNyBAQCBMYXlvdXRVbml0 IFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFn bWVudENvbnRhaW5lcgogICAgIGF1dG8gbG9naWNhbFdpZHRoID0gaW5saW5lU2l6ZUZyb21Bc3Bl Y3RSYXRpbyhob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRl ckFuZFBhZGRpbmdFeHRlbnQoKSwgTGF5b3V0VW5pdChzdHlsZSgpLmxvZ2ljYWxBc3BlY3RSYXRp bygpKSwgc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpLCBsb2dpY2FsSGVpZ2h0Zm9y QXNwZWN0UmF0aW8pOwogCiAgICAgTGF5b3V0VW5pdCBjb250YWluZXJXaWR0aEluSW5saW5lRGly ZWN0aW9uID0gc3RkOjptYXg8TGF5b3V0VW5pdD4oMCwgY29udGFpbmluZ0Jsb2NrTG9naWNhbFdp ZHRoRm9yQ29udGVudEluRnJhZ21lbnQoZnJhZ21lbnQpKTsKLSAgICByZXR1cm4gY29uc3RyYWlu TG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lk dGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCk7CisgICAg cmV0dXJuIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lk dGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2soKSwg ZnJhZ21lbnQsIEFsbG93SW50cmluc2ljOjpObyk7CiB9CiAKIHN0ZDo6cGFpcjxMYXlvdXRVbml0 LCBMYXlvdXRVbml0PiBSZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW8oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDZk ZTZlZDZhYzZiOTY4OGZjYjM2NDhkYmI0YjJlYzlhMDliYjE0MjQuLjhkMWE1MDM0OWYwMjRjNDE2 MGJiMDI2Y2Y4OGQyYzRhOWM4Njk5MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmgKQEAgLTg1LDcgKzg1LDggQEAgcHVibGljOgogICAgIExheW91dFVuaXQgbG9naWNhbFdpZHRo KCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gd2lk dGgoKSA6IGhlaWdodCgpOyB9CiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3Qg eyByZXR1cm4gc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gaGVpZ2h0KCkgOiB3 aWR0aCgpOyB9CiAKLSAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21l bnRCeU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRVbml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZy YWdtZW50Q29udGFpbmVyKiA9IG51bGxwdHIpIGNvbnN0OworICAgIGVudW0gY2xhc3MgQWxsb3dJ bnRyaW5zaWMgeyBZZXMsIE5vIH07CisgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lk dGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2sm LCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciosIEFsbG93SW50cmluc2ljID0gQWxsb3dJbnRyaW5z aWM6OlllcykgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlN aW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBPcHRpb25hbDxMYXlvdXRVbml0PiBpbnRy aW5zaWNDb250ZW50SGVpZ2h0KSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkNvbnRl bnRCb3hMb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBPcHRp b25hbDxMYXlvdXRVbml0PiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSBjb25zdDsKIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGNmZWRhNzBlZDRkYmM0YWFjYzlmMTBjMGQxM2Q5YThmYTQ1YTZlNTMuLmVjMDU2NGYzZjA3N2E5 NmJmNDAxODljNGFhNWU4MmE4ZjZkZmY5ZTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0w My0wOCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFN1cHBvcnQgYXNw ZWN0LXJhdGlvIGluIGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg2MQorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRp IEtvaXZpc3RvLgorCisgICAgICAgIEVuYWJsZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAg ICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMy0wOCAgS2ltbW8gS2lubnVuZW4gIDxr a2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYkdMIGNvbnRleHQgc2NyZWVuIGNoYW5n ZSBldmVudHMgc2hvdWxkIHdvcmsgd2l0aCBHUFUgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5k ZXggNDRkMDk1YzkwNDNiMGE0YTY5MTE5M2Q5NjNiYmQwMTM3ZGNiNTAyZC4uYWNiZGNmNjRmZDdi M2FhY2EzOGY3YTdkYTk5NDZjNjJhNzEzYTQ3NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTUw LDYgKzQ1NTAsNyBAQCB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3NoYWRvdy1kaXJlYwogd2Via2l0Lm9yZy9iLzIxNDQ2 MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ct ZGlyZWN0aW9uYWxpdHktMDAyLnRlbnRhdGl2ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3 ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zY29waW5nL3Nsb3R0ZWQtcGxhY2Vob2xkZXIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog CisjICBjb250YWluLWludHJpbnNpYy1zaXplCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bv cy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9i bG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyOC5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCkBAIC00NTU4LDIxICs0NTU5LDggQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h c3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8t MDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50 cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA1Lmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNp emUtMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v aW50cmluc2ljLXNpemUtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDExLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEyLmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2lj LXNpemUtMDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vaW50cmluc2ljLXNpemUtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vdGFibGUtZWxlbWVudC0wMDEuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1p bnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Nv bnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDIuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQo=