215735 2020-08-21 10:36:42 -0700 Fix the Color/ExtendedColor lldb data provider 2020-08-21 15:52:57 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo darin dbates dino ews-watchlist fred.wang jamesr luiz sam simon.fraser tonikitoo webkit-bug-importer oldest_to_newest 1681981 0 simon.fraser 2020-08-21 10:36:42 -0700 Fix the Color/ExtendedColor lldb data provider 1681983 1 407016 simon.fraser 2020-08-21 10:37:51 -0700 Created attachment 407016 Patch 1681985 2 407016 darin 2020-08-21 10:39:43 -0700 Comment on attachment 407016 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407016&action=review > Source/WebCore/ChangeLog:4 > + Fix the Color/ExtendedColor lldb data provider > + https://bugs.webkit.org/show_bug.cgi?id=215735 Changes don’t seem to match the bug title. 1682020 3 407016 simon.fraser 2020-08-21 13:05:21 -0700 Comment on attachment 407016 Patch webkit-patch upload on a git branch strikes again! 1682021 4 407024 simon.fraser 2020-08-21 13:06:52 -0700 Created attachment 407024 Patch 1682051 5 simon.fraser 2020-08-21 15:50:31 -0700 https://trac.webkit.org/r266017 1682053 6 webkit-bug-importer 2020-08-21 15:52:57 -0700 <rdar://problem/67585584> 407016 2020-08-21 10:37:51 -0700 2020-08-21 13:05:21 -0700 Patch bug-215735-20200821103750.patch text/plain 26340 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1ODI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZThkNTU3MzE1ZDdkYmEw NDA3NDM2MDEzNDliYTU2NzVhYjY2NzI4NS4uMDVjNTIzNjczNmQwMTU2M2Q4ZjQ1Y2FkMmI5NGU5 OTg4OTUyY2Q1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTA4LTIxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCB0aGUgQ29s b3IvRXh0ZW5kZWRDb2xvciBsbGRiIGRhdGEgcHJvdmlkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTczNQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3Qvc2Nyb2xsaW5nL21hYy9ob3Jp em9udGFsLW92ZXJmbG93LXRyYXBwaW5nLXNtYWxsLWRlbHRhcy5odG1sCisKKyAgICAgICAgKiBw YWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OndoZWVsRXZl bnQpOgorICAgICAgICAqIHBhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbToKKyAgICAgICAgKFdl YkNvcmU6OmZpbmRFbmNsb3NpbmdTY3JvbGxhYmxlQ29udGFpbmVyKToKKyAgICAgICAgKFdlYkNv cmU6OkV2ZW50SGFuZGxlcjo6ZGV0ZXJtaW5lV2hlZWxFdmVudFRhcmdldCk6CisgICAgICAgIChX ZWJDb3JlOjpFdmVudEhhbmRsZXI6OnByb2Nlc3NXaGVlbEV2ZW50Rm9yU2Nyb2xsaW5nKToKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxMYXRjaGluZ1N0YXRlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Om9wZXJhdG9yPDwpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z0Nvb3JkaW5hdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvcjo6 aGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjpoYW5kbGVXaGVlbEV2ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWU6OmhhbmRsZVdoZWVsRXZlbnRXaXRo Tm9kZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oOgorICAgICAg ICAqIHBhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OmhhbmRsZVdoZWVsRXZlbnRBZnRlck1haW5U aHJlYWQpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5o OgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5o OgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5t bToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjpoYW5kbGVXaGVl bEV2ZW50KToKKwogMjAyMC0wOC0xOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxl LmNvbT4KIAogICAgICAgICBUdXJuIG9mZiB3aGVlbCBldmVudCByZWdpb25zIHVudGlsIHdlIG5l ZWQgdGhlbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IGY5YjFhNWQ3MTViNzU0NzI5 NDI4NTg5YWU1ODFlNjljNWI3ZGUxMWMuLjRlMzMzNTcxZTk4ZTQ1ZTk2NzFmZTVkMmI1NmFmZjhi YWVjYjJhNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTUxMjIsNyArNTEyMiw3 IEBAIGJvb2wgRnJhbWVWaWV3Ojp3aGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYg d2hlZWxFdmVudCkKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQogICAgIGlmIChhdXRvIHNj cm9sbGluZ0Nvb3JkaW5hdG9yID0gdGhpcy0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkgewogICAg ICAgICBpZiAoc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmNvb3JkaW5hdGVzU2Nyb2xsaW5nRm9yRnJh bWVWaWV3KCp0aGlzKSkKLSAgICAgICAgICAgIHJldHVybiBzY3JvbGxpbmdDb29yZGluYXRvci0+ aGFuZGxlV2hlZWxFdmVudCgqdGhpcywgd2hlZWxFdmVudCk7CisgICAgICAgICAgICByZXR1cm4g c2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmhhbmRsZVdoZWVsRXZlbnQoKnRoaXMsIHdoZWVsRXZlbnQs IHNjcm9sbGluZ05vZGVJRCgpKTsKICAgICB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tCmluZGV4IGMwOTMwYjYzNDk1ZTcxODE1OTkxYTQwNmE0 ZDY2NWEyN2JhNzcxNGIuLjk1ZjI3ZGI1ODcxM2I0M2ViMzQzNzc2MzVjMGM1MjdmMGRlNzM2NzUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0KQEAgLTc4Nyw2 ICs3ODcsOCBAQCBzdGF0aWMgU2Nyb2xsYWJsZUFyZWEqIHNjcm9sbGFibGVBcmVhRm9yQm94KFJl bmRlckJveCYgYm94KQogICAgIAogc3RhdGljIENvbnRhaW5lck5vZGUqIGZpbmRFbmNsb3NpbmdT Y3JvbGxhYmxlQ29udGFpbmVyKENvbnRhaW5lck5vZGUqIG5vZGUsIGNvbnN0IFBsYXRmb3JtV2hl ZWxFdmVudCYgd2hlZWxFdmVudCkKIHsKKyAgICBhdXRvIGJpYXNlZERlbHRhID0gU2Nyb2xsQ29u dHJvbGxlcjo6d2hlZWxEZWx0YUJpYXNpbmdUb3dhcmRzVmVydGljYWwod2hlZWxFdmVudCk7CisK ICAgICAvLyBGaW5kIHRoZSBmaXJzdCBub2RlIHdpdGggYSB2YWxpZCBzY3JvbGxhYmxlIGFyZWEg c3RhcnRpbmcgd2l0aCB0aGUgY3VycmVudAogICAgIC8vIG5vZGUgYW5kIHRyYXZlcnNpbmcgaXRz IHBhcmVudHMgKG9yIHNoYWRvdyBob3N0cykuCiAgICAgZm9yIChDb250YWluZXJOb2RlKiBjYW5k aWRhdGUgPSBub2RlOyBjYW5kaWRhdGU7IGNhbmRpZGF0ZSA9IGNhbmRpZGF0ZS0+cGFyZW50T3JT aGFkb3dIb3N0Tm9kZSgpKSB7CkBAIC04MDcsMTAgKzgwOSw4IEBAIHN0YXRpYyBDb250YWluZXJO b2RlKiBmaW5kRW5jbG9zaW5nU2Nyb2xsYWJsZUNvbnRhaW5lcihDb250YWluZXJOb2RlKiBub2Rl LCBjb25zCiAgICAgICAgIGlmICh3aGVlbEV2ZW50LnBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2 ZW50UGhhc2VNYXlCZWdpbiB8fCB3aGVlbEV2ZW50LnBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2 ZW50UGhhc2VDYW5jZWxsZWQpCiAgICAgICAgICAgICByZXR1cm4gY2FuZGlkYXRlOwogCi0gICAg ICAgIGF1dG8gZGVsdGFYID0gd2hlZWxFdmVudC5kZWx0YVgoKTsKLSAgICAgICAgYXV0byBkZWx0 YVkgPSB3aGVlbEV2ZW50LmRlbHRhWSgpOwotICAgICAgICBpZiAoKGRlbHRhWSA+IDAgJiYgIXNj cm9sbGFibGVBcmVhLT5zY3JvbGxlZFRvVG9wKCkpIHx8IChkZWx0YVkgPCAwICYmICFzY3JvbGxh YmxlQXJlYS0+c2Nyb2xsZWRUb0JvdHRvbSgpKQotICAgICAgICAgICAgfHwgKGRlbHRhWCA+IDAg JiYgIXNjcm9sbGFibGVBcmVhLT5zY3JvbGxlZFRvTGVmdCgpKSB8fCAoZGVsdGFYIDwgMCAmJiAh c2Nyb2xsYWJsZUFyZWEtPnNjcm9sbGVkVG9SaWdodCgpKSkKKyAgICAgICAgaWYgKChiaWFzZWRE ZWx0YS5oZWlnaHQoKSA+IDAgJiYgIXNjcm9sbGFibGVBcmVhLT5zY3JvbGxlZFRvVG9wKCkpIHx8 IChiaWFzZWREZWx0YS5oZWlnaHQoKSA8IDAgJiYgIXNjcm9sbGFibGVBcmVhLT5zY3JvbGxlZFRv Qm90dG9tKCkpCisgICAgICAgICAgICB8fCAoYmlhc2VkRGVsdGEud2lkdGgoKSA+IDAgJiYgIXNj cm9sbGFibGVBcmVhLT5zY3JvbGxlZFRvTGVmdCgpKSB8fCAoYmlhc2VkRGVsdGEud2lkdGgoKSA8 IDAgJiYgIXNjcm9sbGFibGVBcmVhLT5zY3JvbGxlZFRvUmlnaHQoKSkpCiAgICAgICAgICAgICBy ZXR1cm4gY2FuZGlkYXRlOwogICAgIH0KICAgICAKQEAgLTk3NywxMSArOTc3LDExIEBAIHZvaWQg RXZlbnRIYW5kbGVyOjpkZXRlcm1pbmVXaGVlbEV2ZW50VGFyZ2V0KGNvbnN0IFBsYXRmb3JtV2hl ZWxFdmVudCYgd2hlZWxFdmVuCiAgICAgICAgICAgICAgICAgc2Nyb2xsYWJsZUNvbnRhaW5lciA9 IHZpZXctPmZyYW1lKCkuZG9jdW1lbnQoKS0+Ym9keU9yRnJhbWVzZXQoKTsKICAgICAgICAgICAg ICAgICBzY3JvbGxhYmxlQXJlYSA9IG1ha2VXZWFrUHRyKHN0YXRpY19jYXN0PFNjcm9sbGFibGVB cmVhJj4oKnZpZXcpKTsKICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgTE9HX1dJVEhfU1RS RUFNKFNjcm9sbExhdGNoaW5nLCBzdHJlYW0gPDwgIkV2ZW50SGFuZGxlcjo6ZGV0ZXJtaW5lV2hl ZWxFdmVudFRhcmdldCgpIC0gZXZlbnQiIDw8IHdoZWVsRXZlbnQgPDwgIiBmb3VuZCBzY3JvbGxh YmxlQ29udGFpbmVyIiA8PCBWYWx1ZU9yTnVsbChzY3JvbGxhYmxlQ29udGFpbmVyLmdldCgpKSA8 PCAiIHNjcm9sbGFibGVBcmVhICIgPDwgKHNjcm9sbGFibGVBcmVhID8gc2Nyb2xsYWJsZUFyZWEu Z2V0KCkgOiBudWxscHRyKSk7CiAgICAgICAgIH0KICAgICB9CiAKKyAgICBMT0dfV0lUSF9TVFJF QU0oU2Nyb2xsTGF0Y2hpbmcsIHN0cmVhbSA8PCAiRXZlbnRIYW5kbGVyOjpkZXRlcm1pbmVXaGVl bEV2ZW50VGFyZ2V0KCkgLSBldmVudCIgPDwgd2hlZWxFdmVudCA8PCAiIGZvdW5kIHNjcm9sbGFi bGVDb250YWluZXIiIDw8IFZhbHVlT3JOdWxsKHNjcm9sbGFibGVDb250YWluZXIuZ2V0KCkpIDw8 ICIgc2Nyb2xsYWJsZUFyZWEgIiA8PCBWYWx1ZU9yTnVsbChzY3JvbGxhYmxlQXJlYS5nZXQoKSkg PDwgIiwgbGF0Y2hpbmcgc3RhdGUgaXMgIiA8PCBwYWdlLT5sYXRjaGluZ1N0YXRlU3RhY2soKSk7 CisKICAgICBpZiAoc2Nyb2xsYWJsZUFyZWEgJiYgcGFnZS0+aXNNb25pdG9yaW5nV2hlZWxFdmVu dHMoKSkKICAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNjcm9sbEFuaW1hdG9yKCkuc2V0V2hlZWxF dmVudFRlc3RNb25pdG9yKHBhZ2UtPndoZWVsRXZlbnRUZXN0TW9uaXRvcigpKTsKIApAQCAtMTAw MCwxMyArMTAwMCwxNCBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6ZGV0ZXJtaW5lV2hlZWxFdmVudFRh cmdldChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbgogCiAgICAgICAgICAgICAg ICAgcGFnZS0+d2hlZWxFdmVudERlbHRhRmlsdGVyKCktPmJlZ2luRmlsdGVyaW5nRGVsdGFzKCk7 CiAgICAgICAgICAgICAgICAgaXNPdmVyV2lkZ2V0ID0gcmVzdWx0LmlzT3ZlcldpZGdldCgpOwot ICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsTGF0Y2hp bmcsIHN0cmVhbSA8PCAiRXZlbnRIYW5kbGVyOjpkZXRlcm1pbmVXaGVlbEV2ZW50VGFyZ2V0KCkg LSBjb25zaWRlcmluZyBsYXRjaGluZyBmb3IgIiA8PCB3aGVlbEV2ZW50IDw8ICIsIGF0IHNjcm9s bCBsaW1pdCAiIDw8IHN0YXJ0aW5nQXRTY3JvbGxMaW1pdCA8PCAiLCBsYXRjaGluZyBzdGF0ZSAi IDw8IHBhZ2UtPmxhdGNoaW5nU3RhdGVTdGFjaygpKTsKKyAgICAgICAgICAgICAgICBMT0dfV0lU SF9TVFJFQU0oU2Nyb2xsTGF0Y2hpbmcsIHN0cmVhbSA8PCAiIG5vdCBhdCBzY3JvbGwgbGltaXQ7 IGxhdGNoaW5nIHN0YXRlIGlzICIgPDwgcGFnZS0+bGF0Y2hpbmdTdGF0ZVN0YWNrKCkpOworICAg ICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbExh dGNoaW5nLCBzdHJlYW0gPDwgIiBhdCBzY3JvbGwgbGltaXQ7IG5vdCBsYXRjaGluZyIpOwogICAg ICAgICB9CiAgICAgfSBlbHNlIGlmICh3aGVlbEV2ZW50LnNob3VsZFJlc2V0TGF0Y2hpbmcoKSkg ewogICAgICAgICBjbGVhckxhdGNoZWRTdGF0ZSgpOwotICAgICAgICBMT0dfV0lUSF9TVFJFQU0o U2Nyb2xsTGF0Y2hpbmcsIHN0cmVhbSA8PCAiRXZlbnRIYW5kbGVyOjpkZXRlcm1pbmVXaGVlbEV2 ZW50VGFyZ2V0KCkgLSByZXNldCBsYXRjaGluZyBmb3IgZXZlbnQgIiA8PCB3aGVlbEV2ZW50IDw8 ICIgbGF0Y2hpbmcgc3RhdGUgIiA8PCBwYWdlLT5sYXRjaGluZ1N0YXRlU3RhY2soKSk7CisgICAg ICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxMYXRjaGluZywgc3RyZWFtIDw8ICIgIHJlc2V0IGxh dGNoaW5nIik7CiAgICAgfQogCiAgICAgaWYgKCF3aGVlbEV2ZW50LnNob3VsZFJlc2V0TGF0Y2hp bmcoKSAmJiBsYXRjaGluZ1N0YXRlICYmIGxhdGNoaW5nU3RhdGUtPndoZWVsRXZlbnRFbGVtZW50 KCkpIHsKQEAgLTEwMjQsNiArMTAyNSw4IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpkZXRlcm1pbmVX aGVlbEV2ZW50VGFyZ2V0KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVuCiAgICAg ICAgICAgICBpZiAoIWxhdGNoZWRUb0ZyYW1lT3JCb2R5KCpzY3JvbGxhYmxlQ29udGFpbmVyKSAm JiAhbGF0Y2hpbmdTdGF0ZS0+d2lkZ2V0SXNMYXRjaGVkKCkpCiAgICAgICAgICAgICAgICAgc2Ny b2xsYWJsZUFyZWEgPSBzY3JvbGxhYmxlQXJlYUZvckNvbnRhaW5lck5vZGUoKnNjcm9sbGFibGVD b250YWluZXIpOwogICAgICAgICB9CisKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbExh dGNoaW5nLCBzdHJlYW0gPDwgIiAgdXNpbmcgbGF0Y2hlZCBzdGF0ZSBhbmQgc2Nyb2xsYWJsZUFy ZWEgIiA8PCBWYWx1ZU9yTnVsbChzY3JvbGxhYmxlQXJlYS5nZXQoKSkpOwogICAgIH0KIH0KIApA QCAtMTA4NCw2ICsxMDg3LDggQEAgYm9vbCBFdmVudEhhbmRsZXI6OnByb2Nlc3NXaGVlbEV2ZW50 Rm9yU2Nyb2xsaW5nKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWwKIAogICAgICAgICBB U1NFUlQodmlldyk7CiAKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbExhdGNoaW5nLCBz dHJlYW0gPDwgIkV2ZW50SGFuZGxlcjo6cHJvY2Vzc1doZWVsRXZlbnRGb3JTY3JvbGxpbmcgc2Vu ZGluZyB0byB2aWV3ICIgPDwgKnZpZXcgPDwgIiAoc2Nyb2xsYWJsZUNvbnRhaW5lciAiIDw8IFZh bHVlT3JOdWxsKHNjcm9sbGFibGVDb250YWluZXIpIDw8ICIpIik7CisKICAgICAgICAgYm9vbCBk aWRIYW5kbGVXaGVlbEV2ZW50ID0gdmlldy0+d2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKICAgICAg ICAgaWYgKHNjcm9sbGFibGVDb250YWluZXIgPT0gbGF0Y2hpbmdTdGF0ZS0+c2Nyb2xsYWJsZUNv bnRhaW5lcigpKSB7CiAgICAgICAgICAgICAvLyBJZiB3ZSBhcmUganVzdCBzdGFydGluZyBhIHNj cm9sbCBldmVudCwgYW5kIGhhdmUgbm93aGVyZSBsZWZ0IHRvIHNjcm9sbCwgYWxsb3cKQEAgLTEw OTQsNyArMTA5OSw4IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpwcm9jZXNzV2hlZWxFdmVudEZvclNj cm9sbGluZyhjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsCiAgICAgICAgIC8vIElmIHRo ZSBwbGF0Zm9ybSB3aWRnZXQgaXMgaGFuZGxpbmcgdGhlIGV2ZW50LCB3ZSBhbHdheXMgd2FudCB0 byByZXR1cm4gZmFsc2UuCiAgICAgICAgIGlmIChzY3JvbGxhYmxlQXJlYSA9PSB2aWV3ICYmIHZp ZXctPnBsYXRmb3JtV2lkZ2V0KCkpCiAgICAgICAgICAgICBkaWRIYW5kbGVXaGVlbEV2ZW50ID0g ZmFsc2U7Ci0gICAgICAgIAorCisgICAgICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxMYXRjaGlu Zywgc3RyZWFtIDw8ICIgIEV2ZW50SGFuZGxlcjo6cHJvY2Vzc1doZWVsRXZlbnRGb3JTY3JvbGxp bmcgcmV0dXJuaW5nICIgPDwgZGlkSGFuZGxlV2hlZWxFdmVudCk7CiAgICAgICAgIHJldHVybiBk aWRIYW5kbGVXaGVlbEV2ZW50OwogICAgIH0KICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbExhdGNoaW5nU3RhdGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsTGF0Y2hpbmdTdGF0ZS5jcHAKaW5kZXggMWM4Y2I1NjU2 NDIxYjA1NzAxMDFmYWZlMjEwZGY5Yjk0NDBmNzRiZC4uNDhjZTVkZDIwNTk4MDA3ZmM3OGVhMmI3 OWU1NTY4ZGViODRlNGU3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsTGF0Y2hpbmdTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsTGF0Y2hpbmdTdGF0ZS5jcHAKQEAgLTY5LDkgKzY5LDkgQEAgVGV4dFN0cmVh bSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgU2Nyb2xsTGF0Y2hpbmdTdGF0ZSYg c3RhdGUpCiAgICAgVGV4dFN0cmVhbSBtdWx0aWxpbmVTdHJlYW07CiAgICAgbXVsdGlsaW5lU3Ry ZWFtLnNldEluZGVudCh0cy5pbmRlbnQoKSArIDIpOwogCi0gICAgbXVsdGlsaW5lU3RyZWFtLmR1 bXBQcm9wZXJ0eSgiZWxlbWVudCIsIHN0YXRlLndoZWVsRXZlbnRFbGVtZW50KCkpOworICAgIG11 bHRpbGluZVN0cmVhbS5kdW1wUHJvcGVydHkoImVsZW1lbnQiLCBWYWx1ZU9yTnVsbChzdGF0ZS53 aGVlbEV2ZW50RWxlbWVudCgpKSk7CiAgICAgbXVsdGlsaW5lU3RyZWFtLmR1bXBQcm9wZXJ0eSgi cHJldmlvdXNFbGVtZW50Iiwgc3RhdGUucHJldmlvdXNXaGVlbFNjcm9sbGVkRWxlbWVudCgpKTsK LSAgICBtdWx0aWxpbmVTdHJlYW0uZHVtcFByb3BlcnR5KCJzY3JvbGxhYmxlIGNvbnRhaW5lciIs IHN0YXRlLnNjcm9sbGFibGVDb250YWluZXIoKSk7CisgICAgbXVsdGlsaW5lU3RyZWFtLmR1bXBQ cm9wZXJ0eSgic2Nyb2xsYWJsZSBjb250YWluZXIiLCBWYWx1ZU9yTnVsbChzdGF0ZS5zY3JvbGxh YmxlQ29udGFpbmVyKCkpKTsKICAgICBtdWx0aWxpbmVTdHJlYW0uZHVtcFByb3BlcnR5KCJ3aWRn ZXRJc0xhdGNoZWQiLCBzdGF0ZS53aWRnZXRJc0xhdGNoZWQoKSk7CiAgICAgbXVsdGlsaW5lU3Ry ZWFtLmR1bXBQcm9wZXJ0eSgic3RhcnRlZCBhdCBsaW1pdCIsIHN0YXRlLnN0YXJ0ZWRHZXN0dXJl QXRTY3JvbGxMaW1pdCgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggOTYzNmMwZWJjNWU1YjMwYjRkMDExYzYz NmRmMzAzOTBjMDgzNGExMC4uNDgyNzQwYWFjNTMwMjQzNDAyMTg5OWJjZGY3YjJlYzMxZTEwNWVk NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29v cmRpbmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdD b29yZGluYXRvci5oCkBAIC0xMjcsNyArMTI3LDcgQEAgcHVibGljOgogICAgIC8vIFRoZXNlIHZp cnR1YWwgZnVuY3Rpb25zIGFyZSBjdXJyZW50bHkgdW5pcXVlIHRvIHRoZSB0aHJlYWRlZCBzY3Jv bGxpbmcgYXJjaGl0ZWN0dXJlLiAKICAgICB2aXJ0dWFsIHZvaWQgY29tbWl0VHJlZVN0YXRlSWZO ZWVkZWQoKSB7IH0KICAgICB2aXJ0dWFsIGJvb2wgcmVxdWVzdFNjcm9sbFBvc2l0aW9uVXBkYXRl KFNjcm9sbGFibGVBcmVhJiwgY29uc3QgSW50UG9pbnQmLCBTY3JvbGxUeXBlID0gU2Nyb2xsVHlw ZTo6UHJvZ3JhbW1hdGljLCBTY3JvbGxDbGFtcGluZyA9IFNjcm9sbENsYW1waW5nOjpDbGFtcGVk KSB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KEZy YW1lVmlldyYsIGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpIHsgcmV0dXJuIGZhbHNlOyB9Cisg ICAgdmlydHVhbCBib29sIGhhbmRsZVdoZWVsRXZlbnQoRnJhbWVWaWV3JiwgY29uc3QgUGxhdGZv cm1XaGVlbEV2ZW50JiwgU2Nyb2xsaW5nTm9kZUlEKSB7IHJldHVybiBmYWxzZTsgfQogCiAgICAg Ly8gQ3JlYXRlIGFuIHVucGFyZW50ZWQgbm9kZS4KICAgICB2aXJ0dWFsIFNjcm9sbGluZ05vZGVJ RCBjcmVhdGVOb2RlKFNjcm9sbGluZ05vZGVUeXBlLCBTY3JvbGxpbmdOb2RlSUQgbmV3Tm9kZUlE KSB7IHJldHVybiBuZXdOb2RlSUQ7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nVHJlZS5jcHAKaW5kZXggMDY2MTY1ZDI2MmY0MDc2NTliYTZiMzUyNGMxNTkw NjIwM2YxZGM1OC4uMzVlMDY1MzQ0MTA2ZmNkZGQwM2M2MTZmODY1MzBlMDQwYjQ5YzFlNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKQEAg LTEzNCwzNCArMTM0LDM5IEBAIFdoZWVsRXZlbnRIYW5kbGluZ1Jlc3VsdCBTY3JvbGxpbmdUcmVl OjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVuCiAKICAgICAgICAgTE9H X1dJVEhfU1RSRUFNKFNjcm9sbGluZywgc3RyZWFtIDw8ICJTY3JvbGxpbmdUcmVlOjpoYW5kbGVX aGVlbEV2ZW50IGZvdW5kIG5vZGUgIiA8PCAobm9kZSA/IG5vZGUtPnNjcm9sbGluZ05vZGVJRCgp IDogMCkgPDwgIiBmb3IgcG9pbnQgIiA8PCBwb3NpdGlvbik7CiAKLSAgICAgICAgd2hpbGUgKG5v ZGUpIHsKLSAgICAgICAgICAgIGlmIChpczxTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZT4oKm5v ZGUpKSB7Ci0gICAgICAgICAgICAgICAgYXV0byYgc2Nyb2xsaW5nTm9kZSA9IGRvd25jYXN0PFNj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlPigqbm9kZSk7Ci0gICAgICAgICAgICAgICAgYXV0byBy ZXN1bHQgPSBzY3JvbGxpbmdOb2RlLmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7Ci0KLSAg ICAgICAgICAgICAgICBpZiAocmVzdWx0Lndhc0hhbmRsZWQpIHsKLSAgICAgICAgICAgICAgICAg ICAgbV9sYXRjaGluZ0NvbnRyb2xsZXIubm9kZURpZEhhbmRsZUV2ZW50KHNjcm9sbGluZ05vZGUu c2Nyb2xsaW5nTm9kZUlEKCksIHdoZWVsRXZlbnQsIG1fYWxsb3dMYXRjaGluZyk7Ci0gICAgICAg ICAgICAgICAgICAgIG1fZ2VzdHVyZVN0YXRlLm5vZGVEaWRIYW5kbGVFdmVudChzY3JvbGxpbmdO b2RlLnNjcm9sbGluZ05vZGVJRCgpLCB3aGVlbEV2ZW50KTsKLSAgICAgICAgICAgICAgICAgICAg cmV0dXJuIHJlc3VsdDsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgIHJldHVybiBoYW5kbGVX aGVlbEV2ZW50V2l0aE5vZGUod2hlZWxFdmVudCwgbm9kZS5nZXQoKSk7CisgICAgfSgpOwogCi0g ICAgICAgICAgICAgICAgaWYgKHJlc3VsdC5uZWVkc01haW5UaHJlYWRQcm9jZXNzaW5nKCkpCi0g ICAgICAgICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgICAgICAgICB9CisgICAgcmV0 dXJuIHJlc3VsdDsKK30KIAotICAgICAgICAgICAgaWYgKGlzPFNjcm9sbGluZ1RyZWVPdmVyZmxv d1Njcm9sbFByb3h5Tm9kZT4oKm5vZGUpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGF1dG8gcmVs YXRlZE5vZGUgPSBub2RlRm9ySUQoZG93bmNhc3Q8U2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xs UHJveHlOb2RlPigqbm9kZSkub3ZlcmZsb3dTY3JvbGxpbmdOb2RlSUQoKSkpIHsKLSAgICAgICAg ICAgICAgICAgICAgbm9kZSA9IHJlbGF0ZWROb2RlOwotICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKLSAgICAgICAgICAgICAgICB9CitXaGVlbEV2ZW50SGFuZGxpbmdSZXN1bHQgU2Nyb2xs aW5nVHJlZTo6aGFuZGxlV2hlZWxFdmVudFdpdGhOb2RlKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVu dCYgd2hlZWxFdmVudCwgU2Nyb2xsaW5nVHJlZU5vZGUqIG5vZGUpCit7CisgICAgd2hpbGUgKG5v ZGUpIHsKKyAgICAgICAgaWYgKGlzPFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlPigqbm9kZSkp IHsKKyAgICAgICAgICAgIGF1dG8mIHNjcm9sbGluZ05vZGUgPSBkb3duY2FzdDxTY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZT4oKm5vZGUpOworICAgICAgICAgICAgYXV0byByZXN1bHQgPSBzY3Jv bGxpbmdOb2RlLmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7CisKKyAgICAgICAgICAgIGlm IChyZXN1bHQud2FzSGFuZGxlZCkgeworICAgICAgICAgICAgICAgIG1fbGF0Y2hpbmdDb250cm9s bGVyLm5vZGVEaWRIYW5kbGVFdmVudChzY3JvbGxpbmdOb2RlLnNjcm9sbGluZ05vZGVJRCgpLCB3 aGVlbEV2ZW50LCBtX2FsbG93TGF0Y2hpbmcpOworICAgICAgICAgICAgICAgIG1fZ2VzdHVyZVN0 YXRlLm5vZGVEaWRIYW5kbGVFdmVudChzY3JvbGxpbmdOb2RlLnNjcm9sbGluZ05vZGVJRCgpLCB3 aGVlbEV2ZW50KTsKKyAgICAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgICAgICAgICAg fQogCi0gICAgICAgICAgICBub2RlID0gbm9kZS0+cGFyZW50KCk7CisgICAgICAgICAgICBpZiAo cmVzdWx0Lm5lZWRzTWFpblRocmVhZFByb2Nlc3NpbmcoKSkKKyAgICAgICAgICAgICAgICByZXR1 cm4gcmVzdWx0OwogICAgICAgICB9Ci0gICAgICAgIHJldHVybiBXaGVlbEV2ZW50SGFuZGxpbmdS ZXN1bHQ6OnVuaGFuZGxlZCgpOwotICAgIH0oKTsKIAotICAgIHJldHVybiByZXN1bHQ7CisgICAg ICAgIGlmIChpczxTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxQcm94eU5vZGU+KCpub2RlKSkg eworICAgICAgICAgICAgaWYgKGF1dG8gcmVsYXRlZE5vZGUgPSBub2RlRm9ySUQoZG93bmNhc3Q8 U2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsUHJveHlOb2RlPigqbm9kZSkub3ZlcmZsb3dTY3Jv bGxpbmdOb2RlSUQoKSkpIHsKKyAgICAgICAgICAgICAgICBub2RlID0gcmVsYXRlZE5vZGU7Cisg ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAg ICAgICBub2RlID0gbm9kZS0+cGFyZW50KCk7CisgICAgfQorICAgIHJldHVybiBXaGVlbEV2ZW50 SGFuZGxpbmdSZXN1bHQ6OnVuaGFuZGxlZCgpOwogfQogCiBSZWZQdHI8U2Nyb2xsaW5nVHJlZU5v ZGU+IFNjcm9sbGluZ1RyZWU6OnNjcm9sbGluZ05vZGVGb3JQb2ludChGbG9hdFBvaW50KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCmluZGV4IDBkZGQ3 MTFmZjllZTEyYzNmMzQxZmRjOWQ0ZmE1MzU2ODI4MmU4ZWUuLmYwMmNjYjIzMWFlOWMyZGI4YzUx NjlmOGU1ZmEzYTQzNThmNWFjNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdUcmVlLmgKQEAgLTIxMiw2ICsyMTIsOCBAQCBwdWJsaWM6CiAgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCB3aWxsUHJvY2Vzc1doZWVsRXZlbnQoKTsKIAogcHJvdGVjdGVkOgorICAg IFdoZWVsRXZlbnRIYW5kbGluZ1Jlc3VsdCBoYW5kbGVXaGVlbEV2ZW50V2l0aE5vZGUoY29uc3Qg UGxhdGZvcm1XaGVlbEV2ZW50JiwgU2Nyb2xsaW5nVHJlZU5vZGUqKTsKKwogICAgIEZsb2F0UG9p bnQgbWFpbkZyYW1lU2Nyb2xsUG9zaXRpb24oKSBjb25zdDsKICAgICB2b2lkIHNldE1haW5GcmFt ZVNjcm9sbFBvc2l0aW9uKEZsb2F0UG9pbnQpOwogCkBAIC0yMzQsNiArMjM2LDcgQEAgcHJpdmF0 ZToKICNpZiBFTkFCTEUoV0hFRUxfRVZFTlRfUkVHSU9OUykKICAgICBXRUJDT1JFX0VYUE9SVCB2 aXJ0dWFsIE9wdGlvblNldDxFdmVudExpc3RlbmVyUmVnaW9uVHlwZT4gZXZlbnRMaXN0ZW5lclJl Z2lvblR5cGVzRm9yUG9pbnQoRmxvYXRQb2ludCkgY29uc3Q7CiAjZW5kaWYKKwogICAgIHZpcnR1 YWwgdm9pZCByZWNlaXZlZFdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JikgeyB9 CiAgICAgCiAgICAgUmVmUHRyPFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU+IG1fcm9v dE5vZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRl ZFNjcm9sbGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFk ZWRTY3JvbGxpbmdUcmVlLmNwcAppbmRleCAzNGJkMDE5M2FlMDEyZGEyOTQ2MmQ2OTI0YTdiNWUw N2FiZjY2YWU3Li42NmVkMWY3MzZjMjdlODc2ZGFhNmY1MjRhODdjMGJlYTBlMDFhZTBjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1Ry ZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xs aW5nVHJlZS5jcHAKQEAgLTYxLDEwICs2MSwxMyBAQCBXaGVlbEV2ZW50SGFuZGxpbmdSZXN1bHQg VGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtVwog ICAgIHJldHVybiBTY3JvbGxpbmdUcmVlOjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwog fQogCi1ib29sIFRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6aGFuZGxlV2hlZWxFdmVudEFmdGVyTWFp blRocmVhZChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCitib29sIFRocmVh ZGVkU2Nyb2xsaW5nVHJlZTo6aGFuZGxlV2hlZWxFdmVudEFmdGVyTWFpblRocmVhZChjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQsIFNjcm9sbGluZ05vZGVJRCB0YXJnZXROb2Rl SUQpCiB7CisgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbGluZywgc3RyZWFtIDw8ICJUaHJlYWRl ZFNjcm9sbGluZ1RyZWU6OmhhbmRsZVdoZWVsRXZlbnRBZnRlck1haW5UaHJlYWQgIiA8PCB3aGVl bEV2ZW50KTsKICAgICBTZXRGb3JTY29wZTxib29sPiBkaXNhbGxvd0xhdGNoaW5nU2NvcGUobV9h bGxvd0xhdGNoaW5nLCBmYWxzZSk7Ci0gICAgYXV0byByZXN1bHQgPSBoYW5kbGVXaGVlbEV2ZW50 KHdoZWVsRXZlbnQpOworCisgICAgUmVmUHRyPFNjcm9sbGluZ1RyZWVOb2RlPiB0YXJnZXROb2Rl ID0gbm9kZUZvcklEKHRhcmdldE5vZGVJRCk7CisgICAgYXV0byByZXN1bHQgPSBoYW5kbGVXaGVl bEV2ZW50V2l0aE5vZGUod2hlZWxFdmVudCwgdGFyZ2V0Tm9kZS5nZXQoKSk7CiAgICAgcmV0dXJu IHJlc3VsdC53YXNIYW5kbGVkOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCmluZGV4IDMyZGQ1YmM3YWZhNDk2MTBk ODMwYTY1N2Y0YjRhYzUxOWU2YmY1MTkuLjAwNzBiYjUzY2ExZTU2ODM0M2U0ODA2OWU1ZDMwMTQz ZThjNTZmNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVh ZGVkU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Ro cmVhZGVkU2Nyb2xsaW5nVHJlZS5oCkBAIC00Nyw3ICs0Nyw3IEBAIHB1YmxpYzoKIAogICAgIFdo ZWVsRXZlbnRIYW5kbGluZ1Jlc3VsdCBoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hl ZWxFdmVudCYpIG92ZXJyaWRlOwogCi0gICAgYm9vbCBoYW5kbGVXaGVlbEV2ZW50QWZ0ZXJNYWlu VGhyZWFkKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpOworICAgIGJvb2wgaGFuZGxlV2hlZWxF dmVudEFmdGVyTWFpblRocmVhZChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmLCBTY3JvbGxpbmdO b2RlSUQpOwogCiAgICAgdm9pZCBpbnZhbGlkYXRlKCkgb3ZlcnJpZGU7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1h Yy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5h dG9yTWFjLmgKaW5kZXggODFmYjA5NGNmMDc0MDQwOWY5MWUyN2ZhNmFhNjM1ZmZjMmExYzI1NS4u YjIyYTc2YjA5MTRiYWQ2NjkxNGZkZmRkMmNlNmQ1OTdlNTJmNjE1NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5h dG9yTWFjLmgKQEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogICAgIHZvaWQgY29tbWl0VHJlZVN0 YXRlSWZOZWVkZWQoKSBmaW5hbDsKIAogICAgIC8vIEhhbmRsZSB0aGUgd2hlZWwgZXZlbnQgb24g dGhlIHNjcm9sbGluZyB0aHJlYWQuIFJldHVybnMgd2hldGhlciB0aGUgZXZlbnQgd2FzIGhhbmRs ZWQgb3Igbm90LgotICAgIGJvb2wgaGFuZGxlV2hlZWxFdmVudChGcmFtZVZpZXcmLCBjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmKSBvdmVycmlkZTsKKyAgICBib29sIGhhbmRsZVdoZWVsRXZlbnQo RnJhbWVWaWV3JiwgY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiwgU2Nyb2xsaW5nTm9kZUlEKSBv dmVycmlkZTsKIAogcHJpdmF0ZToKICAgICB2b2lkIHNjaGVkdWxlVHJlZVN0YXRlQ29tbWl0KCkg ZmluYWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Ny b2xsaW5nQ29vcmRpbmF0b3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9t YWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW0KaW5kZXggMmI4YjkwYmI0ZmIwNWMxZDQzNGQ4 NWE5NDMxZWI5MWFhMDg1OTZkMS4uYWY1NTU0NGRiMDhiNGJkYjAxNWJhMjk0OWMxMTMyYjkwZGM2 ZDZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9s bGluZ0Nvb3JkaW5hdG9yTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbQpAQCAtNzMsNyArNzMsNyBAQCB2b2lkIFNj cm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjpwYWdlRGVzdHJveWVkKCkKICAgICB9KTsKIH0KIAotYm9v bCBTY3JvbGxpbmdDb29yZGluYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudChGcmFtZVZpZXcmLCBj b25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCitib29sIFNjcm9sbGluZ0Nvb3Jk aW5hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50KEZyYW1lVmlldyYsIGNvbnN0IFBsYXRmb3JtV2hl ZWxFdmVudCYgd2hlZWxFdmVudCwgU2Nyb2xsaW5nTm9kZUlEIHRhcmdldE5vZGUpCiB7CiAgICAg QVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBBU1NFUlQobV9wYWdlKTsKQEAgLTg0LDggKzg0 LDggQEAgYm9vbCBTY3JvbGxpbmdDb29yZGluYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudChGcmFt ZVZpZXcmLCBjb25zdCBQbGF0Zm9ybVdoZWVsRXYKICAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xs aW5nLCBzdHJlYW0gPDwgIlNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50 IC0gc2VuZGluZyBldmVudCB0byBzY3JvbGxpbmcgdGhyZWFkIik7CiAKICAgICBSZWZQdHI8VGhy ZWFkZWRTY3JvbGxpbmdUcmVlPiB0aHJlYWRlZFNjcm9sbGluZ1RyZWUgPSBkb3duY2FzdDxUaHJl YWRlZFNjcm9sbGluZ1RyZWU+KHNjcm9sbGluZ1RyZWUoKSk7Ci0gICAgU2Nyb2xsaW5nVGhyZWFk OjpkaXNwYXRjaChbdGhyZWFkZWRTY3JvbGxpbmdUcmVlLCB3aGVlbEV2ZW50XSB7Ci0gICAgICAg IHRocmVhZGVkU2Nyb2xsaW5nVHJlZS0+aGFuZGxlV2hlZWxFdmVudEFmdGVyTWFpblRocmVhZCh3 aGVlbEV2ZW50KTsKKyAgICBTY3JvbGxpbmdUaHJlYWQ6OmRpc3BhdGNoKFt0aHJlYWRlZFNjcm9s bGluZ1RyZWUsIHdoZWVsRXZlbnQsIHRhcmdldE5vZGVdIHsKKyAgICAgICAgdGhyZWFkZWRTY3Jv bGxpbmdUcmVlLT5oYW5kbGVXaGVlbEV2ZW50QWZ0ZXJNYWluVGhyZWFkKHdoZWVsRXZlbnQsIHRh cmdldE5vZGUpOwogICAgIH0pOwogICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGZlNmJhNGQ2ZWRmODhkZDFjYjk0 ZjU5YWNmZjYzZTY0MmM5MDA1ZDQuLmU5MGUxZWM3NmFkMjgwNTQ3ZTU2YmI5M2JlZDExNGY1MTk4 ZTBiZWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNiBAQAorMjAyMC0wOC0yMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2Vy QGFwcGxlLmNvbT4KKworICAgICAgICBGaXggdGhlIENvbG9yL0V4dGVuZGVkQ29sb3IgbGxkYiBk YXRhIHByb3ZpZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTU3MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXggdGhlIGRhdGEgcHJvdmlkZXIgZm9yIENvbG9yIGFmdGVyIENvbG9yIGFuZCBFeHRl bmRlZENvbG9yIGludGVybmFscyBjaGFuZ2VkLgorCisgICAgICAgICogbGxkYi9sbGRiX3dlYmtp dC5weToKKyAgICAgICAgKFdlYkNvcmVDb2xvclByb3ZpZGVyLl90b19zdHJpbmdfZXh0ZW5kZWQp OgorICAgICAgICAoV2ViQ29yZUNvbG9yUHJvdmlkZXIudG9fc3RyaW5nKToKKwogMjAyMC0wOC0x NyAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgRGV2ZWxv cCBhIG1lY2hhbmlzbSB0byB1bnN1YnNjcmliZSBmcm9tIGV3cyBlbWFpbHMKZGlmZiAtLWdpdCBh L1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkgYi9Ub29scy9sbGRiL2xsZGJfd2Via2l0LnB5Cmlu ZGV4IDFiYjdlZTFjNjMwYjJhNDNhYTkwYjE3NTViZWRiOTU4OTRmZWJmYzQuLmNmZTNkY2Q4NGJj ZGRjMDE2MDk5ODMzYjY5YWU4ZDVjNzdkYmY3ZjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2xsZGIvbGxk Yl93ZWJraXQucHkKKysrIGIvVG9vbHMvbGxkYi9sbGRiX3dlYmtpdC5weQpAQCAtNDY3LDIwICs0 NjcsMjYgQEAgY2xhc3MgV2ViQ29yZUNvbG9yUHJvdmlkZXI6CiAgICAgZGVmIF90b19zdHJpbmdf ZXh0ZW5kZWQoc2VsZik6CiAgICAgICAgIGV4dGVuZGVkX2NvbG9yID0gc2VsZi52YWxvYmouR2V0 Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9jb2xvckRhdGEnKS5HZXRDaGlsZE1lbWJlcldpdGhOYW1l KCdleHRlbmRlZENvbG9yJykuRGVyZWZlcmVuY2UoKQogICAgICAgICBwcm9maWxlID0gZXh0ZW5k ZWRfY29sb3IuR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9jb2xvclNwYWNlJykuR2V0VmFsdWUo KQotICAgICAgICBpZiBwcm9maWxlID09ICdDb2xvclNwYWNlU1JHQic6CisgICAgICAgIGlmIHBy b2ZpbGUgPT0gJ1NSR0InOgogICAgICAgICAgICAgcHJvZmlsZSA9ICdzcmdiJwotICAgICAgICBl bGlmIHByb2ZpbGUgPT0gJ0NvbG9yU3BhY2VEaXNwbGF5UDMnOgorICAgICAgICBlbGlmIHByb2Zp bGUgPT0gJ0xpbmVhclJHQic6CisgICAgICAgICAgICBwcm9maWxlID0gJ2xpbmVhci1yZ2InCisg ICAgICAgIGVsaWYgcHJvZmlsZSA9PSAnRGlzcGxheVAzJzoKICAgICAgICAgICAgIHByb2ZpbGUg PSAnZGlzcGxheS1wMycKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHByb2ZpbGUgPSAndW5r bm93bicKLSAgICAgICAgcmVkID0gZmxvYXQoZXh0ZW5kZWRfY29sb3IuR2V0Q2hpbGRNZW1iZXJX aXRoTmFtZSgnbV9yZWQnKS5HZXRWYWx1ZSgpKQotICAgICAgICBncmVlbiA9IGZsb2F0KGV4dGVu ZGVkX2NvbG9yLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fZ3JlZW4nKS5HZXRWYWx1ZSgpKQot ICAgICAgICBibHVlID0gZmxvYXQoZXh0ZW5kZWRfY29sb3IuR2V0Q2hpbGRNZW1iZXJXaXRoTmFt ZSgnbV9ibHVlJykuR2V0VmFsdWUoKSkKLSAgICAgICAgYWxwaGEgPSBmbG9hdChleHRlbmRlZF9j b2xvci5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX2FscGhhJykuR2V0VmFsdWUoKSkKKworICAg ICAgICBjb2xvcl9jb21wb25lbnRzID0gZXh0ZW5kZWRfY29sb3IuR2V0Q2hpbGRNZW1iZXJXaXRo TmFtZSgnbV9jb21wb25lbnRzJykKKyAgICAgICAgc3RkX2FycmF5X2VsZW1zID0gY29sb3JfY29t cG9uZW50cy5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdjb21wb25lbnRzJykuR2V0Q2hpbGRNZW1i ZXJXaXRoTmFtZSgnX19lbGVtc18nKQorCisgICAgICAgIHJlZCA9IGZsb2F0KHN0ZF9hcnJheV9l bGVtcy5HZXRDaGlsZEF0SW5kZXgoMCkuR2V0VmFsdWUoKSkKKyAgICAgICAgZ3JlZW4gPSBmbG9h dChzdGRfYXJyYXlfZWxlbXMuR2V0Q2hpbGRBdEluZGV4KDEpLkdldFZhbHVlKCkpCisgICAgICAg IGJsdWUgPSBmbG9hdChzdGRfYXJyYXlfZWxlbXMuR2V0Q2hpbGRBdEluZGV4KDIpLkdldFZhbHVl KCkpCisgICAgICAgIGFscGhhID0gZmxvYXQoc3RkX2FycmF5X2VsZW1zLkdldENoaWxkQXRJbmRl eCgzKS5HZXRWYWx1ZSgpKQogICAgICAgICByZXR1cm4gImNvbG9yKCVzICUxLjJmICUxLjJmICUx LjJmIC8gJTEuMmYpIiAlIChwcm9maWxlLCByZWQsIGdyZWVuLCBibHVlLCBhbHBoYSkKIAogICAg IGRlZiB0b19zdHJpbmcoc2VsZik6Ci0gICAgICAgIHJnYmFfYW5kX2ZsYWdzID0gc2VsZi52YWxv YmouR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9jb2xvckRhdGEnKS5HZXRDaGlsZE1lbWJlcldp dGhOYW1lKCdyZ2JhQW5kRmxhZ3MnKS5HZXRWYWx1ZUFzVW5zaWduZWQoMCkKKyAgICAgICAgcmdi YV9hbmRfZmxhZ3MgPSBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX2NvbG9y RGF0YScpLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ2lubGluZUNvbG9yQW5kRmxhZ3MnKS5HZXRW YWx1ZUFzVW5zaWduZWQoMCkKIAogICAgICAgICBpZiBzZWxmLl9pc19leHRlbmRlZChyZ2JhX2Fu ZF9mbGFncyk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5fdG9fc3RyaW5nX2V4dGVuZGVkKCkK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNjdiODZmMGMyZmJiODFmOWY5YzYxN2MzYWVhZTJlNTdkNmY4MTI2Li4zNzA0N2Nm NmQ3MDg2OGQ4MjZkOGVmMmI0MTI1NzFlZGU1NWZlOGRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMjAtMDgtMjEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAg ICAgICAgRml4IHRoZSBDb2xvci9FeHRlbmRlZENvbG9yIGxsZGIgZGF0YSBwcm92aWRlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1NzM1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3Njcm9s bGluZy9tYWMvaG9yaXpvbnRhbC1vdmVyZmxvdy10cmFwcGluZy1zbWFsbC1kZWx0YXMtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9tYWMvaG9yaXpvbnRhbC1v dmVyZmxvdy10cmFwcGluZy1zbWFsbC1kZWx0YXMuaHRtbDogQWRkZWQuCisKIDIwMjAtMDgtMTgg IEthcmwgUmFja2xlciAgPHJhY2tsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIERpc2FibGUgcGx1 Zy1pbiB0ZXN0cyBvbiBBcHBsZSBTaWxpY29uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L3Njcm9sbGluZy9tYWMvaG9yaXpvbnRhbC1vdmVyZmxvdy10cmFwcGluZy1zbWFsbC1kZWx0YXMt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL2hvcml6b250YWwt b3ZlcmZsb3ctdHJhcHBpbmctc21hbGwtZGVsdGFzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4w YWRiNzI5N2FiOTZjNzdiM2ZiMWVhMDA2NWM4OTU2NWY1YzhiYjJkCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL2hvcml6b250YWwtb3ZlcmZsb3ctdHJh cHBpbmctc21hbGwtZGVsdGFzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDkgQEAKK0NPTlNPTEUg TUVTU0FHRTogd2luZG93IHNjcm9sbCB0byAyNTAKKworVGVzdCB0aGF0IGV2ZW50cyB3aXRoIGEg c21hbGwgWCBkZWx0YSBkbyBub3QgY2F1c2UgdHJhcHBpbmcgaW4gdGhlIGhvcml6b250YWwgb3Zl cmZsb3cKK1BBU1Mgb3ZlcmZsb3dTY3JvbGxFdmVudENvdW50ID09IDAgaXMgdHJ1ZQorUEFTUyB3 aW5kb3dTY3JvbGxFdmVudENvdW50ID4gMCBpcyB0cnVlCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNl ZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9zY3JvbGxpbmcvbWFjL2hvcml6b250YWwtb3ZlcmZsb3ctdHJhcHBpbmctc21hbGwtZGVsdGFz Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvaG9yaXpvbnRhbC1vdmVyZmxv dy10cmFwcGluZy1zbWFsbC1kZWx0YXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMjNkMDAxZGExZDEyYWUw NDBmMzdiMjAwNmYyMGFlM2RlMWY5NmY1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9zY3JvbGxpbmcvbWFjL2hvcml6b250YWwtb3ZlcmZsb3ctdHJhcHBpbmctc21hbGwtZGVs dGFzLmh0bWwKQEAgLTAsMCArMSwxMTEgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10 ZXN0LXJ1bm5lciBbIGludGVybmFsOkFzeW5jT3ZlcmZsb3dTY3JvbGxpbmdFbmFibGVkPXRydWUg XSAtLT4KKzxodG1sPgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAgICAgICBib2R5IHsKKyAgICAg ICAgICAgIGhlaWdodDogMjAwMHB4OworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuY29u dGFpbmVyIHsKKyAgICAgICAgICAgIHBhZGRpbmc6IDEwcHg7CisgICAgICAgICAgICBtYXJnaW46 IDIwcHg7CisgICAgICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBncmF5OworICAgICAgICB9Cisg ICAgICAgIAorICAgICAgICAuc2Nyb2xsZXIgeworICAgICAgICAgICAgbWFyZ2luLXRvcDogMTAw cHg7CisgICAgICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICAgICAgd2lkdGg6IDMwMHB4 OworICAgICAgICAgICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7CisgICAgICAgICAgICBwYWRk aW5nOiA1cHg7CisgICAgICAgICAgICBvdmVyZmxvdzogc2Nyb2xsOworICAgICAgICB9CisgICAg ICAgIC5jb250ZW50IHsKKyAgICAgICAgICAgIHdpZHRoOiA1MDAlOworICAgICAgICAgICAgaGVp Z2h0OiAxMDAlOworICAgICAgICAgICAgYmFja2dyb3VuZC1pbWFnZTogcmVwZWF0aW5nLWxpbmVh ci1ncmFkaWVudCh0byByaWdodCwgd2hpdGUsIHNpbHZlciAyMDBweCk7CisgICAgICAgIH0KKyAg ICAgICAgCisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVz b3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgdmFy IGpzVGVzdElzQXN5bmMgPSB0cnVlOworCisgICAgICAgIHZhciBzY3JvbGxlcjsKKyAgICAgICAg dmFyIG92ZXJmbG93U2Nyb2xsRXZlbnRDb3VudCA9IDA7CisgICAgICAgIHZhciB3aW5kb3dTY3Jv bGxFdmVudENvdW50ID0gMDsKKworICAgICAgICBhc3luYyBmdW5jdGlvbiByZXNldFNjcm9sbFBv c2l0aW9ucygpCisgICAgICAgIHsKKyAgICAgICAgICAgIHdpbmRvdy5zY3JvbGxUbygwLCAxMDAp OworICAgICAgICAgICAgc2Nyb2xsZXIuc2Nyb2xsTGVmdCA9IDEwMDsKKyAgICAgICAgICAgIAor ICAgICAgICAgICAgLy8gV2FpdCBmb3Igc2Nyb2xsIGV2ZW50cyB0byBmaXJlLgorICAgICAgICAg ICAgYXdhaXQgVUlIZWxwZXIucmVuZGVyaW5nVXBkYXRlKCk7CisKKyAgICAgICAgICAgIHNhd092 ZXJmbG93U2Nyb2xsV2l0aE5lZ2F0aXZlT2Zmc2V0ID0gZmFsc2U7CisgICAgICAgIH0KKyAgICAg ICAgCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIGRvTW91c2VXaGVlbFNjcm9sbCgpCisgICAgICAg IHsKKyAgICAgICAgICAgIC8vIGF3YWl0IFVJSGVscGVyLm1vdXNlV2hlZWxTY3JvbGxBdCgxMDAs IDEwMCwgMCwgMCwgLTIsIC04KTsKKworICAgICAgICAgICAgZXZlbnRTZW5kZXIubW9uaXRvcldo ZWVsRXZlbnRzKCk7CisgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbygxMDAsIDEw MCk7CisgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9t ZW50dW1QaGFzZXMoMCwgMCwgImJlZ2FuIiwgIm5vbmUiKTsKKyAgICAgICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygxLCAtNSwgImNoYW5n ZWQiLCAibm9uZSIpOworICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhX aGVlbEFuZE1vbWVudHVtUGhhc2VzKDIsIC01LCAiY2hhbmdlZCIsICJub25lIik7CisgICAgICAg ICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMo MSwgLTUsICJjaGFuZ2VkIiwgIm5vbmUiKTsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNl U2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAiZW5kZWQiLCAibm9uZSIp OworCisgICAgICAgICAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB7CisgICAgICAg ICAgICAgICAgZXZlbnRTZW5kZXIuY2FsbEFmdGVyU2Nyb2xsaW5nQ29tcGxldGVzKCgpID0+IHsK KyAgICAgICAgICAgICAgICAgICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1lKHJlc29sdmUpOworICAg ICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICAgICAgCisg ICAgICAgIGFzeW5jIGZ1bmN0aW9uIHNjcm9sbFRlc3QoKQorICAgICAgICB7CisgICAgICAgICAg ICBkZWJ1ZygnJyk7CisgICAgICAgICAgICBkZWJ1ZygnVGVzdCB0aGF0IGV2ZW50cyB3aXRoIGEg c21hbGwgWCBkZWx0YSBkbyBub3QgY2F1c2UgdHJhcHBpbmcgaW4gdGhlIGhvcml6b250YWwgb3Zl cmZsb3cnKTsKKyAgICAgICAgICAgIGF3YWl0IGRvTW91c2VXaGVlbFNjcm9sbCgpOworCisgICAg ICAgICAgICBzaG91bGRCZSgnb3ZlcmZsb3dTY3JvbGxFdmVudENvdW50ID09IDAnLCAndHJ1ZScp OworICAgICAgICAgICAgc2hvdWxkQmUoJ3dpbmRvd1Njcm9sbEV2ZW50Q291bnQgPiAwJywgJ3Ry dWUnKTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAg IH0KKworICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGFzeW5jICgpID0+ IHsKKyAgICAgICAgICAgIGRvY3VtZW50LmJvZHkuYWRkRXZlbnRMaXN0ZW5lcignd2hlZWwnLCAo KSA9PiB7IH0sIGZhbHNlKTsKKworICAgICAgICAgICAgc2Nyb2xsZXIgPSBkb2N1bWVudC5xdWVy eVNlbGVjdG9yKCcuc2Nyb2xsZXInKTsKKyAgICAgICAgICAgIGF3YWl0IHJlc2V0U2Nyb2xsUG9z aXRpb25zKCk7CisKKyAgICAgICAgICAgIHNjcm9sbGVyLmFkZEV2ZW50TGlzdGVuZXIoJ3Njcm9s bCcsICgpID0+IHsKKyAgICAgICAgICAgICAgICBjb25zb2xlLmxvZygnb3ZlcmZsb3cgc2Nyb2xs IHRvICcgKyBzY3JvbGxlci5zY3JvbGxMZWZ0KTsKKyAgICAgICAgICAgICAgICArK292ZXJmbG93 U2Nyb2xsRXZlbnRDb3VudDsKKyAgICAgICAgICAgIH0sIGZhbHNlKTsKKworICAgICAgICAgICAg d2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ3Njcm9sbCcsICgpID0+IHsKKyAgICAgICAgICAgICAg ICBjb25zb2xlLmxvZygnd2luZG93IHNjcm9sbCB0byAnICsgd2luZG93LnBhZ2VZT2Zmc2V0KTsK KyAgICAgICAgICAgICAgICArK3dpbmRvd1Njcm9sbEV2ZW50Q291bnQ7CisgICAgICAgICAgICB9 LCBmYWxzZSk7CisKKworICAgICAgICAgICAgc2V0VGltZW91dChzY3JvbGxUZXN0LCAwKTsKKyAg ICAgICAgfSwgZmFsc2UpOworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRp diBjbGFzcz0iY29udGFpbmVyIj4KKyAgICAgICAgPGRpdiBjbGFzcz0ic2Nyb2xsZXIiPgorICAg ICAgICAgICAgPGRpdiBjbGFzcz0iY29udGVudCI+PC9kaXY+CisgICAgICAgIDwvZGl2PgorICAg IDwvZGl2PgorICAgIDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorICAgIDxzY3JpcHQgc3JjPSIu Li8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwv aHRtbD4K 407024 2020-08-21 13:06:52 -0700 2020-08-21 14:04:48 -0700 Patch lldb-patch.patch text/plain 2923 simon.fraser ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmZTZi YTRkNmVkZjg4ZGQxY2I5NGY1OWFjZmY2M2U2NDJjOTAwNWQ0Li5lOTBlMWVjNzZhZDI4MDU0N2U1 NmJiOTNiZWQxMTRmNTE5OGUwYmVkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDgtMjEgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHRoZSBDb2xvci9FeHRl bmRlZENvbG9yIGxsZGIgZGF0YSBwcm92aWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1NzM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRml4IHRoZSBkYXRhIHByb3ZpZGVyIGZvciBDb2xvciBhZnRl ciBDb2xvciBhbmQgRXh0ZW5kZWRDb2xvciBpbnRlcm5hbHMgY2hhbmdlZC4KKworICAgICAgICAq IGxsZGIvbGxkYl93ZWJraXQucHk6CisgICAgICAgIChXZWJDb3JlQ29sb3JQcm92aWRlci5fdG9f c3RyaW5nX2V4dGVuZGVkKToKKyAgICAgICAgKFdlYkNvcmVDb2xvclByb3ZpZGVyLnRvX3N0cmlu Zyk6CisKIDIwMjAtMDgtMTcgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgog CiAgICAgICAgIERldmVsb3AgYSBtZWNoYW5pc20gdG8gdW5zdWJzY3JpYmUgZnJvbSBld3MgZW1h aWxzCmRpZmYgLS1naXQgYS9Ub29scy9sbGRiL2xsZGJfd2Via2l0LnB5IGIvVG9vbHMvbGxkYi9s bGRiX3dlYmtpdC5weQppbmRleCAxYmI3ZWUxYzYzMGIyYTQzYWE5MGIxNzU1YmVkYjk1ODk0ZmVi ZmM0Li5jZmUzZGNkODRiY2RkYzAxNjA5OTgzM2I2OWFlOGQ1Yzc3ZGJmN2YzIDEwMDY0NAotLS0g YS9Ub29scy9sbGRiL2xsZGJfd2Via2l0LnB5CisrKyBiL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQu cHkKQEAgLTQ2NywyMCArNDY3LDI2IEBAIGNsYXNzIFdlYkNvcmVDb2xvclByb3ZpZGVyOgogICAg IGRlZiBfdG9fc3RyaW5nX2V4dGVuZGVkKHNlbGYpOgogICAgICAgICBleHRlbmRlZF9jb2xvciA9 IHNlbGYudmFsb2JqLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fY29sb3JEYXRhJykuR2V0Q2hp bGRNZW1iZXJXaXRoTmFtZSgnZXh0ZW5kZWRDb2xvcicpLkRlcmVmZXJlbmNlKCkKICAgICAgICAg cHJvZmlsZSA9IGV4dGVuZGVkX2NvbG9yLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fY29sb3JT cGFjZScpLkdldFZhbHVlKCkKLSAgICAgICAgaWYgcHJvZmlsZSA9PSAnQ29sb3JTcGFjZVNSR0In OgorICAgICAgICBpZiBwcm9maWxlID09ICdTUkdCJzoKICAgICAgICAgICAgIHByb2ZpbGUgPSAn c3JnYicKLSAgICAgICAgZWxpZiBwcm9maWxlID09ICdDb2xvclNwYWNlRGlzcGxheVAzJzoKKyAg ICAgICAgZWxpZiBwcm9maWxlID09ICdMaW5lYXJSR0InOgorICAgICAgICAgICAgcHJvZmlsZSA9 ICdsaW5lYXItcmdiJworICAgICAgICBlbGlmIHByb2ZpbGUgPT0gJ0Rpc3BsYXlQMyc6CiAgICAg ICAgICAgICBwcm9maWxlID0gJ2Rpc3BsYXktcDMnCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAg ICBwcm9maWxlID0gJ3Vua25vd24nCi0gICAgICAgIHJlZCA9IGZsb2F0KGV4dGVuZGVkX2NvbG9y LkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fcmVkJykuR2V0VmFsdWUoKSkKLSAgICAgICAgZ3Jl ZW4gPSBmbG9hdChleHRlbmRlZF9jb2xvci5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX2dyZWVu JykuR2V0VmFsdWUoKSkKLSAgICAgICAgYmx1ZSA9IGZsb2F0KGV4dGVuZGVkX2NvbG9yLkdldENo aWxkTWVtYmVyV2l0aE5hbWUoJ21fYmx1ZScpLkdldFZhbHVlKCkpCi0gICAgICAgIGFscGhhID0g ZmxvYXQoZXh0ZW5kZWRfY29sb3IuR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9hbHBoYScpLkdl dFZhbHVlKCkpCisKKyAgICAgICAgY29sb3JfY29tcG9uZW50cyA9IGV4dGVuZGVkX2NvbG9yLkdl dENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fY29tcG9uZW50cycpCisgICAgICAgIHN0ZF9hcnJheV9l bGVtcyA9IGNvbG9yX2NvbXBvbmVudHMuR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnY29tcG9uZW50 cycpLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ19fZWxlbXNfJykKKworICAgICAgICByZWQgPSBm bG9hdChzdGRfYXJyYXlfZWxlbXMuR2V0Q2hpbGRBdEluZGV4KDApLkdldFZhbHVlKCkpCisgICAg ICAgIGdyZWVuID0gZmxvYXQoc3RkX2FycmF5X2VsZW1zLkdldENoaWxkQXRJbmRleCgxKS5HZXRW YWx1ZSgpKQorICAgICAgICBibHVlID0gZmxvYXQoc3RkX2FycmF5X2VsZW1zLkdldENoaWxkQXRJ bmRleCgyKS5HZXRWYWx1ZSgpKQorICAgICAgICBhbHBoYSA9IGZsb2F0KHN0ZF9hcnJheV9lbGVt cy5HZXRDaGlsZEF0SW5kZXgoMykuR2V0VmFsdWUoKSkKICAgICAgICAgcmV0dXJuICJjb2xvcigl cyAlMS4yZiAlMS4yZiAlMS4yZiAvICUxLjJmKSIgJSAocHJvZmlsZSwgcmVkLCBncmVlbiwgYmx1 ZSwgYWxwaGEpCiAKICAgICBkZWYgdG9fc3RyaW5nKHNlbGYpOgotICAgICAgICByZ2JhX2FuZF9m bGFncyA9IHNlbGYudmFsb2JqLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fY29sb3JEYXRhJyku R2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgncmdiYUFuZEZsYWdzJykuR2V0VmFsdWVBc1Vuc2lnbmVk KDApCisgICAgICAgIHJnYmFfYW5kX2ZsYWdzID0gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJX aXRoTmFtZSgnbV9jb2xvckRhdGEnKS5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdpbmxpbmVDb2xv ckFuZEZsYWdzJykuR2V0VmFsdWVBc1Vuc2lnbmVkKDApCiAKICAgICAgICAgaWYgc2VsZi5faXNf ZXh0ZW5kZWQocmdiYV9hbmRfZmxhZ3MpOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3RvX3N0 cmluZ19leHRlbmRlZCgpCg==