211766 2020-05-11 21:52:13 -0700 Web Inspector: show EventTarget listeners as an internal property 2020-05-13 19:37:15 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi ews-watchlist hi inspector-bugzilla-changes joepeck timothy webkit-bug-importer oldest_to_newest 1651616 0 hi 2020-05-11 21:52:13 -0700 . 1651617 1 399097 hi 2020-05-11 21:53:14 -0700 Created attachment 399097 Patch 1652073 2 399220 hi 2020-05-12 18:48:06 -0700 Created attachment 399220 Patch 1652106 3 399236 hi 2020-05-12 20:30:19 -0700 Created attachment 399236 Patch 1652489 4 ews-feeder 2020-05-13 19:36:44 -0700 Committed r261670: <https://trac.webkit.org/changeset/261670> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399236. 1652490 5 webkit-bug-importer 2020-05-13 19:37:15 -0700 <rdar://problem/63211078> 399097 2020-05-11 21:53:14 -0700 2020-05-12 18:48:04 -0700 Patch bug-211766-20200511225313.patch text/plain 10840 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2MTcxOGFmOGIyMTBmOTU2ZjNhZmUyZDNlNGMyYzJiNWUxOWRkMTc2Li4z MjBkZDhhNDdjZmU4ZmNkY2UyZTUxNjNkMjkwNmYyOTMwMDYwNzM2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMjAtMDUtMTEgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNob3cgRXZlbnRUYXJnZXQgbGlzdGVuZXJzIGFz IGFuIGludGVybmFsIHByb3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTE3NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvcnVudGltZS9nZXRQcm9wZXJ0aWVzLWludGVy bmFsUHJvcGVydGllcy5odG1sCisKKyAgICAgICAgKiBpbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3Jp cHRIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om9iamVjdEZvckV2ZW50VGFyZ2V0TGlzdGVu ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkluamVjdGVkU2NyaXB0SG9zdDo6Z2V0SW50ZXJu YWxQcm9wZXJ0aWVzKToKKwogMjAyMC0wNS0xMSAgQmVuIE5oYW0gIDxuaGFtQGFwcGxlLmNvbT4K IAogICAgICAgICBJbXByb3ZlIGFjY3VyYWN5IG9mIEluZGV4ZWREQiBlc3RpbWF0ZWQgd3JpdGUg c2l6ZSBjb21wdXRhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dl YkluamVjdGVkU2NyaXB0SG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV2ViSW5q ZWN0ZWRTY3JpcHRIb3N0LmNwcAppbmRleCAwOTkwMWQwZmE0NjdiMTk4MDJkZTYxNTEzMjAxZjBm ZGVkOGI1YWE5Li41OGE5MmM5MWM5OTZiNjMxYjliOGU2MTNlOThkNmY2ZDdmYWFjMGI0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRIb3N0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRIb3N0LmNw cApAQCAtMjgsNiArMjgsOCBAQAogCiAjaW5jbHVkZSAiRE9NRXhjZXB0aW9uLmgiCiAjaW5jbHVk ZSAiSlNET01FeGNlcHRpb24uaCIKKyNpbmNsdWRlICJKU0V2ZW50TGlzdGVuZXIuaCIKKyNpbmNs dWRlICJKU0V2ZW50VGFyZ2V0LmgiCiAjaW5jbHVkZSAiSlNIVE1MQWxsQ29sbGVjdGlvbi5oIgog I2luY2x1ZGUgIkpTSFRNTENvbGxlY3Rpb24uaCIKICNpbmNsdWRlICJKU05vZGUuaCIKQEAgLTE2 MSw2ICsxNjMsNDggQEAgc3RhdGljIEpTU3RyaW5nKiBqc1N0cmluZ0ZvclBheW1lbnRSZXF1ZXN0 U3RhdGUoVk0mIHZtLCBQYXltZW50UmVxdWVzdDo6U3RhdGUgc3QKIH0KICNlbmRpZgogCitzdGF0 aWMgSlNPYmplY3QqIG9iamVjdEZvckV2ZW50VGFyZ2V0TGlzdGVuZXJzKFZNJiB2bSwgSlNHbG9i YWxPYmplY3QqIGV4ZWMsIEV2ZW50VGFyZ2V0KiBldmVudFRhcmdldCkKK3sKKyAgICBhdXRvKiBz Y3JpcHRFeGVjdXRpb25Db250ZXh0ID0gZXZlbnRUYXJnZXQtPnNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKTsKKyAgICBpZiAoIXNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpCisgICAgICAgIHJldHVybiBu dWxscHRyOworCisgICAgSlNPYmplY3QqIGxpc3RlbmVycyA9IG51bGxwdHI7CisKKyAgICBmb3Ig KGF1dG8mIGV2ZW50VHlwZSA6IGV2ZW50VGFyZ2V0LT5ldmVudFR5cGVzKCkpIHsKKyAgICAgICAg dW5zaWduZWQgbGlzdGVuZXJzRm9yRXZlbnRJbmRleCA9IDA7CisgICAgICAgIGF1dG8qIGxpc3Rl bmVyc0ZvckV2ZW50ID0gY29uc3RydWN0RW1wdHlBcnJheShleGVjLCBudWxscHRyKTsKKworICAg ICAgICBmb3IgKGF1dG8mIGV2ZW50TGlzdGVuZXIgOiBldmVudFRhcmdldC0+ZXZlbnRMaXN0ZW5l cnMoZXZlbnRUeXBlKSkgeworICAgICAgICAgICAgaWYgKCFpczxKU0V2ZW50TGlzdGVuZXI+KGV2 ZW50TGlzdGVuZXItPmNhbGxiYWNrKCkpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisg ICAgICAgICAgICBhdXRvJiBqc0xpc3RlbmVyID0gZG93bmNhc3Q8SlNFdmVudExpc3RlbmVyPihl dmVudExpc3RlbmVyLT5jYWxsYmFjaygpKTsKKyAgICAgICAgICAgIGlmICgmanNMaXN0ZW5lci5p c29sYXRlZFdvcmxkKCkgIT0gJmN1cnJlbnRXb3JsZCgqZXhlYykpCisgICAgICAgICAgICAgICAg Y29udGludWU7CisKKyAgICAgICAgICAgIGF1dG8qIGpzRnVuY3Rpb24gPSBqc0xpc3RlbmVyLmVu c3VyZUpTRnVuY3Rpb24oKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpOworICAgICAgICAgICAgaWYg KCFqc0Z1bmN0aW9uKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICBh dXRvKiBwcm9wZXJ0aWVzRm9yTGlzdGVuZXIgPSBjb25zdHJ1Y3RFbXB0eU9iamVjdChleGVjKTsK KyAgICAgICAgICAgIHByb3BlcnRpZXNGb3JMaXN0ZW5lci0+cHV0RGlyZWN0KHZtLCBJZGVudGlm aWVyOjpmcm9tU3RyaW5nKHZtLCAiY2FsbGJhY2siKSwganNGdW5jdGlvbik7CisgICAgICAgICAg ICBwcm9wZXJ0aWVzRm9yTGlzdGVuZXItPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0 cmluZyh2bSwgImNhcHR1cmUiKSwganNCb29sZWFuKGV2ZW50TGlzdGVuZXItPnVzZUNhcHR1cmUo KSkpOworICAgICAgICAgICAgcHJvcGVydGllc0Zvckxpc3RlbmVyLT5wdXREaXJlY3Qodm0sIElk ZW50aWZpZXI6OmZyb21TdHJpbmcodm0sICJwYXNzaXZlIiksIGpzQm9vbGVhbihldmVudExpc3Rl bmVyLT5pc1Bhc3NpdmUoKSkpOworICAgICAgICAgICAgcHJvcGVydGllc0Zvckxpc3RlbmVyLT5w dXREaXJlY3Qodm0sIElkZW50aWZpZXI6OmZyb21TdHJpbmcodm0sICJvbmNlIiksIGpzQm9vbGVh bihldmVudExpc3RlbmVyLT5pc09uY2UoKSkpOworICAgICAgICAgICAgbGlzdGVuZXJzRm9yRXZl bnQtPnB1dERpcmVjdEluZGV4KGV4ZWMsIGxpc3RlbmVyc0ZvckV2ZW50SW5kZXgrKywgcHJvcGVy dGllc0Zvckxpc3RlbmVyKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChsaXN0ZW5lcnNGb3JF dmVudEluZGV4KSB7CisgICAgICAgICAgICBpZiAoIWxpc3RlbmVycykKKyAgICAgICAgICAgICAg ICBsaXN0ZW5lcnMgPSBjb25zdHJ1Y3RFbXB0eU9iamVjdChleGVjKTsKKyAgICAgICAgICAgIGxp c3RlbmVycy0+cHV0RGlyZWN0KHZtLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCBldmVudFR5 cGUpLCBsaXN0ZW5lcnNGb3JFdmVudCk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4g bGlzdGVuZXJzOworfQorCiBKU1ZhbHVlIFdlYkluamVjdGVkU2NyaXB0SG9zdDo6Z2V0SW50ZXJu YWxQcm9wZXJ0aWVzKFZNJiB2bSwgSlNHbG9iYWxPYmplY3QqIGV4ZWMsIEpTQzo6SlNWYWx1ZSB2 YWx1ZSkKIHsKICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CkBAIC0x NzAsNiArMjE0LDcgQEAgSlNWYWx1ZSBXZWJJbmplY3RlZFNjcmlwdEhvc3Q6OmdldEludGVybmFs UHJvcGVydGllcyhWTSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBleGUKICAgICAgICAgYXV0byogYXJy YXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5KGV4ZWMsIG51bGxwdHIpOwogICAgICAgICBhcnJheS0+ cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eSh2 bSwgZXhlYywgIm5hbWUiX3MsIGpzU3RyaW5nKHZtLCB3b3JrZXItPm5hbWUoKSkpKTsKICAgICAg ICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdEludGVybmFs UHJvcGVydHkodm0sIGV4ZWMsICJ0ZXJtaW5hdGVkIl9zLCBqc0Jvb2xlYW4od29ya2VyLT53YXNU ZXJtaW5hdGVkKCkpKSk7CisgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRl eCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KHZtLCBleGVjLCAibGlzdGVuZXJzIl9zLCBv YmplY3RGb3JFdmVudFRhcmdldExpc3RlbmVycyh2bSwgZXhlYywgd29ya2VyKSkpOwogICAgICAg ICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOwogICAgICAgICByZXR1cm4gYXJyYXk7 CiAgICAgfQpAQCAtMTgxLDExICsyMjYsMjAgQEAgSlNWYWx1ZSBXZWJJbmplY3RlZFNjcmlwdEhv c3Q6OmdldEludGVybmFsUHJvcGVydGllcyhWTSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBleGUKICAg ICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdEludGVy bmFsUHJvcGVydHkodm0sIGV4ZWMsICJvcHRpb25zIl9zLCBvYmplY3RGb3JQYXltZW50T3B0aW9u cyh2bSwgZXhlYywgcGF5bWVudFJlcXVlc3QtPnBheW1lbnRPcHRpb25zKCkpKSk7CiAgICAgICAg IGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFBy b3BlcnR5KHZtLCBleGVjLCAiZGV0YWlscyJfcywgb2JqZWN0Rm9yUGF5bWVudERldGFpbHModm0s IGV4ZWMsIHBheW1lbnRSZXF1ZXN0LT5wYXltZW50RGV0YWlscygpKSkpOwogICAgICAgICBhcnJh eS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0 eSh2bSwgZXhlYywgInN0YXRlIl9zLCBqc1N0cmluZ0ZvclBheW1lbnRSZXF1ZXN0U3RhdGUodm0s IHBheW1lbnRSZXF1ZXN0LT5zdGF0ZSgpKSkpOworICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5k ZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eSh2bSwgZXhlYywgImxp c3RlbmVycyJfcywgb2JqZWN0Rm9yRXZlbnRUYXJnZXRMaXN0ZW5lcnModm0sIGV4ZWMsIHBheW1l bnRSZXF1ZXN0KSkpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOwog ICAgICAgICByZXR1cm4gYXJyYXk7CiAgICAgfQogI2VuZGlmCiAKKyAgICBpZiAoYXV0byogZXZl bnRUYXJnZXQgPSBKU0V2ZW50VGFyZ2V0Ojp0b1dyYXBwZWQodm0sIHZhbHVlKSkgeworICAgICAg ICB1bnNpZ25lZCBpbmRleCA9IDA7CisgICAgICAgIGF1dG8qIGFycmF5ID0gY29uc3RydWN0RW1w dHlBcnJheShleGVjLCBudWxscHRyKTsKKyAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4 ZWMsIGluZGV4KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkodm0sIGV4ZWMsICJsaXN0ZW5l cnMiX3MsIG9iamVjdEZvckV2ZW50VGFyZ2V0TGlzdGVuZXJzKHZtLCBleGVjLCBldmVudFRhcmdl dCkpKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKKyAgICAgICAg cmV0dXJuIGFycmF5OworICAgIH0KKwogICAgIHJldHVybiB7IH07CiB9CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0Zjc2 NDVhZTI5M2QwYjYwNDYwOTZkNzBmMWM2MGViZmVmODc1ZDJhLi5iOThmZmJhNTliZGQyZjcwNzYy MWMwM2M0YzI1YTJhMzgwMjkwMDg0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDUtMTEg IERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNob3cgRXZlbnRUYXJnZXQgbGlzdGVuZXJzIGFzIGFuIGludGVybmFsIHByb3BlcnR5Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE3NjYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rv ci9ydW50aW1lL2dldFByb3BlcnRpZXMtaW50ZXJuYWxQcm9wZXJ0aWVzLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGluc3BlY3Rvci9ydW50aW1lL2dldFByb3BlcnRpZXMtaW50ZXJuYWxQcm9wZXJ0 aWVzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisKIDIwMjAtMDUtMTEgIEJlbiBOaGFtICA8bmhhbUBh cHBsZS5jb20+CiAKICAgICAgICAgSW1wcm92ZSBhY2N1cmFjeSBvZiBJbmRleGVkREIgZXN0aW1h dGVkIHdyaXRlIHNpemUgY29tcHV0YXRpb24KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9ydW50aW1lL2dldFByb3BlcnRpZXMtaW50ZXJuYWxQcm9wZXJ0aWVzLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9ydW50aW1lL2dldFByb3BlcnRpZXMtaW50ZXJuYWxQ cm9wZXJ0aWVzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zMTkyNmNmMzdjMjBhNGMyYzU0MmIw ODcxMjg3MDE2ZTEwOWIyY2Y1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3J1bnRpbWUvZ2V0UHJvcGVydGllcy1pbnRlcm5hbFByb3BlcnRpZXMtZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEsMjcgQEAKK1Rlc3RzIGZvciB0aGUgUnVudGltZS5nZXRQcm9wZXJ0aWVzIGNv bW1hbmQuCisKKworPT0gUnVubmluZyB0ZXN0IHN1aXRlOiBSdW50aW1lLmdldFByb3BlcnRpZXMu aW50ZXJuYWxQcm9wZXJ0aWVzCistLSBSdW5uaW5nIHRlc3QgY2FzZTogUnVudGltZS5nZXRQcm9w ZXJ0aWVzLmludGVybmFsUHJvcGVydGllcy5FdmVudFRhcmdldAorRXZhbHVhdGluZyBleHByZXNz aW9uLi4uCitHZXR0aW5nIGludGVybmFsIHByb3BlcnRpZXMuLi4KKworICBsaXN0ZW5lcnM6IHsK KyAgICBldmVudEJ1YmJsZUFjdGl2ZU11bHRpOiBbCisgICAgICAwOiB7CisgICAgICAgIGNhbGxi YWNrOiAiZnVuY3Rpb24gY2FsbGJhY2tCdWJibGVBY3RpdmVNdWx0aSgpIHt9IiAoZnVuY3Rpb24p CisgICAgICAgIGNhcHR1cmU6IGZhbHNlIChib29sZWFuKQorICAgICAgICBwYXNzaXZlOiBmYWxz ZSAoYm9vbGVhbikKKyAgICAgICAgb25jZTogZmFsc2UgKGJvb2xlYW4pCisgICAgICB9CisgICAg XQorICAgIGV2ZW50Q2FwdHVyZVBhc3NpdmVPbmNlOiBbCisgICAgICAwOiB7CisgICAgICAgIGNh bGxiYWNrOiAiZnVuY3Rpb24gY2FsbGJhY2tDYXB0dXJlUGFzc2l2ZU9uY2UoKSB7fSIgKGZ1bmN0 aW9uKQorICAgICAgICBjYXB0dXJlOiB0cnVlIChib29sZWFuKQorICAgICAgICBwYXNzaXZlOiB0 cnVlIChib29sZWFuKQorICAgICAgICBvbmNlOiB0cnVlIChib29sZWFuKQorICAgICAgfQorICAg IF0KKyAgfQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9nZXRQ cm9wZXJ0aWVzLWludGVybmFsUHJvcGVydGllcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3J1bnRpbWUvZ2V0UHJvcGVydGllcy1pbnRlcm5hbFByb3BlcnRpZXMuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li5lMzgwZTIzNjRkNjllNDNhZTEzNDdiZTA4NDBiYTgzOTIyM2E2NmNlCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1bnRpbWUvZ2V0UHJvcGVydGllcy1pbnRlcm5h bFByb3BlcnRpZXMuaHRtbApAQCAtMCwwICsxLDg5IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlw dCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9wcm90b2NvbC10ZXN0 LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvcHJvcGVydHktZGVzY3JpcHRv ci11dGlsaXRpZXMuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2lmICh3aW5kb3cuaW50ZXJuYWxz KQorICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Muc2V0VW5oYW5kbGVkUHJvbWlzZVJlamVj dGlvblRvQ29uc29sZUVuYWJsZWQoZmFsc2UpOworCitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBs ZXQgc3VpdGUgPSBQcm90b2NvbFRlc3QuY3JlYXRlQXN5bmNTdWl0ZSgiUnVudGltZS5nZXRQcm9w ZXJ0aWVzLmludGVybmFsUHJvcGVydGllcyIpOworCisgICAgZnVuY3Rpb24gYWRkVGVzdENhc2Uo e25hbWUsIGV4cHJlc3Npb259KSB7CisgICAgICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAg ICAgICAgIG5hbWUsCisgICAgICAgICAgICBhc3luYyB0ZXN0KCkgeworICAgICAgICAgICAgICAg IFByb3RvY29sVGVzdC5sb2coYEV2YWx1YXRpbmcgZXhwcmVzc2lvbi4uLmApOworICAgICAgICAg ICAgICAgIGxldCBldmFsdWF0ZVJlc3BvbnNlID0gYXdhaXQgSW5zcGVjdG9yUHJvdG9jb2wuYXdh aXRDb21tYW5kKHsKKyAgICAgICAgICAgICAgICAgICAgbWV0aG9kOiAiUnVudGltZS5ldmFsdWF0 ZSIsCisgICAgICAgICAgICAgICAgICAgIHBhcmFtczoge2V4cHJlc3Npb259LAorICAgICAgICAg ICAgICAgIH0pOworICAgICAgICAgICAgICAgIEluc3BlY3RvclByb3RvY29sLmNoZWNrRm9yRXJy b3IoZXZhbHVhdGVSZXNwb25zZSk7CisgICAgICAgICAgICAgICAgUHJvdG9jb2xUZXN0LmFzc2Vy dCghZXZhbHVhdGVSZXNwb25zZS53YXNUaHJvd24pOworCisgICAgICAgICAgICAgICAgUHJvdG9j b2xUZXN0LmxvZygiR2V0dGluZyBpbnRlcm5hbCBwcm9wZXJ0aWVzLi4uIik7CisgICAgICAgICAg ICAgICAgbGV0IHtpbnRlcm5hbFByb3BlcnRpZXN9ID0gYXdhaXQgSW5zcGVjdG9yUHJvdG9jb2wu YXdhaXRDb21tYW5kKHsKKyAgICAgICAgICAgICAgICAgICAgbWV0aG9kOiAiUnVudGltZS5nZXRQ cm9wZXJ0aWVzIiwKKyAgICAgICAgICAgICAgICAgICAgcGFyYW1zOiB7CisgICAgICAgICAgICAg ICAgICAgICAgICBvYmplY3RJZDogZXZhbHVhdGVSZXNwb25zZS5yZXN1bHQub2JqZWN0SWQsCisg ICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgfSk7CisKKyAgICAgICAgICAg ICAgICBQcm90b2NvbFRlc3QubmV3bGluZSgpOworCisgICAgICAgICAgICAgICAgYXN5bmMgZnVu Y3Rpb24gZHVtcCh7bmFtZSwgdmFsdWV9LCBpbmRlbnRTaXplKSB7CisgICAgICAgICAgICAgICAg ICAgIGlmIChuYW1lID09PSAiX19wcm90b19fIikKKyAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICAgICAgICAgICAgICBsZXQgaW5kZW50TG9nID0gIiAiLnJlcGVhdChp bmRlbnRTaXplKTsKKyAgICAgICAgICAgICAgICAgICAgbGV0IG5hbWVMb2cgPSBuYW1lICsgIjog IjsKKworICAgICAgICAgICAgICAgICAgICBpZiAodmFsdWUudHlwZSAhPT0gIm9iamVjdCIpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5sb2coaW5kZW50TG9nICsgbmFt ZUxvZyArIFByb3RvY29sVGVzdC5Qcm9wZXJ0eURlc2NyaXB0b3JVdGlsaXRpZXMuc3RyaW5naWZ5 UmVtb3RlT2JqZWN0KHZhbHVlKSk7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgICAgICBQcm90b2NvbFRlc3Qu bG9nKGluZGVudExvZyArIG5hbWVMb2cgKyAodmFsdWUuc3VidHlwZSA9PT0gImFycmF5IiA/ICJb IiA6ICJ7IikpOworCisgICAgICAgICAgICAgICAgICAgIGxldCB7cHJvcGVydGllc30gPSBhd2Fp dCBJbnNwZWN0b3JQcm90b2NvbC5hd2FpdENvbW1hbmQoeworICAgICAgICAgICAgICAgICAgICAg ICAgbWV0aG9kOiAiUnVudGltZS5nZXRQcm9wZXJ0aWVzIiwKKyAgICAgICAgICAgICAgICAgICAg ICAgIHBhcmFtczogeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9iamVjdElkOiB2YWx1 ZS5vYmplY3RJZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBvd25Qcm9wZXJ0aWVzOiB0 cnVlLAorICAgICAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAgfSk7 CisgICAgICAgICAgICAgICAgICAgIGZvciAobGV0IHByb3BlcnR5IG9mIHByb3BlcnRpZXMpCisg ICAgICAgICAgICAgICAgICAgICAgICBhd2FpdCBkdW1wKHByb3BlcnR5LCBpbmRlbnRTaXplICsg Mik7CisKKyAgICAgICAgICAgICAgICAgICAgUHJvdG9jb2xUZXN0LmxvZyhpbmRlbnRMb2cgKyAo dmFsdWUuc3VidHlwZSA9PT0gImFycmF5IiA/ICJdIiA6ICJ9IikpOworICAgICAgICAgICAgICAg IH0KKworICAgICAgICAgICAgICAgIGZvciAobGV0IGludGVybmFsUHJvcGVydHkgb2YgaW50ZXJu YWxQcm9wZXJ0aWVzKQorICAgICAgICAgICAgICAgICAgICBhd2FpdCBkdW1wKGludGVybmFsUHJv cGVydHksIDIpOworICAgICAgICAgICAgfSwKKyAgICAgICAgfSk7CisgICAgfQorCisgICAgYWRk VGVzdENhc2UoeworICAgICAgICBuYW1lOiAiUnVudGltZS5nZXRQcm9wZXJ0aWVzLmludGVybmFs UHJvcGVydGllcy5FdmVudFRhcmdldCIsCisgICAgICAgIGV4cHJlc3Npb246IGAoZnVuY3Rpb24o KSB7CitsZXQgeCA9IG5ldyBFdmVudFRhcmdldDsKK3guYWRkRXZlbnRMaXN0ZW5lcigiZXZlbnRC dWJibGVBY3RpdmVNdWx0aSIsIGZ1bmN0aW9uIGNhbGxiYWNrQnViYmxlQWN0aXZlTXVsdGkoKSB7 fSk7Cit4LmFkZEV2ZW50TGlzdGVuZXIoImV2ZW50Q2FwdHVyZVBhc3NpdmVPbmNlIiwgZnVuY3Rp b24gY2FsbGJhY2tDYXB0dXJlUGFzc2l2ZU9uY2UoKSB7fSwgeworICAgIGNhcHR1cmU6IHRydWUs CisgICAgcGFzc2l2ZTogdHJ1ZSwKKyAgICBvbmNlOiB0cnVlLAorfSk7CityZXR1cm4geDsKKyAg ICAgICAgfSkoKWAsCisgICAgfSk7CisKKyAgICBzdWl0ZS5ydW5UZXN0Q2FzZXNBbmRGaW5pc2go KTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25Mb2FkPSJydW5UZXN0KCkiPgorPHA+ VGVzdHMgZm9yIHRoZSBSdW50aW1lLmdldFByb3BlcnRpZXMgY29tbWFuZC48L3A+Cis8L2JvZHk+ Cis8L2h0bWw+Cg== 399220 2020-05-12 18:48:06 -0700 2020-05-12 20:30:17 -0700 Patch bug-211766-20200512194805.patch text/plain 12098 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmY2M0NDBjMzJkZGJiODFjOWMxMzAxMDZjOWY2NzkwY2E3MjljOWNkLi4y MTZjZDczODhjOGUyMWIwYzM3NjcwNGM2NjBiNWVkYmY4NmYxMmE4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzQgQEAKKzIwMjAtMDUtMTIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNob3cgRXZlbnRUYXJnZXQgbGlzdGVuZXJzIGFz IGFuIGludGVybmFsIHByb3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTE3NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvcnVudGltZS9nZXRQcm9wZXJ0aWVzLWludGVy bmFsUHJvcGVydGllcy5odG1sCisKKyAgICAgICAgQWRkIGEgYGxpc3RlbmVyc2AgaW50ZXJuYWwg cHJvcGVydHkgZm9yIGBFdmVudFRhcmdldGAgb2JqZWN0cyB3aXRoIHRoZSB2YWx1ZQorICAgICAg ICBgYGAKKyAgICAgICAgICAgIGxpc3RlbmVyczogeworICAgICAgICAgICAgICAgIDxldmVudD46 IFsKKyAgICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgY2FsbGJh Y2s6IDxmdW5jdGlvbj4KKyAgICAgICAgICAgICAgICAgICAgICAgIGNhcHR1cmU6IDxib29sZWFu PgorICAgICAgICAgICAgICAgICAgICAgICAgcGFzc2l2ZTogPGJvb2xlYW4+CisgICAgICAgICAg ICAgICAgICAgICAgICBvbmNlOiA8Ym9vbGVhbj4KKyAgICAgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgICAgICAuLi4KKyAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICAgICAg Li4uCisgICAgICAgICAgICB9CisgICAgICAgIGBgYAorICAgICAgICBzbyBsb25nIGFzIGF0IGxl YXN0IG9uZSBgSlNFdmVudExpc3RlbmVyYCBoYXMgYmVlbiBhZGRlZCBwcmlvciB0byB0aGF0IHBv aW50LgorCisgICAgICAgICogaW5zcGVjdG9yL1dlYkluamVjdGVkU2NyaXB0SG9zdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpvYmplY3RGb3JFdmVudFRhcmdldExpc3RlbmVycyk6IEFkZGVkLgor ICAgICAgICAoV2ViQ29yZTo6V2ViSW5qZWN0ZWRTY3JpcHRIb3N0OjpnZXRJbnRlcm5hbFByb3Bl cnRpZXMpOgorICAgICAgICBEcml2ZS1ieTogb25seSBhZGQgdGhlIGBuYW1lYCBpbnRlcm5hbCBw cm9wZXJ0eSBpZiB0aGUgYFdvcmtlcmAgYWN0dWFsbHkgaGFzIGEgbmFtZS4KKwogMjAyMC0wNS0x MSAgSmFtZXMgRGFycGluaWFuICA8amRhcnBpbmlhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg V2ViR0xMYXllciBjbG9iYmVycyBURVhUVVJFXzJEIGJpbmRpbmcgb24gaU9TCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3QuY3BwCmluZGV4IDA5 OTAxZDBmYTQ2N2IxOTgwMmRlNjE1MTMyMDFmMGZkZWQ4YjVhYTkuLmFjYjVmYWM4YTRjMzcxNDUw MmQ0ZmE2MTkzMWVkZTU0OWIwYmFjY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3QuY3BwCkBAIC0yOCw2ICsyOCw4IEBACiAKICNpbmNs dWRlICJET01FeGNlcHRpb24uaCIKICNpbmNsdWRlICJKU0RPTUV4Y2VwdGlvbi5oIgorI2luY2x1 ZGUgIkpTRXZlbnRMaXN0ZW5lci5oIgorI2luY2x1ZGUgIkpTRXZlbnRUYXJnZXQuaCIKICNpbmNs dWRlICJKU0hUTUxBbGxDb2xsZWN0aW9uLmgiCiAjaW5jbHVkZSAiSlNIVE1MQ29sbGVjdGlvbi5o IgogI2luY2x1ZGUgIkpTTm9kZS5oIgpAQCAtMTYxLDYgKzE2Myw0OCBAQCBzdGF0aWMgSlNTdHJp bmcqIGpzU3RyaW5nRm9yUGF5bWVudFJlcXVlc3RTdGF0ZShWTSYgdm0sIFBheW1lbnRSZXF1ZXN0 OjpTdGF0ZSBzdAogfQogI2VuZGlmCiAKK3N0YXRpYyBKU09iamVjdCogb2JqZWN0Rm9yRXZlbnRU YXJnZXRMaXN0ZW5lcnMoVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZXhlYywgRXZlbnRUYXJnZXQq IGV2ZW50VGFyZ2V0KQoreworICAgIGF1dG8qIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQgPSBldmVu dFRhcmdldC0+c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpOworICAgIGlmICghc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBKU09iamVjdCogbGlz dGVuZXJzID0gbnVsbHB0cjsKKworICAgIGZvciAoYXV0byYgZXZlbnRUeXBlIDogZXZlbnRUYXJn ZXQtPmV2ZW50VHlwZXMoKSkgeworICAgICAgICB1bnNpZ25lZCBsaXN0ZW5lcnNGb3JFdmVudElu ZGV4ID0gMDsKKyAgICAgICAgYXV0byogbGlzdGVuZXJzRm9yRXZlbnQgPSBjb25zdHJ1Y3RFbXB0 eUFycmF5KGV4ZWMsIG51bGxwdHIpOworCisgICAgICAgIGZvciAoYXV0byYgZXZlbnRMaXN0ZW5l ciA6IGV2ZW50VGFyZ2V0LT5ldmVudExpc3RlbmVycyhldmVudFR5cGUpKSB7CisgICAgICAgICAg ICBpZiAoIWlzPEpTRXZlbnRMaXN0ZW5lcj4oZXZlbnRMaXN0ZW5lci0+Y2FsbGJhY2soKSkpCisg ICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgIGF1dG8mIGpzTGlzdGVuZXIg PSBkb3duY2FzdDxKU0V2ZW50TGlzdGVuZXI+KGV2ZW50TGlzdGVuZXItPmNhbGxiYWNrKCkpOwor ICAgICAgICAgICAgaWYgKCZqc0xpc3RlbmVyLmlzb2xhdGVkV29ybGQoKSAhPSAmY3VycmVudFdv cmxkKCpleGVjKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgYXV0 byoganNGdW5jdGlvbiA9IGpzTGlzdGVuZXIuZW5zdXJlSlNGdW5jdGlvbigqc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCk7CisgICAgICAgICAgICBpZiAoIWpzRnVuY3Rpb24pCisgICAgICAgICAgICAg ICAgY29udGludWU7CisKKyAgICAgICAgICAgIGF1dG8qIHByb3BlcnRpZXNGb3JMaXN0ZW5lciA9 IGNvbnN0cnVjdEVtcHR5T2JqZWN0KGV4ZWMpOworICAgICAgICAgICAgcHJvcGVydGllc0Zvckxp c3RlbmVyLT5wdXREaXJlY3Qodm0sIElkZW50aWZpZXI6OmZyb21TdHJpbmcodm0sICJjYWxsYmFj ayIpLCBqc0Z1bmN0aW9uKTsKKyAgICAgICAgICAgIHByb3BlcnRpZXNGb3JMaXN0ZW5lci0+cHV0 RGlyZWN0KHZtLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAiY2FwdHVyZSIpLCBqc0Jvb2xl YW4oZXZlbnRMaXN0ZW5lci0+dXNlQ2FwdHVyZSgpKSk7CisgICAgICAgICAgICBwcm9wZXJ0aWVz Rm9yTGlzdGVuZXItPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgInBh c3NpdmUiKSwganNCb29sZWFuKGV2ZW50TGlzdGVuZXItPmlzUGFzc2l2ZSgpKSk7CisgICAgICAg ICAgICBwcm9wZXJ0aWVzRm9yTGlzdGVuZXItPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJv bVN0cmluZyh2bSwgIm9uY2UiKSwganNCb29sZWFuKGV2ZW50TGlzdGVuZXItPmlzT25jZSgpKSk7 CisgICAgICAgICAgICBsaXN0ZW5lcnNGb3JFdmVudC0+cHV0RGlyZWN0SW5kZXgoZXhlYywgbGlz dGVuZXJzRm9yRXZlbnRJbmRleCsrLCBwcm9wZXJ0aWVzRm9yTGlzdGVuZXIpOworICAgICAgICB9 CisKKyAgICAgICAgaWYgKGxpc3RlbmVyc0ZvckV2ZW50SW5kZXgpIHsKKyAgICAgICAgICAgIGlm ICghbGlzdGVuZXJzKQorICAgICAgICAgICAgICAgIGxpc3RlbmVycyA9IGNvbnN0cnVjdEVtcHR5 T2JqZWN0KGV4ZWMpOworICAgICAgICAgICAgbGlzdGVuZXJzLT5wdXREaXJlY3Qodm0sIElkZW50 aWZpZXI6OmZyb21TdHJpbmcodm0sIGV2ZW50VHlwZSksIGxpc3RlbmVyc0ZvckV2ZW50KTsKKyAg ICAgICAgfQorICAgIH0KKworICAgIHJldHVybiBsaXN0ZW5lcnM7Cit9CisKIEpTVmFsdWUgV2Vi SW5qZWN0ZWRTY3JpcHRIb3N0OjpnZXRJbnRlcm5hbFByb3BlcnRpZXMoVk0mIHZtLCBKU0dsb2Jh bE9iamVjdCogZXhlYywgSlNDOjpKU1ZhbHVlIHZhbHVlKQogewogICAgIGF1dG8gc2NvcGUgPSBE RUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKQEAgLTE2OCw4ICsyMTIsMTYgQEAgSlNWYWx1ZSBXZWJJ bmplY3RlZFNjcmlwdEhvc3Q6OmdldEludGVybmFsUHJvcGVydGllcyhWTSYgdm0sIEpTR2xvYmFs T2JqZWN0KiBleGUKICAgICBpZiAoYXV0byogd29ya2VyID0gSlNXb3JrZXI6OnRvV3JhcHBlZCh2 bSwgdmFsdWUpKSB7CiAgICAgICAgIHVuc2lnbmVkIGluZGV4ID0gMDsKICAgICAgICAgYXV0byog YXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5KGV4ZWMsIG51bGxwdHIpOwotICAgICAgICBhcnJh eS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0 eSh2bSwgZXhlYywgIm5hbWUiX3MsIGpzU3RyaW5nKHZtLCB3b3JrZXItPm5hbWUoKSkpKTsKKwor ICAgICAgICBTdHJpbmcgbmFtZSA9IHdvcmtlci0+bmFtZSgpOworICAgICAgICBpZiAoIW5hbWUu aXNFbXB0eSgpKQorICAgICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4 KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkodm0sIGV4ZWMsICJuYW1lIl9zLCBqc1N0cmlu Zyh2bSwgbmFtZSkpKTsKKwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5k ZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eSh2bSwgZXhlYywgInRlcm1pbmF0ZWQiX3Ms IGpzQm9vbGVhbih3b3JrZXItPndhc1Rlcm1pbmF0ZWQoKSkpKTsKKworICAgICAgICBpZiAoYXV0 byogbGlzdGVuZXJzID0gb2JqZWN0Rm9yRXZlbnRUYXJnZXRMaXN0ZW5lcnModm0sIGV4ZWMsIHdv cmtlcikpCisgICAgICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywg Y29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eSh2bSwgZXhlYywgImxpc3RlbmVycyJfcywgbGlzdGVu ZXJzKSk7CisKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKICAgICAg ICAgcmV0dXJuIGFycmF5OwogICAgIH0KQEAgLTE3OCwxNCArMjMwLDMwIEBAIEpTVmFsdWUgV2Vi SW5qZWN0ZWRTY3JpcHRIb3N0OjpnZXRJbnRlcm5hbFByb3BlcnRpZXMoVk0mIHZtLCBKU0dsb2Jh bE9iamVjdCogZXhlCiAgICAgaWYgKFBheW1lbnRSZXF1ZXN0KiBwYXltZW50UmVxdWVzdCA9IEpT UGF5bWVudFJlcXVlc3Q6OnRvV3JhcHBlZCh2bSwgdmFsdWUpKSB7CiAgICAgICAgIHVuc2lnbmVk IGluZGV4ID0gMDsKICAgICAgICAgYXV0byogYXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5KGV4 ZWMsIG51bGxwdHIpOworCiAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRl eCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KHZtLCBleGVjLCAib3B0aW9ucyJfcywgb2Jq ZWN0Rm9yUGF5bWVudE9wdGlvbnModm0sIGV4ZWMsIHBheW1lbnRSZXF1ZXN0LT5wYXltZW50T3B0 aW9ucygpKSkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywg Y29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eSh2bSwgZXhlYywgImRldGFpbHMiX3MsIG9iamVjdEZv clBheW1lbnREZXRhaWxzKHZtLCBleGVjLCBwYXltZW50UmVxdWVzdC0+cGF5bWVudERldGFpbHMo KSkpKTsKICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0 cnVjdEludGVybmFsUHJvcGVydHkodm0sIGV4ZWMsICJzdGF0ZSJfcywganNTdHJpbmdGb3JQYXlt ZW50UmVxdWVzdFN0YXRlKHZtLCBwYXltZW50UmVxdWVzdC0+c3RhdGUoKSkpKTsKKworICAgICAg ICBpZiAoYXV0byogbGlzdGVuZXJzID0gb2JqZWN0Rm9yRXZlbnRUYXJnZXRMaXN0ZW5lcnModm0s IGV4ZWMsIHBheW1lbnRSZXF1ZXN0KSkKKyAgICAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRl eChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KHZtLCBleGVjLCAibGlz dGVuZXJzIl9zLCBsaXN0ZW5lcnMpKTsKKwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNj b3BlLCB7IH0pOwogICAgICAgICByZXR1cm4gYXJyYXk7CiAgICAgfQogI2VuZGlmCiAKKyAgICBp ZiAoYXV0byogZXZlbnRUYXJnZXQgPSBKU0V2ZW50VGFyZ2V0Ojp0b1dyYXBwZWQodm0sIHZhbHVl KSkgeworICAgICAgICB1bnNpZ25lZCBpbmRleCA9IDA7CisgICAgICAgIGF1dG8qIGFycmF5ID0g Y29uc3RydWN0RW1wdHlBcnJheShleGVjLCBudWxscHRyKTsKKworICAgICAgICBpZiAoYXV0byog bGlzdGVuZXJzID0gb2JqZWN0Rm9yRXZlbnRUYXJnZXRMaXN0ZW5lcnModm0sIGV4ZWMsIGV2ZW50 VGFyZ2V0KSkKKyAgICAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsr LCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KHZtLCBleGVjLCAibGlzdGVuZXJzIl9zLCBsaXN0 ZW5lcnMpKTsKKworICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOworICAg ICAgICByZXR1cm4gYXJyYXk7CisgICAgfQorCiAgICAgcmV0dXJuIHsgfTsKIH0KIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDRiYTMwMzYwNGRkOTA3NGRmN2YwMjNmNTkwMWM1MGJjODU2ZDllMWEuLmM4ZmJkYzM5YmQxNmNk NmFiODAyMjk0NjAzOWI5YTI4ZmQ3ODgzZWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0w NS0xMiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIElu c3BlY3Rvcjogc2hvdyBFdmVudFRhcmdldCBsaXN0ZW5lcnMgYXMgYW4gaW50ZXJuYWwgcHJvcGVy dHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTc2 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5z cGVjdG9yL3J1bnRpbWUvZ2V0UHJvcGVydGllcy1pbnRlcm5hbFByb3BlcnRpZXMuaHRtbDogQWRk ZWQuCisgICAgICAgICogaW5zcGVjdG9yL3J1bnRpbWUvZ2V0UHJvcGVydGllcy1pbnRlcm5hbFBy b3BlcnRpZXMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAyMC0wNS0xMSAgSmFtZXMgRGFycGlu aWFuICA8amRhcnBpbmlhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViR0xMYXllciBjbG9i YmVycyBURVhUVVJFXzJEIGJpbmRpbmcgb24gaU9TCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvcnVudGltZS9nZXRQcm9wZXJ0aWVzLWludGVybmFsUHJvcGVydGllcy1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9nZXRQcm9wZXJ0aWVzLWludGVy bmFsUHJvcGVydGllcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzE5MjZjZjM3YzIwYTRjMmM1 NDJiMDg3MTI4NzAxNmUxMDliMmNmNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9ydW50aW1lL2dldFByb3BlcnRpZXMtaW50ZXJuYWxQcm9wZXJ0aWVzLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDI3IEBACitUZXN0cyBmb3IgdGhlIFJ1bnRpbWUuZ2V0UHJvcGVydGll cyBjb21tYW5kLgorCisKKz09IFJ1bm5pbmcgdGVzdCBzdWl0ZTogUnVudGltZS5nZXRQcm9wZXJ0 aWVzLmludGVybmFsUHJvcGVydGllcworLS0gUnVubmluZyB0ZXN0IGNhc2U6IFJ1bnRpbWUuZ2V0 UHJvcGVydGllcy5pbnRlcm5hbFByb3BlcnRpZXMuRXZlbnRUYXJnZXQKK0V2YWx1YXRpbmcgZXhw cmVzc2lvbi4uLgorR2V0dGluZyBpbnRlcm5hbCBwcm9wZXJ0aWVzLi4uCisKKyAgbGlzdGVuZXJz OiB7CisgICAgZXZlbnRCdWJibGVBY3RpdmVNdWx0aTogWworICAgICAgMDogeworICAgICAgICBj YWxsYmFjazogImZ1bmN0aW9uIGNhbGxiYWNrQnViYmxlQWN0aXZlTXVsdGkoKSB7fSIgKGZ1bmN0 aW9uKQorICAgICAgICBjYXB0dXJlOiBmYWxzZSAoYm9vbGVhbikKKyAgICAgICAgcGFzc2l2ZTog ZmFsc2UgKGJvb2xlYW4pCisgICAgICAgIG9uY2U6IGZhbHNlIChib29sZWFuKQorICAgICAgfQor ICAgIF0KKyAgICBldmVudENhcHR1cmVQYXNzaXZlT25jZTogWworICAgICAgMDogeworICAgICAg ICBjYWxsYmFjazogImZ1bmN0aW9uIGNhbGxiYWNrQ2FwdHVyZVBhc3NpdmVPbmNlKCkge30iIChm dW5jdGlvbikKKyAgICAgICAgY2FwdHVyZTogdHJ1ZSAoYm9vbGVhbikKKyAgICAgICAgcGFzc2l2 ZTogdHJ1ZSAoYm9vbGVhbikKKyAgICAgICAgb25jZTogdHJ1ZSAoYm9vbGVhbikKKyAgICAgIH0K KyAgICBdCisgIH0KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1bnRpbWUv Z2V0UHJvcGVydGllcy1pbnRlcm5hbFByb3BlcnRpZXMuaHRtbCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9ydW50aW1lL2dldFByb3BlcnRpZXMtaW50ZXJuYWxQcm9wZXJ0aWVzLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uZTM4MGUyMzY0ZDY5ZTQzYWUxMzQ3YmUwODQwYmE4MzkyMjNhNjZjZQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9ydW50aW1lL2dldFByb3BlcnRpZXMtaW50 ZXJuYWxQcm9wZXJ0aWVzLmh0bWwKQEAgLTAsMCArMSw4OSBAQAorPGh0bWw+Cis8aGVhZD4KKzxz Y3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvcHJvdG9jb2wt dGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL3Byb3BlcnR5LWRlc2Ny aXB0b3ItdXRpbGl0aWVzLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitpZiAod2luZG93LmludGVy bmFscykKKyAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldFVuaGFuZGxlZFByb21pc2VS ZWplY3Rpb25Ub0NvbnNvbGVFbmFibGVkKGZhbHNlKTsKKworZnVuY3Rpb24gdGVzdCgpCit7Cisg ICAgbGV0IHN1aXRlID0gUHJvdG9jb2xUZXN0LmNyZWF0ZUFzeW5jU3VpdGUoIlJ1bnRpbWUuZ2V0 UHJvcGVydGllcy5pbnRlcm5hbFByb3BlcnRpZXMiKTsKKworICAgIGZ1bmN0aW9uIGFkZFRlc3RD YXNlKHtuYW1lLCBleHByZXNzaW9ufSkgeworICAgICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7Cisg ICAgICAgICAgICBuYW1lLAorICAgICAgICAgICAgYXN5bmMgdGVzdCgpIHsKKyAgICAgICAgICAg ICAgICBQcm90b2NvbFRlc3QubG9nKGBFdmFsdWF0aW5nIGV4cHJlc3Npb24uLi5gKTsKKyAgICAg ICAgICAgICAgICBsZXQgZXZhbHVhdGVSZXNwb25zZSA9IGF3YWl0IEluc3BlY3RvclByb3RvY29s LmF3YWl0Q29tbWFuZCh7CisgICAgICAgICAgICAgICAgICAgIG1ldGhvZDogIlJ1bnRpbWUuZXZh bHVhdGUiLAorICAgICAgICAgICAgICAgICAgICBwYXJhbXM6IHtleHByZXNzaW9ufSwKKyAgICAg ICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JQcm90b2NvbC5jaGVja0Zv ckVycm9yKGV2YWx1YXRlUmVzcG9uc2UpOworICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5h c3NlcnQoIWV2YWx1YXRlUmVzcG9uc2Uud2FzVGhyb3duKTsKKworICAgICAgICAgICAgICAgIFBy b3RvY29sVGVzdC5sb2coIkdldHRpbmcgaW50ZXJuYWwgcHJvcGVydGllcy4uLiIpOworICAgICAg ICAgICAgICAgIGxldCB7aW50ZXJuYWxQcm9wZXJ0aWVzfSA9IGF3YWl0IEluc3BlY3RvclByb3Rv Y29sLmF3YWl0Q29tbWFuZCh7CisgICAgICAgICAgICAgICAgICAgIG1ldGhvZDogIlJ1bnRpbWUu Z2V0UHJvcGVydGllcyIsCisgICAgICAgICAgICAgICAgICAgIHBhcmFtczogeworICAgICAgICAg ICAgICAgICAgICAgICAgb2JqZWN0SWQ6IGV2YWx1YXRlUmVzcG9uc2UucmVzdWx0Lm9iamVjdElk LAorICAgICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIH0pOworCisgICAgICAg ICAgICAgICAgUHJvdG9jb2xUZXN0Lm5ld2xpbmUoKTsKKworICAgICAgICAgICAgICAgIGFzeW5j IGZ1bmN0aW9uIGR1bXAoe25hbWUsIHZhbHVlfSwgaW5kZW50U2l6ZSkgeworICAgICAgICAgICAg ICAgICAgICBpZiAobmFtZSA9PT0gIl9fcHJvdG9fXyIpCisgICAgICAgICAgICAgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgICAgICAgICAgICAgbGV0IGluZGVudExvZyA9ICIgIi5yZXBl YXQoaW5kZW50U2l6ZSk7CisgICAgICAgICAgICAgICAgICAgIGxldCBuYW1lTG9nID0gbmFtZSAr ICI6ICI7CisKKyAgICAgICAgICAgICAgICAgICAgaWYgKHZhbHVlLnR5cGUgIT09ICJvYmplY3Qi KSB7CisgICAgICAgICAgICAgICAgICAgICAgICBQcm90b2NvbFRlc3QubG9nKGluZGVudExvZyAr IG5hbWVMb2cgKyBQcm90b2NvbFRlc3QuUHJvcGVydHlEZXNjcmlwdG9yVXRpbGl0aWVzLnN0cmlu Z2lmeVJlbW90ZU9iamVjdCh2YWx1ZSkpOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICAgICAgUHJvdG9jb2xU ZXN0LmxvZyhpbmRlbnRMb2cgKyBuYW1lTG9nICsgKHZhbHVlLnN1YnR5cGUgPT09ICJhcnJheSIg PyAiWyIgOiAieyIpKTsKKworICAgICAgICAgICAgICAgICAgICBsZXQge3Byb3BlcnRpZXN9ID0g YXdhaXQgSW5zcGVjdG9yUHJvdG9jb2wuYXdhaXRDb21tYW5kKHsKKyAgICAgICAgICAgICAgICAg ICAgICAgIG1ldGhvZDogIlJ1bnRpbWUuZ2V0UHJvcGVydGllcyIsCisgICAgICAgICAgICAgICAg ICAgICAgICBwYXJhbXM6IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBvYmplY3RJZDog dmFsdWUub2JqZWN0SWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3duUHJvcGVydGll czogdHJ1ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAg IH0pOworICAgICAgICAgICAgICAgICAgICBmb3IgKGxldCBwcm9wZXJ0eSBvZiBwcm9wZXJ0aWVz KQorICAgICAgICAgICAgICAgICAgICAgICAgYXdhaXQgZHVtcChwcm9wZXJ0eSwgaW5kZW50U2l6 ZSArIDIpOworCisgICAgICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5sb2coaW5kZW50TG9n ICsgKHZhbHVlLnN1YnR5cGUgPT09ICJhcnJheSIgPyAiXSIgOiAifSIpKTsKKyAgICAgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgICAgICBmb3IgKGxldCBpbnRlcm5hbFByb3BlcnR5IG9mIGlu dGVybmFsUHJvcGVydGllcykKKyAgICAgICAgICAgICAgICAgICAgYXdhaXQgZHVtcChpbnRlcm5h bFByb3BlcnR5LCAyKTsKKyAgICAgICAgICAgIH0sCisgICAgICAgIH0pOworICAgIH0KKworICAg IGFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIlJ1bnRpbWUuZ2V0UHJvcGVydGllcy5pbnRl cm5hbFByb3BlcnRpZXMuRXZlbnRUYXJnZXQiLAorICAgICAgICBleHByZXNzaW9uOiBgKGZ1bmN0 aW9uKCkgeworbGV0IHggPSBuZXcgRXZlbnRUYXJnZXQ7Cit4LmFkZEV2ZW50TGlzdGVuZXIoImV2 ZW50QnViYmxlQWN0aXZlTXVsdGkiLCBmdW5jdGlvbiBjYWxsYmFja0J1YmJsZUFjdGl2ZU11bHRp KCkge30pOworeC5hZGRFdmVudExpc3RlbmVyKCJldmVudENhcHR1cmVQYXNzaXZlT25jZSIsIGZ1 bmN0aW9uIGNhbGxiYWNrQ2FwdHVyZVBhc3NpdmVPbmNlKCkge30sIHsKKyAgICBjYXB0dXJlOiB0 cnVlLAorICAgIHBhc3NpdmU6IHRydWUsCisgICAgb25jZTogdHJ1ZSwKK30pOworcmV0dXJuIHg7 CisgICAgICAgIH0pKClgLAorICAgIH0pOworCisgICAgc3VpdGUucnVuVGVzdENhc2VzQW5kRmlu aXNoKCk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9uTG9hZD0icnVuVGVzdCgpIj4K KzxwPlRlc3RzIGZvciB0aGUgUnVudGltZS5nZXRQcm9wZXJ0aWVzIGNvbW1hbmQuPC9wPgorPC9i b2R5PgorPC9odG1sPgo= 399236 2020-05-12 20:30:19 -0700 2020-05-13 19:36:45 -0700 Patch bug-211766-20200512213018.patch text/plain 13092 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NmRjMDVhNzg5ZDYzNjhlMDBiMGRiNDgxN2E3ZDkwNzE5NmU2NjRiLi4x ZTVmNWYyMTI1YmIwNzQ1NjMyODA3ZmZkNmIwZGJhMzQ2NzFmOTczIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzQgQEAKKzIwMjAtMDUtMTIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNob3cgRXZlbnRUYXJnZXQgbGlzdGVuZXJzIGFz IGFuIGludGVybmFsIHByb3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTE3NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvcnVudGltZS9nZXRQcm9wZXJ0aWVzLWludGVy bmFsUHJvcGVydGllcy5odG1sCisKKyAgICAgICAgQWRkIGEgYGxpc3RlbmVyc2AgaW50ZXJuYWwg cHJvcGVydHkgZm9yIGBFdmVudFRhcmdldGAgb2JqZWN0cyB3aXRoIHRoZSB2YWx1ZQorICAgICAg ICBgYGAKKyAgICAgICAgICAgIGxpc3RlbmVyczogeworICAgICAgICAgICAgICAgIDxldmVudD46 IFsKKyAgICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgY2FsbGJh Y2s6IDxmdW5jdGlvbj4KKyAgICAgICAgICAgICAgICAgICAgICAgIGNhcHR1cmU6IDxib29sZWFu PgorICAgICAgICAgICAgICAgICAgICAgICAgcGFzc2l2ZTogPGJvb2xlYW4+CisgICAgICAgICAg ICAgICAgICAgICAgICBvbmNlOiA8Ym9vbGVhbj4KKyAgICAgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgICAgICAuLi4KKyAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICAgICAg Li4uCisgICAgICAgICAgICB9CisgICAgICAgIGBgYAorICAgICAgICBzbyBsb25nIGFzIGF0IGxl YXN0IG9uZSBgSlNFdmVudExpc3RlbmVyYCBoYXMgYmVlbiBhZGRlZCBwcmlvciB0byB0aGF0IHBv aW50LgorCisgICAgICAgICogaW5zcGVjdG9yL1dlYkluamVjdGVkU2NyaXB0SG9zdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpvYmplY3RGb3JFdmVudFRhcmdldExpc3RlbmVycyk6IEFkZGVkLgor ICAgICAgICAoV2ViQ29yZTo6V2ViSW5qZWN0ZWRTY3JpcHRIb3N0OjpnZXRJbnRlcm5hbFByb3Bl cnRpZXMpOgorICAgICAgICBEcml2ZS1ieTogb25seSBhZGQgdGhlIGBuYW1lYCBpbnRlcm5hbCBw cm9wZXJ0eSBpZiB0aGUgYFdvcmtlcmAgYWN0dWFsbHkgaGFzIGEgbmFtZS4KKwogMjAyMC0wNS0x MiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3Zl IHBlcnNwZWN0aXZlLXNldHRpbmcgY29kZSBpbnRvIGl0cyBvd24gZnVuY3Rpb24KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3QuY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dlYkluamVjdGVkU2NyaXB0SG9zdC5jcHAKaW5kZXgg MDk5MDFkMGZhNDY3YjE5ODAyZGU2MTUxMzIwMWYwZmRlZDhiNWFhOS4uYWNiNWZhYzhhNGMzNzE0 NTAyZDRmYTYxOTMxZWRlNTQ5YjBiYWNjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL1dlYkluamVjdGVkU2NyaXB0SG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL1dlYkluamVjdGVkU2NyaXB0SG9zdC5jcHAKQEAgLTI4LDYgKzI4LDggQEAKIAogI2lu Y2x1ZGUgIkRPTUV4Y2VwdGlvbi5oIgogI2luY2x1ZGUgIkpTRE9NRXhjZXB0aW9uLmgiCisjaW5j bHVkZSAiSlNFdmVudExpc3RlbmVyLmgiCisjaW5jbHVkZSAiSlNFdmVudFRhcmdldC5oIgogI2lu Y2x1ZGUgIkpTSFRNTEFsbENvbGxlY3Rpb24uaCIKICNpbmNsdWRlICJKU0hUTUxDb2xsZWN0aW9u LmgiCiAjaW5jbHVkZSAiSlNOb2RlLmgiCkBAIC0xNjEsNiArMTYzLDQ4IEBAIHN0YXRpYyBKU1N0 cmluZyoganNTdHJpbmdGb3JQYXltZW50UmVxdWVzdFN0YXRlKFZNJiB2bSwgUGF5bWVudFJlcXVl c3Q6OlN0YXRlIHN0CiB9CiAjZW5kaWYKIAorc3RhdGljIEpTT2JqZWN0KiBvYmplY3RGb3JFdmVu dFRhcmdldExpc3RlbmVycyhWTSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBleGVjLCBFdmVudFRhcmdl dCogZXZlbnRUYXJnZXQpCit7CisgICAgYXV0byogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCA9IGV2 ZW50VGFyZ2V0LT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCk7CisgICAgaWYgKCFzY3JpcHRFeGVj dXRpb25Db250ZXh0KQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIEpTT2JqZWN0KiBs aXN0ZW5lcnMgPSBudWxscHRyOworCisgICAgZm9yIChhdXRvJiBldmVudFR5cGUgOiBldmVudFRh cmdldC0+ZXZlbnRUeXBlcygpKSB7CisgICAgICAgIHVuc2lnbmVkIGxpc3RlbmVyc0ZvckV2ZW50 SW5kZXggPSAwOworICAgICAgICBhdXRvKiBsaXN0ZW5lcnNGb3JFdmVudCA9IGNvbnN0cnVjdEVt cHR5QXJyYXkoZXhlYywgbnVsbHB0cik7CisKKyAgICAgICAgZm9yIChhdXRvJiBldmVudExpc3Rl bmVyIDogZXZlbnRUYXJnZXQtPmV2ZW50TGlzdGVuZXJzKGV2ZW50VHlwZSkpIHsKKyAgICAgICAg ICAgIGlmICghaXM8SlNFdmVudExpc3RlbmVyPihldmVudExpc3RlbmVyLT5jYWxsYmFjaygpKSkK KyAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgYXV0byYganNMaXN0ZW5l ciA9IGRvd25jYXN0PEpTRXZlbnRMaXN0ZW5lcj4oZXZlbnRMaXN0ZW5lci0+Y2FsbGJhY2soKSk7 CisgICAgICAgICAgICBpZiAoJmpzTGlzdGVuZXIuaXNvbGF0ZWRXb3JsZCgpICE9ICZjdXJyZW50 V29ybGQoKmV4ZWMpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICBh dXRvKiBqc0Z1bmN0aW9uID0ganNMaXN0ZW5lci5lbnN1cmVKU0Z1bmN0aW9uKCpzY3JpcHRFeGVj dXRpb25Db250ZXh0KTsKKyAgICAgICAgICAgIGlmICghanNGdW5jdGlvbikKKyAgICAgICAgICAg ICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgYXV0byogcHJvcGVydGllc0Zvckxpc3RlbmVy ID0gY29uc3RydWN0RW1wdHlPYmplY3QoZXhlYyk7CisgICAgICAgICAgICBwcm9wZXJ0aWVzRm9y TGlzdGVuZXItPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgImNhbGxi YWNrIiksIGpzRnVuY3Rpb24pOworICAgICAgICAgICAgcHJvcGVydGllc0Zvckxpc3RlbmVyLT5w dXREaXJlY3Qodm0sIElkZW50aWZpZXI6OmZyb21TdHJpbmcodm0sICJjYXB0dXJlIiksIGpzQm9v bGVhbihldmVudExpc3RlbmVyLT51c2VDYXB0dXJlKCkpKTsKKyAgICAgICAgICAgIHByb3BlcnRp ZXNGb3JMaXN0ZW5lci0+cHV0RGlyZWN0KHZtLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAi cGFzc2l2ZSIpLCBqc0Jvb2xlYW4oZXZlbnRMaXN0ZW5lci0+aXNQYXNzaXZlKCkpKTsKKyAgICAg ICAgICAgIHByb3BlcnRpZXNGb3JMaXN0ZW5lci0+cHV0RGlyZWN0KHZtLCBJZGVudGlmaWVyOjpm cm9tU3RyaW5nKHZtLCAib25jZSIpLCBqc0Jvb2xlYW4oZXZlbnRMaXN0ZW5lci0+aXNPbmNlKCkp KTsKKyAgICAgICAgICAgIGxpc3RlbmVyc0ZvckV2ZW50LT5wdXREaXJlY3RJbmRleChleGVjLCBs aXN0ZW5lcnNGb3JFdmVudEluZGV4KyssIHByb3BlcnRpZXNGb3JMaXN0ZW5lcik7CisgICAgICAg IH0KKworICAgICAgICBpZiAobGlzdGVuZXJzRm9yRXZlbnRJbmRleCkgeworICAgICAgICAgICAg aWYgKCFsaXN0ZW5lcnMpCisgICAgICAgICAgICAgICAgbGlzdGVuZXJzID0gY29uc3RydWN0RW1w dHlPYmplY3QoZXhlYyk7CisgICAgICAgICAgICBsaXN0ZW5lcnMtPnB1dERpcmVjdCh2bSwgSWRl bnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgZXZlbnRUeXBlKSwgbGlzdGVuZXJzRm9yRXZlbnQpOwor ICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIGxpc3RlbmVyczsKK30KKwogSlNWYWx1ZSBX ZWJJbmplY3RlZFNjcmlwdEhvc3Q6OmdldEludGVybmFsUHJvcGVydGllcyhWTSYgdm0sIEpTR2xv YmFsT2JqZWN0KiBleGVjLCBKU0M6OkpTVmFsdWUgdmFsdWUpCiB7CiAgICAgYXV0byBzY29wZSA9 IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwpAQCAtMTY4LDggKzIxMiwxNiBAQCBKU1ZhbHVlIFdl YkluamVjdGVkU2NyaXB0SG9zdDo6Z2V0SW50ZXJuYWxQcm9wZXJ0aWVzKFZNJiB2bSwgSlNHbG9i YWxPYmplY3QqIGV4ZQogICAgIGlmIChhdXRvKiB3b3JrZXIgPSBKU1dvcmtlcjo6dG9XcmFwcGVk KHZtLCB2YWx1ZSkpIHsKICAgICAgICAgdW5zaWduZWQgaW5kZXggPSAwOwogICAgICAgICBhdXRv KiBhcnJheSA9IGNvbnN0cnVjdEVtcHR5QXJyYXkoZXhlYywgbnVsbHB0cik7Ci0gICAgICAgIGFy cmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3Bl cnR5KHZtLCBleGVjLCAibmFtZSJfcywganNTdHJpbmcodm0sIHdvcmtlci0+bmFtZSgpKSkpOwor CisgICAgICAgIFN0cmluZyBuYW1lID0gd29ya2VyLT5uYW1lKCk7CisgICAgICAgIGlmICghbmFt ZS5pc0VtcHR5KCkpCisgICAgICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5k ZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eSh2bSwgZXhlYywgIm5hbWUiX3MsIGpzU3Ry aW5nKHZtLCBuYW1lKSkpOworCiAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBp bmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KHZtLCBleGVjLCAidGVybWluYXRlZCJf cywganNCb29sZWFuKHdvcmtlci0+d2FzVGVybWluYXRlZCgpKSkpOworCisgICAgICAgIGlmIChh dXRvKiBsaXN0ZW5lcnMgPSBvYmplY3RGb3JFdmVudFRhcmdldExpc3RlbmVycyh2bSwgZXhlYywg d29ya2VyKSkKKyAgICAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsr LCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KHZtLCBleGVjLCAibGlzdGVuZXJzIl9zLCBsaXN0 ZW5lcnMpKTsKKwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOwogICAg ICAgICByZXR1cm4gYXJyYXk7CiAgICAgfQpAQCAtMTc4LDE0ICsyMzAsMzAgQEAgSlNWYWx1ZSBX ZWJJbmplY3RlZFNjcmlwdEhvc3Q6OmdldEludGVybmFsUHJvcGVydGllcyhWTSYgdm0sIEpTR2xv YmFsT2JqZWN0KiBleGUKICAgICBpZiAoUGF5bWVudFJlcXVlc3QqIHBheW1lbnRSZXF1ZXN0ID0g SlNQYXltZW50UmVxdWVzdDo6dG9XcmFwcGVkKHZtLCB2YWx1ZSkpIHsKICAgICAgICAgdW5zaWdu ZWQgaW5kZXggPSAwOwogICAgICAgICBhdXRvKiBhcnJheSA9IGNvbnN0cnVjdEVtcHR5QXJyYXko ZXhlYywgbnVsbHB0cik7CisKICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGlu ZGV4KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkodm0sIGV4ZWMsICJvcHRpb25zIl9zLCBv YmplY3RGb3JQYXltZW50T3B0aW9ucyh2bSwgZXhlYywgcGF5bWVudFJlcXVlc3QtPnBheW1lbnRP cHRpb25zKCkpKSk7CiAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsr LCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KHZtLCBleGVjLCAiZGV0YWlscyJfcywgb2JqZWN0 Rm9yUGF5bWVudERldGFpbHModm0sIGV4ZWMsIHBheW1lbnRSZXF1ZXN0LT5wYXltZW50RGV0YWls cygpKSkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29u c3RydWN0SW50ZXJuYWxQcm9wZXJ0eSh2bSwgZXhlYywgInN0YXRlIl9zLCBqc1N0cmluZ0ZvclBh eW1lbnRSZXF1ZXN0U3RhdGUodm0sIHBheW1lbnRSZXF1ZXN0LT5zdGF0ZSgpKSkpOworCisgICAg ICAgIGlmIChhdXRvKiBsaXN0ZW5lcnMgPSBvYmplY3RGb3JFdmVudFRhcmdldExpc3RlbmVycyh2 bSwgZXhlYywgcGF5bWVudFJlcXVlc3QpKQorICAgICAgICAgICAgYXJyYXktPnB1dERpcmVjdElu ZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkodm0sIGV4ZWMsICJs aXN0ZW5lcnMiX3MsIGxpc3RlbmVycykpOworCiAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04o c2NvcGUsIHsgfSk7CiAgICAgICAgIHJldHVybiBhcnJheTsKICAgICB9CiAjZW5kaWYKIAorICAg IGlmIChhdXRvKiBldmVudFRhcmdldCA9IEpTRXZlbnRUYXJnZXQ6OnRvV3JhcHBlZCh2bSwgdmFs dWUpKSB7CisgICAgICAgIHVuc2lnbmVkIGluZGV4ID0gMDsKKyAgICAgICAgYXV0byogYXJyYXkg PSBjb25zdHJ1Y3RFbXB0eUFycmF5KGV4ZWMsIG51bGxwdHIpOworCisgICAgICAgIGlmIChhdXRv KiBsaXN0ZW5lcnMgPSBvYmplY3RGb3JFdmVudFRhcmdldExpc3RlbmVycyh2bSwgZXhlYywgZXZl bnRUYXJnZXQpKQorICAgICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4 KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkodm0sIGV4ZWMsICJsaXN0ZW5lcnMiX3MsIGxp c3RlbmVycykpOworCisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHsgfSk7Cisg ICAgICAgIHJldHVybiBhcnJheTsKKyAgICB9CisKICAgICByZXR1cm4geyB9OwogfQogCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggY2Y4Yjk3M2I2OGQyNTI4YzFjODlmY2E0NzgwN2EwNDhiYjIxMzI1Ni4uN2M1YjU5N2QwY2Fl MzlmMjkxMzhmMjNiMjNhZTcyM2IzNGM3MDQ5NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIw LTA1LTEyICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBzaG93IEV2ZW50VGFyZ2V0IGxpc3RlbmVycyBhcyBhbiBpbnRlcm5hbCBwcm9w ZXJ0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEx NzY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvcnVudGltZS9nZXRQcm9wZXJ0aWVzLWludGVybmFsUHJvcGVydGllcy5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvcnVudGltZS9nZXRQcm9wZXJ0aWVzLWludGVybmFs UHJvcGVydGllcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorCisgICAgICAgICogaW5zcGVjdG9yL2Rl YnVnZ2VyL3RhaWwtZGVsZXRlZC1mcmFtZXMvdGFpbC1kZWxldGVkLWZyYW1lcy10aGlzLXZhbHVl LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgVGhlIGB0aGlzYCB2YWx1ZSBvZiBHbG9iYWwgQ29kZSBp cyB0aGUgYHdpbmRvd2AsIHdoaWNoIGlzIGFuIGBFdmVudFRhcmdldGAsIHNvIGl0J3MgZmlyc3QK KyAgICAgICAgcHJvcGVydHkgc2hvdWxkIG5vdyBiZSB0aGUgYGxpc3RlbmVyc2AgaW50ZXJuYWwg cHJvcGVydHkuCisKIDIwMjAtMDUtMTIgIEphc29uIExhd3JlbmNlICA8bGF3cmVuY2UuakBhcHBs ZS5jb20+CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogbV91bmNvbW1pdHRlZFN0YXRlLnN0 YXRlID09IFN0YXRlOjpDb21taXR0ZWQgb24gaHR0cC90ZXN0cy9yZWZlcnJlci1wb2xpY3ktYW5j aG9yL29yaWdpbi9jcm9zcy1vcmlnaW4taHR0cC5odHRwcy5odG1sIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3RhaWwtZGVsZXRlZC1mcmFtZXMvdGFpbC1kZWxl dGVkLWZyYW1lcy10aGlzLXZhbHVlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci90YWlsLWRlbGV0ZWQtZnJhbWVzL3RhaWwtZGVsZXRlZC1mcmFtZXMtdGhpcy12 YWx1ZS1leHBlY3RlZC50eHQKaW5kZXggZTM3NDQ2NDUzN2FhYjdkNGEwYWI1ZTI0ZjRmYzhhNzBm ZjdmNWI3Yy4uM2ZkMGIzNjMzMWQ3YTM4YTFmMTkxMjczZTg5ZjFkNzIxZmQ4NDAwMCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3RhaWwtZGVsZXRlZC1mcmFtZXMv dGFpbC1kZWxldGVkLWZyYW1lcy10aGlzLXZhbHVlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdGFpbC1kZWxldGVkLWZyYW1lcy90YWlsLWRlbGV0ZWQt ZnJhbWVzLXRoaXMtdmFsdWUtZXhwZWN0ZWQudHh0CkBAIC0xNCw2ICsxNCw2IEBAIENBTEwgU1RB Q0s6CiAzOiBbRl0gc3RhcnRBQkMKICAgdGhpczogdW5kZWZpbmVkCiA0OiBbUF0gR2xvYmFsIENv ZGUKLSAgdGhpczogYSAtIAorICB0aGlzOiBsaXN0ZW5lcnMgLSBPYmplY3QKIFJFU1VNRUQKIApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1bnRpbWUvZ2V0UHJvcGVydGllcy1p bnRlcm5hbFByb3BlcnRpZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1 bnRpbWUvZ2V0UHJvcGVydGllcy1pbnRlcm5hbFByb3BlcnRpZXMtZXhwZWN0ZWQudHh0Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjMxOTI2Y2YzN2MyMGE0YzJjNTQyYjA4NzEyODcwMTZlMTA5YjJjZjUKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9nZXRQcm9wZXJ0aWVzLWlu dGVybmFsUHJvcGVydGllcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyNyBAQAorVGVzdHMgZm9y IHRoZSBSdW50aW1lLmdldFByb3BlcnRpZXMgY29tbWFuZC4KKworCis9PSBSdW5uaW5nIHRlc3Qg c3VpdGU6IFJ1bnRpbWUuZ2V0UHJvcGVydGllcy5pbnRlcm5hbFByb3BlcnRpZXMKKy0tIFJ1bm5p bmcgdGVzdCBjYXNlOiBSdW50aW1lLmdldFByb3BlcnRpZXMuaW50ZXJuYWxQcm9wZXJ0aWVzLkV2 ZW50VGFyZ2V0CitFdmFsdWF0aW5nIGV4cHJlc3Npb24uLi4KK0dldHRpbmcgaW50ZXJuYWwgcHJv cGVydGllcy4uLgorCisgIGxpc3RlbmVyczogeworICAgIGV2ZW50QnViYmxlQWN0aXZlTXVsdGk6 IFsKKyAgICAgIDA6IHsKKyAgICAgICAgY2FsbGJhY2s6ICJmdW5jdGlvbiBjYWxsYmFja0J1YmJs ZUFjdGl2ZU11bHRpKCkge30iIChmdW5jdGlvbikKKyAgICAgICAgY2FwdHVyZTogZmFsc2UgKGJv b2xlYW4pCisgICAgICAgIHBhc3NpdmU6IGZhbHNlIChib29sZWFuKQorICAgICAgICBvbmNlOiBm YWxzZSAoYm9vbGVhbikKKyAgICAgIH0KKyAgICBdCisgICAgZXZlbnRDYXB0dXJlUGFzc2l2ZU9u Y2U6IFsKKyAgICAgIDA6IHsKKyAgICAgICAgY2FsbGJhY2s6ICJmdW5jdGlvbiBjYWxsYmFja0Nh cHR1cmVQYXNzaXZlT25jZSgpIHt9IiAoZnVuY3Rpb24pCisgICAgICAgIGNhcHR1cmU6IHRydWUg KGJvb2xlYW4pCisgICAgICAgIHBhc3NpdmU6IHRydWUgKGJvb2xlYW4pCisgICAgICAgIG9uY2U6 IHRydWUgKGJvb2xlYW4pCisgICAgICB9CisgICAgXQorICB9CisKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9ydW50aW1lL2dldFByb3BlcnRpZXMtaW50ZXJuYWxQcm9wZXJ0aWVz Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9nZXRQcm9wZXJ0aWVzLWludGVy bmFsUHJvcGVydGllcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmUzODBlMjM2NGQ2OWU0M2FlMTM0N2JlMDg0 MGJhODM5MjIzYTY2Y2UKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv cnVudGltZS9nZXRQcm9wZXJ0aWVzLWludGVybmFsUHJvcGVydGllcy5odG1sCkBAIC0wLDAgKzEs ODkgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNw ZWN0b3IvcmVzb3VyY2VzL3Byb3RvY29sLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9 InJlc291cmNlcy9wcm9wZXJ0eS1kZXNjcmlwdG9yLXV0aWxpdGllcy5qcyI+PC9zY3JpcHQ+Cis8 c2NyaXB0PgoraWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgd2luZG93LmludGVybmFscy5zZXR0 aW5ncy5zZXRVbmhhbmRsZWRQcm9taXNlUmVqZWN0aW9uVG9Db25zb2xlRW5hYmxlZChmYWxzZSk7 CisKK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIGxldCBzdWl0ZSA9IFByb3RvY29sVGVzdC5jcmVh dGVBc3luY1N1aXRlKCJSdW50aW1lLmdldFByb3BlcnRpZXMuaW50ZXJuYWxQcm9wZXJ0aWVzIik7 CisKKyAgICBmdW5jdGlvbiBhZGRUZXN0Q2FzZSh7bmFtZSwgZXhwcmVzc2lvbn0pIHsKKyAgICAg ICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAgICAgICAgICAgbmFtZSwKKyAgICAgICAgICAgIGFz eW5jIHRlc3QoKSB7CisgICAgICAgICAgICAgICAgUHJvdG9jb2xUZXN0LmxvZyhgRXZhbHVhdGlu ZyBleHByZXNzaW9uLi4uYCk7CisgICAgICAgICAgICAgICAgbGV0IGV2YWx1YXRlUmVzcG9uc2Ug PSBhd2FpdCBJbnNwZWN0b3JQcm90b2NvbC5hd2FpdENvbW1hbmQoeworICAgICAgICAgICAgICAg ICAgICBtZXRob2Q6ICJSdW50aW1lLmV2YWx1YXRlIiwKKyAgICAgICAgICAgICAgICAgICAgcGFy YW1zOiB7ZXhwcmVzc2lvbn0sCisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAg SW5zcGVjdG9yUHJvdG9jb2wuY2hlY2tGb3JFcnJvcihldmFsdWF0ZVJlc3BvbnNlKTsKKyAgICAg ICAgICAgICAgICBQcm90b2NvbFRlc3QuYXNzZXJ0KCFldmFsdWF0ZVJlc3BvbnNlLndhc1Rocm93 bik7CisKKyAgICAgICAgICAgICAgICBQcm90b2NvbFRlc3QubG9nKCJHZXR0aW5nIGludGVybmFs IHByb3BlcnRpZXMuLi4iKTsKKyAgICAgICAgICAgICAgICBsZXQge2ludGVybmFsUHJvcGVydGll c30gPSBhd2FpdCBJbnNwZWN0b3JQcm90b2NvbC5hd2FpdENvbW1hbmQoeworICAgICAgICAgICAg ICAgICAgICBtZXRob2Q6ICJSdW50aW1lLmdldFByb3BlcnRpZXMiLAorICAgICAgICAgICAgICAg ICAgICBwYXJhbXM6IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIG9iamVjdElkOiBldmFsdWF0 ZVJlc3BvbnNlLnJlc3VsdC5vYmplY3RJZCwKKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAg ICAgICAgICAgICB9KTsKKworICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5uZXdsaW5lKCk7 CisKKyAgICAgICAgICAgICAgICBhc3luYyBmdW5jdGlvbiBkdW1wKHtuYW1lLCB2YWx1ZX0sIGlu ZGVudFNpemUpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKG5hbWUgPT09ICJfX3Byb3RvX18i KQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICAgICAgICAg IGxldCBpbmRlbnRMb2cgPSAiICIucmVwZWF0KGluZGVudFNpemUpOworICAgICAgICAgICAgICAg ICAgICBsZXQgbmFtZUxvZyA9IG5hbWUgKyAiOiAiOworCisgICAgICAgICAgICAgICAgICAgIGlm ICh2YWx1ZS50eXBlICE9PSAib2JqZWN0IikgeworICAgICAgICAgICAgICAgICAgICAgICAgUHJv dG9jb2xUZXN0LmxvZyhpbmRlbnRMb2cgKyBuYW1lTG9nICsgUHJvdG9jb2xUZXN0LlByb3BlcnR5 RGVzY3JpcHRvclV0aWxpdGllcy5zdHJpbmdpZnlSZW1vdGVPYmplY3QodmFsdWUpKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICAgICAgfQorCisgICAg ICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5sb2coaW5kZW50TG9nICsgbmFtZUxvZyArICh2 YWx1ZS5zdWJ0eXBlID09PSAiYXJyYXkiID8gIlsiIDogInsiKSk7CisKKyAgICAgICAgICAgICAg ICAgICAgbGV0IHtwcm9wZXJ0aWVzfSA9IGF3YWl0IEluc3BlY3RvclByb3RvY29sLmF3YWl0Q29t bWFuZCh7CisgICAgICAgICAgICAgICAgICAgICAgICBtZXRob2Q6ICJSdW50aW1lLmdldFByb3Bl cnRpZXMiLAorICAgICAgICAgICAgICAgICAgICAgICAgcGFyYW1zOiB7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgb2JqZWN0SWQ6IHZhbHVlLm9iamVjdElkLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG93blByb3BlcnRpZXM6IHRydWUsCisgICAgICAgICAgICAgICAgICAgICAg ICB9LAorICAgICAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICAgICAgZm9yIChs ZXQgcHJvcGVydHkgb2YgcHJvcGVydGllcykKKyAgICAgICAgICAgICAgICAgICAgICAgIGF3YWl0 IGR1bXAocHJvcGVydHksIGluZGVudFNpemUgKyAyKTsKKworICAgICAgICAgICAgICAgICAgICBQ cm90b2NvbFRlc3QubG9nKGluZGVudExvZyArICh2YWx1ZS5zdWJ0eXBlID09PSAiYXJyYXkiID8g Il0iIDogIn0iKSk7CisgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgZm9yIChs ZXQgaW50ZXJuYWxQcm9wZXJ0eSBvZiBpbnRlcm5hbFByb3BlcnRpZXMpCisgICAgICAgICAgICAg ICAgICAgIGF3YWl0IGR1bXAoaW50ZXJuYWxQcm9wZXJ0eSwgMik7CisgICAgICAgICAgICB9LAor ICAgICAgICB9KTsKKyAgICB9CisKKyAgICBhZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJS dW50aW1lLmdldFByb3BlcnRpZXMuaW50ZXJuYWxQcm9wZXJ0aWVzLkV2ZW50VGFyZ2V0IiwKKyAg ICAgICAgZXhwcmVzc2lvbjogYChmdW5jdGlvbigpIHsKK2xldCB4ID0gbmV3IEV2ZW50VGFyZ2V0 OworeC5hZGRFdmVudExpc3RlbmVyKCJldmVudEJ1YmJsZUFjdGl2ZU11bHRpIiwgZnVuY3Rpb24g Y2FsbGJhY2tCdWJibGVBY3RpdmVNdWx0aSgpIHt9KTsKK3guYWRkRXZlbnRMaXN0ZW5lcigiZXZl bnRDYXB0dXJlUGFzc2l2ZU9uY2UiLCBmdW5jdGlvbiBjYWxsYmFja0NhcHR1cmVQYXNzaXZlT25j ZSgpIHt9LCB7CisgICAgY2FwdHVyZTogdHJ1ZSwKKyAgICBwYXNzaXZlOiB0cnVlLAorICAgIG9u Y2U6IHRydWUsCit9KTsKK3JldHVybiB4OworICAgICAgICB9KSgpYCwKKyAgICB9KTsKKworICAg IHN1aXRlLnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8 Ym9keSBvbkxvYWQ9InJ1blRlc3QoKSI+Cis8cD5UZXN0cyBmb3IgdGhlIFJ1bnRpbWUuZ2V0UHJv cGVydGllcyBjb21tYW5kLjwvcD4KKzwvYm9keT4KKzwvaHRtbD4K