157623 2016-05-12 05:22:31 -0700 REGRESSION(r200766): it is breaking yosemite builds (Requested by youenn on #webkit). 2016-05-12 05:26:08 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 157307 1 commit-queue commit-queue darin youennf oldest_to_newest 1192310 0 commit-queue 2016-05-12 05:22:31 -0700 http://trac.webkit.org/changeset/200766 broke the build: it is breaking yosemite builds (Requested by youenn on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1192312 1 278730 commit-queue 2016-05-12 05:23:03 -0700 Created attachment 278730 ROLLOUT of r200766 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1192313 2 278730 commit-queue 2016-05-12 05:26:05 -0700 Comment on attachment 278730 ROLLOUT of r200766 Clearing flags on attachment: 278730 Committed r200768: <http://trac.webkit.org/changeset/200768> 1192314 3 commit-queue 2016-05-12 05:26:08 -0700 All reviewed patches have been landed. Closing bug. 278730 2016-05-12 05:23:03 -0700 2016-05-12 05:26:05 -0700 ROLLOUT of r200766 bug-157623-20160512052353.patch text/plain 30956 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwNzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODM3MDE3YmQyOGFlMzA1 NTU2NjViYjQ2N2RmMWVmMDNhYjMzNjhiNS4uODFhN2JmODAwZmE3Y2VmZjVlZmMxZjQ2NmMwMjVm N2E3YjcyZmZhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTA1LTEyICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMjAwNzY2LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTU3NjIzCisKKyAgICAgICAgaXQgaXMgYnJlYWtpbmcgeW9zZW1pdGUg YnVpbGRzIChSZXF1ZXN0ZWQgYnkgeW91ZW5uIG9uCisgICAgICAgICN3ZWJraXQpLgorCisgICAg ICAgIFJldmVydGVkIGNoYW5nZXNldDoKKworICAgICAgICAiRE9NUHJvbWlzZSBzaG91bGQgb25s eSByZXN0cmljdCB0aGUgcmVzb2x1dGlvbiB0eXBlIgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3MzA3CisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtp dC5vcmcvY2hhbmdlc2V0LzIwMDc2NgorCiAyMDE2LTA1LTEyICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgRE9NUHJvbWlzZSBzaG91bGQgb25s eSByZXN0cmljdCB0aGUgcmVzb2x1dGlvbiB0eXBlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2ZldGNoL0ZldGNoQm9keS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Zl dGNoL0ZldGNoQm9keS5jcHAKaW5kZXggNDZhYzQ1ZDhiOGUwZGU3OGE2YjM2ZTRlMGU5MmQ2NDQ1 Y2E3MjM5Zi4uMTBhMTFmMTU1YWI3MjQxNjA2ZWNlZmMyNGUzOTk3NGQ3NGI2MjhiNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaEJvZHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hCb2R5LmNwcApAQCAtNDMsNyArNDMsNyBA QAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRpYyBSZWY8QmxvYj4gYmxvYkZyb21BcnJh eUJ1ZmZlcihBcnJheUJ1ZmZlciosIGNvbnN0IFN0cmluZyYpOworc3RhdGljIFJlZlB0cjxCbG9i PiBibG9iRnJvbUFycmF5QnVmZmVyKEFycmF5QnVmZmVyKiwgY29uc3QgU3RyaW5nJik7CiAKIEZl dGNoQm9keTo6RmV0Y2hCb2R5KFJlZjxCbG9iPiYmIGJsb2IpCiAgICAgOiBtX3R5cGUoVHlwZTo6 QmxvYikKQEAgLTE0MSw3ICsxNDEsNyBAQCB2b2lkIEZldGNoQm9keTo6Y29uc3VtZShGZXRjaEJv ZHlPd25lciYgb3duZXIsIENvbnN1bWVyOjpUeXBlIHR5cGUsIERlZmVycmVkV3JhcAogICAgIH0K IAogICAgIC8vIEZJWE1FOiBTdXBwb3J0IG90aGVyIHR5cGVzLgotICAgIHByb21pc2UucmVqZWN0 KDApOworICAgIHByb21pc2UucmVqZWN0PEV4Y2VwdGlvbkNvZGU+KDApOwogfQogCiAjaWYgRU5B QkxFKFNUUkVBTVNfQVBJKQpAQCAtMjAwLDcgKzIwMCw3IEBAIHZvaWQgRmV0Y2hCb2R5Ojpjb25z dW1lVGV4dChDb25zdW1lcjo6VHlwZSB0eXBlLCBEZWZlcnJlZFdyYXBwZXImIHByb21pc2UpCiAg ICAgICAgIHJldHVybjsKICAgICB9CiAgICAgU3RyaW5nIGNvbnRlbnRUeXBlID0gQmxvYjo6bm9y bWFsaXplZENvbnRlbnRUeXBlKGV4dHJhY3RNSU1FVHlwZUZyb21NZWRpYVR5cGUobV9taW1lVHlw ZSkpOwotICAgIHByb21pc2UucmVzb2x2ZShCbG9iOjpjcmVhdGUoZXh0cmFjdEZyb21UZXh0KCks IGNvbnRlbnRUeXBlKSk7CisgICAgcHJvbWlzZS5yZXNvbHZlPFJlZlB0cjxCbG9iPj4oQmxvYjo6 Y3JlYXRlKGV4dHJhY3RGcm9tVGV4dCgpLCBjb250ZW50VHlwZSkpOwogfQogCiBGZXRjaExvYWRl cjo6VHlwZSBGZXRjaEJvZHk6OmxvYWRpbmdUeXBlKENvbnN1bWVyOjpUeXBlIHR5cGUpCkBAIC0y MzYsNyArMjM2LDcgQEAgVmVjdG9yPHVpbnQ4X3Q+IEZldGNoQm9keTo6ZXh0cmFjdEZyb21UZXh0 KCkgY29uc3QKICAgICByZXR1cm4gdmFsdWU7CiB9CiAKLXN0YXRpYyBpbmxpbmUgUmVmPEJsb2I+ IGJsb2JGcm9tQXJyYXlCdWZmZXIoQXJyYXlCdWZmZXIqIGJ1ZmZlciwgY29uc3QgU3RyaW5nJiBj b250ZW50VHlwZSkKK3N0YXRpYyBpbmxpbmUgUmVmUHRyPEJsb2I+IGJsb2JGcm9tQXJyYXlCdWZm ZXIoQXJyYXlCdWZmZXIqIGJ1ZmZlciwgY29uc3QgU3RyaW5nJiBjb250ZW50VHlwZSkKIHsKICAg ICBpZiAoIWJ1ZmZlcikKICAgICAgICAgcmV0dXJuIEJsb2I6OmNyZWF0ZShWZWN0b3I8dWludDhf dD4oKSwgY29udGVudFR5cGUpOwpAQCAtMjU5LDcgKzI1OSw3IEBAIHZvaWQgRmV0Y2hCb2R5Ojpm dWxmaWxsVGV4dFByb21pc2UoRmV0Y2hCb2R5OjpDb25zdW1lcjo6VHlwZSB0eXBlLCBjb25zdCBT dHJpbmcmCiB2b2lkIEZldGNoQm9keTo6bG9hZGluZ0ZhaWxlZCgpCiB7CiAgICAgQVNTRVJUKG1f Y29uc3VtZXIpOwotICAgIG1fY29uc3VtZXItPnByb21pc2UucmVqZWN0KDApOworICAgIG1fY29u c3VtZXItPnByb21pc2UucmVqZWN0PEV4Y2VwdGlvbkNvZGU+KDApOwogICAgIG1fY29uc3VtZXIg PSBOdWxsb3B0OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNo L0ZldGNoQm9keS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaEJvZHkuaApp bmRleCA1NmYzZGZkYzg1NzFjMzE1MTEyZjI2NjVjNmZmZGE5NzVhOWRmMzkyLi4wNDYwMTBhMGZi OTJiMjY2ODUwZWVhNTI2YmVlMGVkNzZjZTE4OTIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2ZldGNoL0ZldGNoQm9keS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv ZmV0Y2gvRmV0Y2hCb2R5LmgKQEAgLTUzLDcgKzUzLDcgQEAgcHVibGljOgogICAgIHZvaWQgYmxv YihGZXRjaEJvZHlPd25lciYsIERlZmVycmVkV3JhcHBlciYmKTsKICAgICB2b2lkIGpzb24oRmV0 Y2hCb2R5T3duZXImLCBEZWZlcnJlZFdyYXBwZXImJik7CiAgICAgdm9pZCB0ZXh0KEZldGNoQm9k eU93bmVyJiwgRGVmZXJyZWRXcmFwcGVyJiYpOwotICAgIHZvaWQgZm9ybURhdGEoRmV0Y2hCb2R5 T3duZXImLCBEZWZlcnJlZFdyYXBwZXImJiBwcm9taXNlKSB7IHByb21pc2UucmVqZWN0KDApOyB9 CisgICAgdm9pZCBmb3JtRGF0YShGZXRjaEJvZHlPd25lciYsIERlZmVycmVkV3JhcHBlciYmIHBy b21pc2UpIHsgcHJvbWlzZS5yZWplY3Q8RXhjZXB0aW9uQ29kZT4oMCk7IH0KIAogI2lmIEVOQUJM RShTVFJFQU1TX0FQSSkKICAgICB2b2lkIGNvbnN1bWVBc1N0cmVhbShGZXRjaEJvZHlPd25lciYs IEZldGNoUmVzcG9uc2VTb3VyY2UmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvZmV0Y2gvRmV0Y2hCb2R5T3duZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRj aC9GZXRjaEJvZHlPd25lci5jcHAKaW5kZXggOTZjMDRjM2Q2MWQxMjlhYWYyMDU0MTc4ZWI2NzY5 MTcyZmRlNTRjZS4uY2FmNGFjOGI1Y2NhZDE0MzVjZThmYTY3MzYxNDI1NGJhMmU0OGM2OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaEJvZHlPd25lci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaEJvZHlPd25lci5jcHAKQEAg LTc1LDcgKzc1LDcgQEAgdm9pZCBGZXRjaEJvZHlPd25lcjo6YXJyYXlCdWZmZXIoRGVmZXJyZWRX cmFwcGVyJiYgcHJvbWlzZSkKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoaXNEaXN0 dXJiZWQoKSkgewotICAgICAgICBwcm9taXNlLnJlamVjdChUeXBlRXJyb3IpOworICAgICAgICBw cm9taXNlLnJlamVjdDxFeGNlcHRpb25Db2RlPihUeXBlRXJyb3IpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogICAgIG1faXNEaXN0dXJiZWQgPSB0cnVlOwpAQCAtODUsMTEgKzg1LDExIEBAIHZv aWQgRmV0Y2hCb2R5T3duZXI6OmFycmF5QnVmZmVyKERlZmVycmVkV3JhcHBlciYmIHByb21pc2Up CiB2b2lkIEZldGNoQm9keU93bmVyOjpibG9iKERlZmVycmVkV3JhcHBlciYmIHByb21pc2UpCiB7 CiAgICAgaWYgKG1fYm9keS5pc0VtcHR5KCkpIHsKLSAgICAgICAgcHJvbWlzZS5yZXNvbHZlKEJs b2I6OmNyZWF0ZSgpKTsKKyAgICAgICAgcHJvbWlzZS5yZXNvbHZlPFJlZlB0cjxCbG9iPj4oQmxv Yjo6Y3JlYXRlKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmIChpc0Rpc3R1cmJl ZCgpKSB7Ci0gICAgICAgIHByb21pc2UucmVqZWN0KFR5cGVFcnJvcik7CisgICAgICAgIHByb21p c2UucmVqZWN0PEV4Y2VwdGlvbkNvZGU+KFR5cGVFcnJvcik7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAgICAgbV9pc0Rpc3R1cmJlZCA9IHRydWU7CkBAIC05OSwxMSArOTksMTEgQEAgdm9pZCBG ZXRjaEJvZHlPd25lcjo6YmxvYihEZWZlcnJlZFdyYXBwZXImJiBwcm9taXNlKQogdm9pZCBGZXRj aEJvZHlPd25lcjo6Zm9ybURhdGEoRGVmZXJyZWRXcmFwcGVyJiYgcHJvbWlzZSkKIHsKICAgICBp ZiAobV9ib2R5LmlzRW1wdHkoKSkgewotICAgICAgICBwcm9taXNlLnJlamVjdCgwKTsKKyAgICAg ICAgcHJvbWlzZS5yZWplY3Q8RXhjZXB0aW9uQ29kZT4oMCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAgICAgaWYgKGlzRGlzdHVyYmVkKCkpIHsKLSAgICAgICAgcHJvbWlzZS5yZWplY3QoVHlw ZUVycm9yKTsKKyAgICAgICAgcHJvbWlzZS5yZWplY3Q8RXhjZXB0aW9uQ29kZT4oVHlwZUVycm9y KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBtX2lzRGlzdHVyYmVkID0gdHJ1ZTsKQEAg LTExMywxMSArMTEzLDExIEBAIHZvaWQgRmV0Y2hCb2R5T3duZXI6OmZvcm1EYXRhKERlZmVycmVk V3JhcHBlciYmIHByb21pc2UpCiB2b2lkIEZldGNoQm9keU93bmVyOjpqc29uKERlZmVycmVkV3Jh cHBlciYmIHByb21pc2UpCiB7CiAgICAgaWYgKG1fYm9keS5pc0VtcHR5KCkpIHsKLSAgICAgICAg cHJvbWlzZS5yZWplY3QoU1lOVEFYX0VSUik7CisgICAgICAgIHByb21pc2UucmVqZWN0PEV4Y2Vw dGlvbkNvZGU+KFNZTlRBWF9FUlIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmIChp c0Rpc3R1cmJlZCgpKSB7Ci0gICAgICAgIHByb21pc2UucmVqZWN0KFR5cGVFcnJvcik7CisgICAg ICAgIHByb21pc2UucmVqZWN0PEV4Y2VwdGlvbkNvZGU+KFR5cGVFcnJvcik7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAgICAgbV9pc0Rpc3R1cmJlZCA9IHRydWU7CkBAIC0xMzEsNyArMTMxLDcg QEAgdm9pZCBGZXRjaEJvZHlPd25lcjo6dGV4dChEZWZlcnJlZFdyYXBwZXImJiBwcm9taXNlKQog ICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmIChpc0Rpc3R1cmJlZCgpKSB7Ci0gICAgICAg IHByb21pc2UucmVqZWN0KFR5cGVFcnJvcik7CisgICAgICAgIHByb21pc2UucmVqZWN0PEV4Y2Vw dGlvbkNvZGU+KFR5cGVFcnJvcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgbV9pc0Rp c3R1cmJlZCA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNo L0ZldGNoUmVzcG9uc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJl c3BvbnNlLmNwcAppbmRleCA3YzliOWU2MDhhNWE4Y2I4YjcwNzZkZTZjOTg1ZDU2ZDRjZTE5YTg2 Li4zNWJlMjQzOTRmZTRhYzI1ZTAxN2QwMjU1ZmViNDVjZDg2MzhhODQwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoUmVzcG9uc2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hSZXNwb25zZS5jcHAKQEAgLTIxMyw3ICsyMTMs NyBAQCB2b2lkIEZldGNoUmVzcG9uc2U6OkJvZHlMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShj b25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNvdQogICAgIG1fcmVzcG9uc2UubV9yZXNwb25zZSA9 IHJlc291cmNlUmVzcG9uc2U7CiAgICAgbV9yZXNwb25zZS5tX2hlYWRlcnMtPmZpbHRlckFuZEZp bGwocmVzb3VyY2VSZXNwb25zZS5odHRwSGVhZGVyRmllbGRzKCksIEZldGNoSGVhZGVyczo6R3Vh cmQ6OlJlc3BvbnNlKTsKIAotICAgIHN0ZDo6ZXhjaGFuZ2UobV9wcm9taXNlLCBOdWxsb3B0KS0+ cmVzb2x2ZShtX3Jlc3BvbnNlKTsKKyAgICBzdGQ6OmV4Y2hhbmdlKG1fcHJvbWlzZSwgTnVsbG9w dCktPnJlc29sdmUoJm1fcmVzcG9uc2UpOwogfQogCiB2b2lkIEZldGNoUmVzcG9uc2U6OkJvZHlM b2FkZXI6OmRpZFJlY2VpdmVEYXRhKGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBzaXplKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJlc3BvbnNlLmggYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoUmVzcG9uc2UuaAppbmRleCBlZDI0NzEx M2IxOWZkYjYwMjhkNDZkMGU0OThjMTZjMmNhNzRhM2M2Li43ZTQ4YjAzYjA0MzU5YzdjZjAwNDYw ODc4Zjc0ZDliOTZiNjRmMzg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Zl dGNoL0ZldGNoUmVzcG9uc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0Zl dGNoUmVzcG9uc2UuaApAQCAtNTQsNyArNTQsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxG ZXRjaFJlc3BvbnNlPiBlcnJvcihTY3JpcHRFeGVjdXRpb25Db250ZXh0Jik7CiAgICAgc3RhdGlj IFJlZlB0cjxGZXRjaFJlc3BvbnNlPiByZWRpcmVjdChTY3JpcHRFeGVjdXRpb25Db250ZXh0Jiwg Y29uc3QgU3RyaW5nJiwgaW50LCBFeGNlcHRpb25Db2RlJik7CiAKLSAgICB1c2luZyBGZXRjaFBy b21pc2UgPSBET01Qcm9taXNlPEZldGNoUmVzcG9uc2U+OworICAgIHVzaW5nIEZldGNoUHJvbWlz ZSA9IERPTVByb21pc2U8UmVmUHRyPEZldGNoUmVzcG9uc2U+LCBFeGNlcHRpb25Db2RlPjsKICAg ICBzdGF0aWMgdm9pZCBmZXRjaChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgRmV0Y2hSZXF1ZXN0 JiwgY29uc3QgRGljdGlvbmFyeSYsIEZldGNoUHJvbWlzZSYmKTsKICAgICBzdGF0aWMgdm9pZCBm ZXRjaChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgY29uc3QgU3RyaW5nJiwgY29uc3QgRGljdGlv bmFyeSYsIEZldGNoUHJvbWlzZSYmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9NZWRpYURldmljZXMuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFEZXZpY2VzLmgKaW5kZXggYzQ4ZDg2MDg2ZmY0OTQ3YzQzNjE1YTA1 MDJiNTM4YzkxOTE5Y2Q2OS4uNzAyMjcyZGRiNjQ0MTAwMzQ1YzdjYTgyYTFiYTlmZmMyMTEyMzU3 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYURl dmljZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhRGV2 aWNlcy5oCkBAIC01OCw4ICs1OCw4IEBAIHB1YmxpYzoKIAogICAgIERvY3VtZW50KiBkb2N1bWVu dCgpIGNvbnN0OwogCi0gICAgdHlwZWRlZiBET01Qcm9taXNlPE1lZGlhU3RyZWFtPiBQcm9taXNl OwotICAgIHR5cGVkZWYgRE9NUHJvbWlzZTxNZWRpYURldmljZUluZm9WZWN0b3I+IEVudW1lcmF0 ZURldmljZXNQcm9taXNlOworICAgIHR5cGVkZWYgRE9NUHJvbWlzZTxSZWZQdHI8TWVkaWFTdHJl YW0+LCBSZWZQdHI8TmF2aWdhdG9yVXNlck1lZGlhRXJyb3I+PiBQcm9taXNlOworICAgIHR5cGVk ZWYgRE9NUHJvbWlzZTxNZWRpYURldmljZUluZm9WZWN0b3IsIEV4Y2VwdGlvbkNvZGU+IEVudW1l cmF0ZURldmljZXNQcm9taXNlOwogCiAgICAgdm9pZCBnZXRVc2VyTWVkaWEoY29uc3QgRGljdGlv bmFyeSYsIFByb21pc2UmJiwgRXhjZXB0aW9uQ29kZSYpIGNvbnN0OwogICAgIHZvaWQgZW51bWVy YXRlRGV2aWNlcyhFbnVtZXJhdGVEZXZpY2VzUHJvbWlzZSYmLCBFeGNlcHRpb25Db2RlJikgY29u c3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1BlZXJD b25uZWN0aW9uQmFja2VuZC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Q ZWVyQ29ubmVjdGlvbkJhY2tlbmQuaAppbmRleCBiZmZmNDRlODcyOTExZDA3N2MxM2JlYzE2ZDc2 YmU1MTIyNmNjNmU0Li41MGRlOTMwZDI0NTA5OTIzZDdkMjIxM2YxYjc2Y2Y3ZGUwNTdlZWVmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1BlZXJDb25uZWN0 aW9uQmFja2VuZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUGVl ckNvbm5lY3Rpb25CYWNrZW5kLmgKQEAgLTUzLDkgKzUzLDkgQEAgY2xhc3MgUlRDU3RhdHNSZXNw b25zZTsKIGNsYXNzIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ7CiAKIG5hbWVzcGFjZSBQZWVyQ29u bmVjdGlvbiB7Ci10eXBlZGVmIERPTVByb21pc2U8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBTZXNz aW9uRGVzY3JpcHRpb25Qcm9taXNlOwotdHlwZWRlZiBET01Qcm9taXNlPHN0ZDo6bnVsbHB0cl90 PiBWb2lkUHJvbWlzZTsKLXR5cGVkZWYgRE9NUHJvbWlzZTxSVENTdGF0c1Jlc3BvbnNlPiBTdGF0 c1Byb21pc2U7Cit0eXBlZGVmIERPTVByb21pc2U8UmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlv bj4sIFJlZlB0cjxET01FcnJvcj4+IFNlc3Npb25EZXNjcmlwdGlvblByb21pc2U7Cit0eXBlZGVm IERPTVByb21pc2U8c3RkOjpudWxscHRyX3QsIFJlZlB0cjxET01FcnJvcj4+IFZvaWRQcm9taXNl OwordHlwZWRlZiBET01Qcm9taXNlPFJlZlB0cjxSVENTdGF0c1Jlc3BvbnNlPiwgUmVmUHRyPERP TUVycm9yPj4gU3RhdHNQcm9taXNlOwogfQogCiBjbGFzcyBQZWVyQ29ubmVjdGlvbkJhY2tlbmRD bGllbnQgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9V c2VyTWVkaWFSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v VXNlck1lZGlhUmVxdWVzdC5jcHAKaW5kZXggOWNlNDE5ODRiODFkMDNlY2Y2ZmRlOWUwZWI2MWE2 MWVlYmI1MDc3My4uNzNiMTQ5YmUyYWY4ODZkNGRjNTk4YjY3YjJhZTQ1NzY4NGM1MjBmYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFSZXF1 ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1VzZXJNZWRp YVJlcXVlc3QuY3BwCkBAIC0xNzIsNyArMTcyLDcgQEAgdm9pZCBVc2VyTWVkaWFSZXF1ZXN0Ojpk aWRDcmVhdGVTdHJlYW0oUGFzc1JlZlB0cjxNZWRpYVN0cmVhbVByaXZhdGU+IHByaXZhdGVTdHIK ICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gNCAtIENyZWF0ZSB0aGUgTWVkaWFTdHJlYW0gYW5k IHBhc3MgaXQgdG8gdGhlIHN1Y2Nlc3MgY2FsbGJhY2suCi0gICAgUmVmPE1lZGlhU3RyZWFtPiBz dHJlYW0gPSBNZWRpYVN0cmVhbTo6Y3JlYXRlKCptX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIHBy aXZhdGVTdHJlYW0pOworICAgIFJlZlB0cjxNZWRpYVN0cmVhbT4gc3RyZWFtID0gTWVkaWFTdHJl YW06OmNyZWF0ZSgqbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LCBwcml2YXRlU3RyZWFtKTsKICAg ICBpZiAobV9hdWRpb0NvbnN0cmFpbnRzKSB7CiAgICAgICAgIGZvciAoYXV0byYgdHJhY2sgOiBz dHJlYW0tPmdldEF1ZGlvVHJhY2tzKCkpIHsKICAgICAgICAgICAgIHRyYWNrLT5hcHBseUNvbnN0 cmFpbnRzKCptX2F1ZGlvQ29uc3RyYWludHMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1Tb3VyY2UuaAppbmRleCAwODdiNDVjNGNjNzFi MjQ5N2VhZjhjM2I3MDhjY2I5ZmU5YjY2Njk0Li4wZmQxNmYzZTYxZmEwYjFjODgwZTcyYmFkMjky NTdjMGQ1ZGI1OTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMv UmVhZGFibGVTdHJlYW1Tb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVh bXMvUmVhZGFibGVTdHJlYW1Tb3VyY2UuaApAQCAtNDQsNyArNDQsNyBAQCBjbGFzcyBSZWFkYWJs ZVN0cmVhbVNvdXJjZSA6IHB1YmxpYyBSZWZDb3VudGVkPFJlYWRhYmxlU3RyZWFtU291cmNlPiB7 CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+UmVhZGFibGVTdHJlYW1Tb3VyY2UoKSB7IH0KIAotICAg IHR5cGVkZWYgRE9NUHJvbWlzZTxzdGQ6Om51bGxwdHJfdD4gUHJvbWlzZTsKKyAgICB0eXBlZGVm IERPTVByb21pc2U8c3RkOjpudWxscHRyX3QsIEV4Y2VwdGlvbkNvZGU+IFByb21pc2U7CiAKICAg ICB2b2lkIHN0YXJ0KFJlYWRhYmxlU3RyZWFtQ29udHJvbGxlciYmLCBQcm9taXNlJiYpOwogICAg IHZvaWQgY2FuY2VsKEpTQzo6SlNWYWx1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJhdWRpby9BdWRpb0NvbnRleHQuaAppbmRleCAxNmIyYjNjNDRkODIzMWUzZmM2NGFhMTVhMGFl NjJkYjBiMzc4NDg0Li44NThmNjQ3YWZmNzdkYmIyNTM4NjZmZTA5MjJhNTVkNGRiYWZjNWU3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmgKQEAg LTEwOSw3ICsxMDksNyBAQCBwdWJsaWM6CiAgICAgdXNpbmcgQWN0aXZlRE9NT2JqZWN0OjpzdXNw ZW5kOwogICAgIHVzaW5nIEFjdGl2ZURPTU9iamVjdDo6cmVzdW1lOwogCi0gICAgdHlwZWRlZiBE T01Qcm9taXNlPHN0ZDo6bnVsbHB0cl90PiBQcm9taXNlOworICAgIHR5cGVkZWYgRE9NUHJvbWlz ZTxzdGQ6Om51bGxwdHJfdCwgRXhjZXB0aW9uQ29kZT4gUHJvbWlzZTsKIAogICAgIHZvaWQgc3Vz cGVuZChQcm9taXNlJiYpOwogICAgIHZvaWQgcmVzdW1lKFByb21pc2UmJik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCmluZGV4IDFmZTY5NWFkOTQxMjNiYTQyNDRl ZTlkMjU4YjAzOThmNjA2MmNmOTguLjA2Y2U0NzQ3NjU5MzliNjI4MzM5MDNmOTYwNWViNGFhMTZh NTAzMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGlu Zy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCkBAIC0y NTEsOCArMjUxLDcgQEAgSlNDOjpKU09iamVjdCogdG9KU1NlcXVlbmNlKEpTQzo6RXhlY1N0YXRl KiwgSlNDOjpKU1ZhbHVlLCB1bnNpZ25lZCYgbGVuZ3RoKTsKIEpTQzo6SlNWYWx1ZSB0b0pTKEpT Qzo6RXhlY1N0YXRlKiwgSlNET01HbG9iYWxPYmplY3QqLCBKU0M6OkFycmF5QnVmZmVyKik7CiBK U0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNTdGF0ZSosIEpTRE9NR2xvYmFsT2JqZWN0KiwgSlND OjpBcnJheUJ1ZmZlclZpZXcqKTsKIEpTQzo6SlNWYWx1ZSB0b0pTKEpTQzo6RXhlY1N0YXRlKiwg SlNDOjpKU0dsb2JhbE9iamVjdCosIEpTQzo6QXJyYXlCdWZmZXJWaWV3Kik7Ci10ZW1wbGF0ZTx0 eXBlbmFtZSBUPiBKU0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNTdGF0ZSosIEpTRE9NR2xvYmFs T2JqZWN0KiwgUmVmUHRyPFQ+Jik7Ci10ZW1wbGF0ZTx0eXBlbmFtZSBUPiBKU0M6OkpTVmFsdWUg dG9KUyhKU0M6OkV4ZWNTdGF0ZSosIEpTRE9NR2xvYmFsT2JqZWN0KiwgUmVmUHRyPFQ+JiYpOwor dGVtcGxhdGU8dHlwZW5hbWUgVD4gSlNDOjpKU1ZhbHVlIHRvSlMoSlNDOjpFeGVjU3RhdGUqLCBK U0RPTUdsb2JhbE9iamVjdCosIFJlZlB0cjxUPik7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBKU0M6 OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNTdGF0ZSosIEpTRE9NR2xvYmFsT2JqZWN0KiwgUGFzc1Jl ZlB0cjxUPik7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBKU0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4 ZWNTdGF0ZSosIEpTRE9NR2xvYmFsT2JqZWN0KiwgY29uc3QgVmVjdG9yPFQ+Jik7CiB0ZW1wbGF0 ZTx0eXBlbmFtZSBUPiBKU0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNTdGF0ZSosIEpTRE9NR2xv YmFsT2JqZWN0KiwgY29uc3QgVmVjdG9yPFJlZlB0cjxUPj4mKTsKQEAgLTI2OCw3ICsyNjcsNyBA QCB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHk+IEpTQzo6SlNWYWx1 ZSBqc0FycmF5KEpTQzo6RXhlY1N0YXRlKgogV0VCQ09SRV9FWFBPUlQgSlNDOjpKU1ZhbHVlIGpz QXJyYXkoSlNDOjpFeGVjU3RhdGUqLCBKU0RPTUdsb2JhbE9iamVjdCosIFBhc3NSZWZQdHI8RE9N U3RyaW5nTGlzdD4pOwogCiBKU0M6OkpTVmFsdWUganNQYWlyKEpTQzo6RXhlY1N0YXRlJiwgSlNE T01HbG9iYWxPYmplY3QqLCBKU0M6OkpTVmFsdWUsIEpTQzo6SlNWYWx1ZSk7Ci10ZW1wbGF0ZTx0 eXBlbmFtZSBGaXJzdFR5cGUsIHR5cGVuYW1lIFNlY29uZFR5cGU+IEpTQzo6SlNWYWx1ZSBqc1Bh aXIoSlNDOjpFeGVjU3RhdGUmLCBKU0RPTUdsb2JhbE9iamVjdCosIEZpcnN0VHlwZSYsIFNlY29u ZFR5cGUmKTsKK3RlbXBsYXRlPHR5cGVuYW1lIEZpcnN0VHlwZSwgdHlwZW5hbWUgU2Vjb25kVHlw ZT4gSlNDOjpKU1ZhbHVlIGpzUGFpcihKU0M6OkV4ZWNTdGF0ZSYsIEpTRE9NR2xvYmFsT2JqZWN0 KiwgY29uc3QgRmlyc3RUeXBlJiwgY29uc3QgU2Vjb25kVHlwZSYpOwogCiBSZWZQdHI8SlNDOjpB cnJheUJ1ZmZlclZpZXc+IHRvQXJyYXlCdWZmZXJWaWV3KEpTQzo6SlNWYWx1ZSk7CiBSZWZQdHI8 SlNDOjpJbnQ4QXJyYXk+IHRvSW50OEFycmF5KEpTQzo6SlNWYWx1ZSk7CkBAIC01NDEsMTIgKzU0 MCw3IEBAIGlubGluZSBKU0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlND OjpKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0CiAgICAgcmV0dXJuIHZpZXctPndyYXAoZXhl YywgZ2xvYmFsT2JqZWN0KTsKIH0KIAotdGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIEpTQzo6 SlNWYWx1ZSB0b0pTKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0LCBSZWZQdHI8VD4mIHB0cikKLXsKLSAgICByZXR1cm4gdG9KUyhleGVjLCBnbG9i YWxPYmplY3QsIHB0ci5nZXQoKSk7Ci19Ci0KLXRlbXBsYXRlPHR5cGVuYW1lIFQ+IGlubGluZSBK U0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3Qq IGdsb2JhbE9iamVjdCwgUmVmUHRyPFQ+JiYgcHRyKQordGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5s aW5lIEpTQzo6SlNWYWx1ZSB0b0pTKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0LCBSZWZQdHI8VD4gcHRyKQogewogICAgIHJldHVybiB0b0pTKGV4 ZWMsIGdsb2JhbE9iamVjdCwgcHRyLmdldCgpKTsKIH0KQEAgLTY1MCw3ICs2NDQsNyBAQCBpbmxp bmUgSlNDOjpKU1ZhbHVlIGpzUGFpcihKU0M6OkV4ZWNTdGF0ZSYgc3RhdGUsIEpTRE9NR2xvYmFs T2JqZWN0KiBnbG9iYWxPYmplYwogICAgIHJldHVybiBjb25zdHJ1Y3RBcnJheSgmc3RhdGUsIDAs IGdsb2JhbE9iamVjdCwgYXJncyk7CiB9CiAKLXRlbXBsYXRlPHR5cGVuYW1lIEZpcnN0VHlwZSwg dHlwZW5hbWUgU2Vjb25kVHlwZT4gaW5saW5lIEpTQzo6SlNWYWx1ZSBqc1BhaXIoSlNDOjpFeGVj U3RhdGUmIHN0YXRlLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBGaXJzdFR5cGUm IHZhbHVlMSwgU2Vjb25kVHlwZSYgdmFsdWUyKQordGVtcGxhdGU8dHlwZW5hbWUgRmlyc3RUeXBl LCB0eXBlbmFtZSBTZWNvbmRUeXBlPiBpbmxpbmUgSlNDOjpKU1ZhbHVlIGpzUGFpcihKU0M6OkV4 ZWNTdGF0ZSYgc3RhdGUsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIGNvbnN0IEZp cnN0VHlwZSYgdmFsdWUxLCBjb25zdCBTZWNvbmRUeXBlJiB2YWx1ZTIpCiB7CiAgICAgcmV0dXJu IGpzUGFpcihzdGF0ZSwgZ2xvYmFsT2JqZWN0LCB0b0pTKCZzdGF0ZSwgZ2xvYmFsT2JqZWN0LCB2 YWx1ZTEpLCB0b0pTKCZzdGF0ZSwgZ2xvYmFsT2JqZWN0LCB2YWx1ZTIpKTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NUHJvbWlzZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVByb21pc2UuY3BwCmluZGV4IGEyMTRiODdiYzY5OGU5 NTAwODQ4MjgzZjBmNzdkYjYwMzUyYTI0NjkuLjg5NmY4NDk0MzViMmE0OTAyZGE3ZjJkMTdlZjdj ZjY3NDNhNjFmMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9N UHJvbWlzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01Qcm9taXNl LmNwcApAQCAtODgsNyArODgsNyBAQCB2b2lkIGZ1bGZpbGxQcm9taXNlV2l0aEpTT04oRGVmZXJy ZWRXcmFwcGVyJiBwcm9taXNlLCBjb25zdCBTdHJpbmcmIGRhdGEpCiB7CiAgICAgSlNDOjpKU1Zh bHVlIHZhbHVlID0gcGFyc2VBc0pTT04ocHJvbWlzZS5nbG9iYWxPYmplY3QoKS5nbG9iYWxFeGVj KCksIGRhdGEpOwogICAgIGlmICghdmFsdWUpCi0gICAgICAgIHByb21pc2UucmVqZWN0KFNZTlRB WF9FUlIpOworICAgICAgICBwcm9taXNlLnJlamVjdDxFeGNlcHRpb25Db2RlPihTWU5UQVhfRVJS KTsKICAgICBlbHNlCiAgICAgICAgIHByb21pc2UucmVzb2x2ZSh2YWx1ZSk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVByb21pc2UuaCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NUHJvbWlzZS5oCmluZGV4IGMxM2NhNWZiOTcwNWU4OWUz MTA0Y2IzNjE1YzllZjA5NWE2OGQ2Y2EuLmZiNTFiNzIyN2YxZjEyOTFhMDY3Mzk1ZDkwY2IyZDA4 NjU3NjFjMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NUHJv bWlzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NUHJvbWlzZS5oCkBA IC0zMyw4OSArMzMsMTUgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi10ZW1wbGF0ZTx0eXBl bmFtZSBET01DbGFzcz4KLXN0cnVjdCBUeXBlSW5zcGVjdG9yIHsKLXByaXZhdGU6Ci0gICAgdGVt cGxhdGU8dHlwZW5hbWUgVD4gc3RhdGljIGNvbnN0ZXhwciBhdXRvIHRlc3RJc1ZlY3RvcihpbnQp IC0+IGRlY2x0eXBlKHN0ZDo6ZGVjbHZhbDxUPigpLnNocmlua1RvRml0KCksIGJvb2woKSkgeyBy ZXR1cm4gdHJ1ZTsgfQotICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0YXRpYyBjb25zdGV4cHIg Ym9vbCB0ZXN0SXNWZWN0b3IoLi4uKSB7IHJldHVybiBmYWxzZTsgfQotCi0gICAgdGVtcGxhdGU8 dHlwZW5hbWUgVD4gc3RhdGljIGNvbnN0ZXhwciBhdXRvIHRlc3RJc1JlZk9yUmVmUHRyKGludCkg LT4gZGVjbHR5cGUoc3RkOjpkZWNsdmFsPFQ+KCkubGVha1JlZigpLCBib29sKCkpIHsgcmV0dXJu IHRydWU7IH0KLSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdGF0aWMgY29uc3RleHByIGJvb2wg dGVzdElzUmVmT3JSZWZQdHIoLi4uKSB7IHJldHVybiBmYWxzZTsgfQotCi1wdWJsaWM6Ci0gICAg c3RhdGljIGNvbnN0ZXhwciBib29sIGlzUmVmT3JSZWZQdHIgPSB0ZXN0SXNSZWZPclJlZlB0cjxE T01DbGFzcz4oMCk7Ci0gICAgc3RhdGljIGNvbnN0ZXhwciBib29sIGlzUGFzc0J5VmFsdWVUeXBl ID0gc3RkOjppc19wb2ludGVyPERPTUNsYXNzPjo6dmFsdWUKLSAgICAgICAgfHwgc3RkOjppc19z YW1lPERPTUNsYXNzLCBzdGQ6Om51bGxwdHJfdD46OnZhbHVlCi0gICAgICAgIHx8IHN0ZDo6aXNf c2FtZTxET01DbGFzcywgSlNDOjpKU1ZhbHVlPjo6dmFsdWUKLSAgICAgICAgfHwgc3RkOjppc19z YW1lPERPTUNsYXNzLCBib29sPjo6dmFsdWU7Ci0gICAgc3RhdGljIGNvbnN0ZXhwciBib29sIGlz UGFzc0J5Q29uc3RSZWZUeXBlID0gdGVzdElzVmVjdG9yPERPTUNsYXNzPigwKSAKLSAgICAgICAg fHwgc3RkOjppc19zYW1lPERPTUNsYXNzLCBTdHJpbmc+Ojp2YWx1ZTsKLX07Ci0KLXRlbXBsYXRl PHR5cGVuYW1lIERPTUNsYXNzLCB0eXBlbmFtZSBFbmFibGUgPSB2b2lkPgotc3RydWN0IFByb21p c2VSZXN1bHRJbnNwZWN0b3IgewotcHVibGljOgotICAgIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBw YXNzQnlWYWx1ZSA9IGZhbHNlOwotICAgIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBwYXNzQnlSZWYg PSB0cnVlOwotICAgIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBwYXNzQnlVUmVmID0gZmFsc2U7Ci0g ICAgc3RhdGljIGNvbnN0ZXhwciBib29sIHBhc3NCeUNvbnN0UmVmID0gZmFsc2U7Ci0KLSAgICB0 eXBlZGVmIERPTUNsYXNzJiBUeXBlOwotfTsKLQotdGVtcGxhdGU8dHlwZW5hbWUgRE9NQ2xhc3M+ Ci1zdHJ1Y3QgUHJvbWlzZVJlc3VsdEluc3BlY3RvcjxET01DbGFzcywgdHlwZW5hbWUgc3RkOjpl bmFibGVfaWY8VHlwZUluc3BlY3RvcjxET01DbGFzcz46OmlzUGFzc0J5VmFsdWVUeXBlPjo6dHlw ZT4gewotcHVibGljOgotICAgIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBwYXNzQnlWYWx1ZSA9IHRy dWU7Ci0gICAgc3RhdGljIGNvbnN0ZXhwciBib29sIHBhc3NCeVJlZiA9IGZhbHNlOwotICAgIHN0 YXRpYyBjb25zdGV4cHIgYm9vbCBwYXNzQnlVUmVmID0gZmFsc2U7Ci0gICAgc3RhdGljIGNvbnN0 ZXhwciBib29sIHBhc3NCeUNvbnN0UmVmID0gZmFsc2U7Ci0KLSAgICB0eXBlZGVmIERPTUNsYXNz IFR5cGU7Ci19OwotCi10ZW1wbGF0ZTx0eXBlbmFtZSBET01DbGFzcz4KLXN0cnVjdCBQcm9taXNl UmVzdWx0SW5zcGVjdG9yPERPTUNsYXNzLCB0eXBlbmFtZSBzdGQ6OmVuYWJsZV9pZjxUeXBlSW5z cGVjdG9yPERPTUNsYXNzPjo6aXNQYXNzQnlDb25zdFJlZlR5cGU+Ojp0eXBlPiB7Ci1wdWJsaWM6 Ci0gICAgc3RhdGljIGNvbnN0ZXhwciBib29sIHBhc3NCeVZhbHVlID0gZmFsc2U7Ci0gICAgc3Rh dGljIGNvbnN0ZXhwciBib29sIHBhc3NCeVJlZiA9IGZhbHNlOwotICAgIHN0YXRpYyBjb25zdGV4 cHIgYm9vbCBwYXNzQnlVUmVmID0gZmFsc2U7Ci0gICAgc3RhdGljIGNvbnN0ZXhwciBib29sIHBh c3NCeUNvbnN0UmVmID0gdHJ1ZTsKLQotICAgIHR5cGVkZWYgY29uc3QgRE9NQ2xhc3MmIFR5cGU7 Ci19OwotCi10ZW1wbGF0ZTx0eXBlbmFtZSBET01DbGFzcz4KLXN0cnVjdCBQcm9taXNlUmVzdWx0 SW5zcGVjdG9yPERPTUNsYXNzLCB0eXBlbmFtZSBzdGQ6OmVuYWJsZV9pZjxUeXBlSW5zcGVjdG9y PERPTUNsYXNzPjo6aXNSZWZPclJlZlB0cj46OnR5cGU+IHsKLSAgICBzdGF0aWMgY29uc3RleHBy IGJvb2wgcGFzc0J5VmFsdWUgPSBmYWxzZTsKLSAgICBzdGF0aWMgY29uc3RleHByIGJvb2wgcGFz c0J5UmVmID0gZmFsc2U7Ci0gICAgc3RhdGljIGNvbnN0ZXhwciBib29sIHBhc3NCeVVSZWYgPSB0 cnVlOwotICAgIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBwYXNzQnlDb25zdFJlZiA9IGZhbHNlOwot fTsKLQogY2xhc3MgRGVmZXJyZWRXcmFwcGVyIHsKIHB1YmxpYzoKICAgICBEZWZlcnJlZFdyYXBw ZXIoSlNDOjpFeGVjU3RhdGUqLCBKU0RPTUdsb2JhbE9iamVjdCosIEpTQzo6SlNQcm9taXNlRGVm ZXJyZWQqKTsKIAotICAgIHRlbXBsYXRlPGNsYXNzIFJlc29sdmVSZXN1bHRUeXBlPiB0eXBlbmFt ZSBzdGQ6OmVuYWJsZV9pZjxQcm9taXNlUmVzdWx0SW5zcGVjdG9yPFJlc29sdmVSZXN1bHRUeXBl Pjo6cGFzc0J5VmFsdWUsIHZvaWQ+Ojp0eXBlCi0gICAgcmVzb2x2ZShSZXNvbHZlUmVzdWx0VHlw ZSByZXN1bHQpIHsgcmVzb2x2ZVdpdGhWYWx1ZShyZXN1bHQpOyB9Ci0gICAgdGVtcGxhdGU8Y2xh c3MgUmVzb2x2ZVJlc3VsdFR5cGU+IHR5cGVuYW1lIHN0ZDo6ZW5hYmxlX2lmPFByb21pc2VSZXN1 bHRJbnNwZWN0b3I8UmVzb2x2ZVJlc3VsdFR5cGU+OjpwYXNzQnlSZWYsIHZvaWQ+Ojp0eXBlCi0g ICAgcmVzb2x2ZShSZXNvbHZlUmVzdWx0VHlwZSYgcmVzdWx0KSB7IHJlc29sdmVXaXRoVmFsdWUo cmVzdWx0KTsgfQotICAgIHRlbXBsYXRlPGNsYXNzIFJlc29sdmVSZXN1bHRUeXBlPiB0eXBlbmFt ZSBzdGQ6OmVuYWJsZV9pZjxQcm9taXNlUmVzdWx0SW5zcGVjdG9yPFJlc29sdmVSZXN1bHRUeXBl Pjo6cGFzc0J5VVJlZiwgdm9pZD46OnR5cGUKLSAgICByZXNvbHZlKFJlc29sdmVSZXN1bHRUeXBl JiYgcmVzdWx0KSB7IHJlc29sdmVXaXRoVmFsdWUoc3RkOjpmb3J3YXJkPFJlc29sdmVSZXN1bHRU eXBlPihyZXN1bHQpKTsgfQotICAgIHRlbXBsYXRlPGNsYXNzIFJlc29sdmVSZXN1bHRUeXBlPiB0 eXBlbmFtZSBzdGQ6OmVuYWJsZV9pZjxQcm9taXNlUmVzdWx0SW5zcGVjdG9yPFJlc29sdmVSZXN1 bHRUeXBlPjo6cGFzc0J5Q29uc3RSZWYsIHZvaWQ+Ojp0eXBlCi0gICAgcmVzb2x2ZShjb25zdCBS ZXNvbHZlUmVzdWx0VHlwZSYgcmVzdWx0KSB7IHJlc29sdmVXaXRoVmFsdWUocmVzdWx0KTsgfQot Ci0gICAgdGVtcGxhdGU8Y2xhc3MgUmVqZWN0UmVzdWx0VHlwZT4gdHlwZW5hbWUgc3RkOjplbmFi bGVfaWY8UHJvbWlzZVJlc3VsdEluc3BlY3RvcjxSZWplY3RSZXN1bHRUeXBlPjo6cGFzc0J5VmFs dWUsIHZvaWQ+Ojp0eXBlCi0gICAgcmVqZWN0KFJlamVjdFJlc3VsdFR5cGUgcmVzdWx0KSB7IHJl amVjdFdpdGhWYWx1ZShyZXN1bHQpOyB9Ci0gICAgdGVtcGxhdGU8Y2xhc3MgUmVqZWN0UmVzdWx0 VHlwZT4gdHlwZW5hbWUgc3RkOjplbmFibGVfaWY8UHJvbWlzZVJlc3VsdEluc3BlY3RvcjxSZWpl Y3RSZXN1bHRUeXBlPjo6cGFzc0J5UmVmLCB2b2lkPjo6dHlwZQotICAgIHJlamVjdChSZWplY3RS ZXN1bHRUeXBlJiByZXN1bHQpIHsgcmVqZWN0V2l0aFZhbHVlKHJlc3VsdCk7IH0KLSAgICB0ZW1w bGF0ZTxjbGFzcyBSZWplY3RSZXN1bHRUeXBlPiB0eXBlbmFtZSBzdGQ6OmVuYWJsZV9pZjxQcm9t aXNlUmVzdWx0SW5zcGVjdG9yPFJlamVjdFJlc3VsdFR5cGU+OjpwYXNzQnlVUmVmLCB2b2lkPjo6 dHlwZQotICAgIHJlamVjdChSZWplY3RSZXN1bHRUeXBlJiYgcmVzdWx0KSB7IHJlamVjdFdpdGhW YWx1ZShzdGQ6OmZvcndhcmQ8UmVqZWN0UmVzdWx0VHlwZT4ocmVzdWx0KSk7IH0KLSAgICB0ZW1w bGF0ZTxjbGFzcyBSZWplY3RSZXN1bHRUeXBlPiB0eXBlbmFtZSBzdGQ6OmVuYWJsZV9pZjxQcm9t aXNlUmVzdWx0SW5zcGVjdG9yPFJlamVjdFJlc3VsdFR5cGU+OjpwYXNzQnlDb25zdFJlZiwgdm9p ZD46OnR5cGUKLSAgICByZWplY3QoY29uc3QgUmVqZWN0UmVzdWx0VHlwZSYgcmVzdWx0KSB7IHJl amVjdFdpdGhWYWx1ZShyZXN1bHQpOyB9CisgICAgdGVtcGxhdGU8Y2xhc3MgUmVzb2x2ZVJlc3Vs dFR5cGU+CisgICAgdm9pZCByZXNvbHZlKGNvbnN0IFJlc29sdmVSZXN1bHRUeXBlJik7CiAKLSAg ICB2b2lkIHJlamVjdChFeGNlcHRpb25Db2RlKTsKKyAgICB0ZW1wbGF0ZTxjbGFzcyBSZWplY3RS ZXN1bHRUeXBlPgorICAgIHZvaWQgcmVqZWN0KGNvbnN0IFJlamVjdFJlc3VsdFR5cGUmKTsKIAog ICAgIEpTRE9NR2xvYmFsT2JqZWN0JiBnbG9iYWxPYmplY3QoKSBjb25zdDsKICAgICBKU0M6OkpT VmFsdWUgcHJvbWlzZSgpIGNvbnN0OwpAQCAtMTI1LDkgKzUxLDYgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHJlc29sdmUoSlNDOjpFeGVjU3RhdGUmIHN0YXRlLCBKU0M6OkpTVmFsdWUgcmVzb2x1dGlv bikgeyBjYWxsRnVuY3Rpb24oc3RhdGUsIG1fZGVmZXJyZWQtPnJlc29sdmUoKSwgcmVzb2x1dGlv bik7IH0KICAgICB2b2lkIHJlamVjdChKU0M6OkV4ZWNTdGF0ZSYgc3RhdGUsIEpTQzo6SlNWYWx1 ZSByZXNvbHV0aW9uKSB7IGNhbGxGdW5jdGlvbihzdGF0ZSwgbV9kZWZlcnJlZC0+cmVqZWN0KCks IHJlc29sdXRpb24pOyB9CiAKLSAgICB0ZW1wbGF0ZTxjbGFzcyBSZWplY3RSZXN1bHRUeXBlPiB2 b2lkIHJlamVjdFdpdGhWYWx1ZShSZWplY3RSZXN1bHRUeXBlJiYpOwotICAgIHRlbXBsYXRlPGNs YXNzIFJlc29sdmVSZXN1bHRUeXBlPiB2b2lkIHJlc29sdmVXaXRoVmFsdWUoUmVzb2x2ZVJlc3Vs dFR5cGUmJik7Ci0KICAgICBKU0M6OlN0cm9uZzxKU0RPTUdsb2JhbE9iamVjdD4gbV9nbG9iYWxP YmplY3Q7CiAgICAgSlNDOjpTdHJvbmc8SlNDOjpKU1Byb21pc2VEZWZlcnJlZD4gbV9kZWZlcnJl ZDsKIH07CkBAIC0xNDgsNyArNzEsNyBAQCBpbmxpbmUgSlNDOjpKU1ZhbHVlIGNhbGxQcm9taXNl RnVuY3Rpb24oSlNDOjpFeGVjU3RhdGUmIHN0YXRlLCBKU0M6OkVuY29kZWRKU1ZhbAogICAgIHJl dHVybiBwcm9taXNlRGVmZXJyZWQucHJvbWlzZSgpOwogfQogCi10ZW1wbGF0ZSA8dHlwZW5hbWUg VmFsdWU+Cit0ZW1wbGF0ZSA8dHlwZW5hbWUgVmFsdWUsIHR5cGVuYW1lIEVycm9yPgogY2xhc3Mg RE9NUHJvbWlzZSB7CiBwdWJsaWM6CiAgICAgRE9NUHJvbWlzZShEZWZlcnJlZFdyYXBwZXImJiB3 cmFwcGVyKSA6IG1fd3JhcHBlcihXVEZNb3ZlKHdyYXBwZXIpKSB7IH0KQEAgLTE1NywxMDUgKzgw LDEwNSBAQCBwdWJsaWM6CiAgICAgRE9NUHJvbWlzZShjb25zdCBET01Qcm9taXNlJikgPSBkZWZh dWx0OwogICAgIERPTVByb21pc2UmIG9wZXJhdG9yPShET01Qcm9taXNlIGNvbnN0JikgPSBkZWZh dWx0OwogCi0gICAgdm9pZCByZXNvbHZlKHR5cGVuYW1lIFByb21pc2VSZXN1bHRJbnNwZWN0b3I8 VmFsdWU+OjpUeXBlIHZhbHVlKSB7IG1fd3JhcHBlci5yZXNvbHZlKHZhbHVlKTsgfQotCi0gICAg dGVtcGxhdGU8dHlwZW5hbWUgRXJyb3JUeXBlPiB2b2lkIHJlamVjdChFcnJvclR5cGUmJiBlcnJv cikgeyBtX3dyYXBwZXIucmVqZWN0KHN0ZDo6Zm9yd2FyZDxFcnJvclR5cGU+KGVycm9yKSk7IH0K KyAgICB2b2lkIHJlc29sdmUoY29uc3QgVmFsdWUmIHZhbHVlKSB7IG1fd3JhcHBlci5yZXNvbHZl PFZhbHVlPih2YWx1ZSk7IH0KKyAgICB2b2lkIHJlamVjdChjb25zdCBFcnJvciYgZXJyb3IpIHsg bV93cmFwcGVyLnJlamVjdDxFcnJvcj4oZXJyb3IpOyB9CiAKIHByaXZhdGU6CiAgICAgRGVmZXJy ZWRXcmFwcGVyIG1fd3JhcHBlcjsKIH07CiAKLWlubGluZSB2b2lkIERlZmVycmVkV3JhcHBlcjo6 cmVqZWN0KEV4Y2VwdGlvbkNvZGUgZWMpCit0ZW1wbGF0ZTxjbGFzcyBSZXNvbHZlUmVzdWx0VHlw ZT4KK2lubGluZSB2b2lkIERlZmVycmVkV3JhcHBlcjo6cmVzb2x2ZShjb25zdCBSZXNvbHZlUmVz dWx0VHlwZSYgcmVzdWx0KQogewogICAgIEFTU0VSVChtX2RlZmVycmVkKTsKICAgICBBU1NFUlQo bV9nbG9iYWxPYmplY3QpOwogICAgIEpTQzo6RXhlY1N0YXRlKiBleGVjID0gbV9nbG9iYWxPYmpl Y3QtPmdsb2JhbEV4ZWMoKTsKICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrZXIoZXhlYyk7Ci0g ICAgcmVqZWN0KCpleGVjLCBjcmVhdGVET01FeGNlcHRpb24oZXhlYywgZWMpKTsKKyAgICByZXNv bHZlKCpleGVjLCB0b0pTKGV4ZWMsIG1fZ2xvYmFsT2JqZWN0LmdldCgpLCByZXN1bHQpKTsKIH0K IAotdGVtcGxhdGU8Y2xhc3MgUmVzb2x2ZVJlc3VsdFR5cGU+Ci1pbmxpbmUgdm9pZCBEZWZlcnJl ZFdyYXBwZXI6OnJlc29sdmVXaXRoVmFsdWUoUmVzb2x2ZVJlc3VsdFR5cGUmJiByZXN1bHQpCit0 ZW1wbGF0ZTxjbGFzcyBSZWplY3RSZXN1bHRUeXBlPgoraW5saW5lIHZvaWQgRGVmZXJyZWRXcmFw cGVyOjpyZWplY3QoY29uc3QgUmVqZWN0UmVzdWx0VHlwZSYgcmVzdWx0KQogewogICAgIEFTU0VS VChtX2RlZmVycmVkKTsKICAgICBBU1NFUlQobV9nbG9iYWxPYmplY3QpOwogICAgIEpTQzo6RXhl Y1N0YXRlKiBleGVjID0gbV9nbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKTsKICAgICBKU0M6OkpT TG9ja0hvbGRlciBsb2NrZXIoZXhlYyk7Ci0gICAgcmVzb2x2ZSgqZXhlYywgdG9KUyhleGVjLCBt X2dsb2JhbE9iamVjdC5nZXQoKSwgc3RkOjpmb3J3YXJkPFJlc29sdmVSZXN1bHRUeXBlPihyZXN1 bHQpKSk7CisgICAgcmVqZWN0KCpleGVjLCB0b0pTKGV4ZWMsIG1fZ2xvYmFsT2JqZWN0LmdldCgp LCByZXN1bHQpKTsKIH0KIAotdGVtcGxhdGU8Y2xhc3MgUmVqZWN0UmVzdWx0VHlwZT4KLWlubGlu ZSB2b2lkIERlZmVycmVkV3JhcHBlcjo6cmVqZWN0V2l0aFZhbHVlKFJlamVjdFJlc3VsdFR5cGUm JiByZXN1bHQpCit0ZW1wbGF0ZTw+CitpbmxpbmUgdm9pZCBEZWZlcnJlZFdyYXBwZXI6OnJlamVj dChjb25zdCBzdGQ6Om51bGxwdHJfdCYpCiB7CiAgICAgQVNTRVJUKG1fZGVmZXJyZWQpOwogICAg IEFTU0VSVChtX2dsb2JhbE9iamVjdCk7CiAgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSBtX2ds b2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwogICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2tlcihl eGVjKTsKLSAgICByZWplY3QoKmV4ZWMsIHRvSlMoZXhlYywgbV9nbG9iYWxPYmplY3QuZ2V0KCks IHN0ZDo6Zm9yd2FyZDxSZWplY3RSZXN1bHRUeXBlPihyZXN1bHQpKSk7CisgICAgcmVqZWN0KCpl eGVjLCBKU0M6OmpzTnVsbCgpKTsKIH0KIAogdGVtcGxhdGU8PgotaW5saW5lIHZvaWQgRGVmZXJy ZWRXcmFwcGVyOjpyZXNvbHZlKGJvb2wgcmVzdWx0KQoraW5saW5lIHZvaWQgRGVmZXJyZWRXcmFw cGVyOjpyZWplY3QoY29uc3QgSlNDOjpKU1ZhbHVlJiB2YWx1ZSkKIHsKICAgICBBU1NFUlQobV9k ZWZlcnJlZCk7CiAgICAgQVNTRVJUKG1fZ2xvYmFsT2JqZWN0KTsKICAgICBKU0M6OkV4ZWNTdGF0 ZSogZXhlYyA9IG1fZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAgICAgSlNDOjpKU0xvY2tI b2xkZXIgbG9ja2VyKGV4ZWMpOwotICAgIHJlc29sdmUoKmV4ZWMsIEpTQzo6anNCb29sZWFuKHJl c3VsdCkpOworICAgIHJlamVjdCgqZXhlYywgdmFsdWUpOwogfQogCiB0ZW1wbGF0ZTw+Ci1pbmxp bmUgdm9pZCBEZWZlcnJlZFdyYXBwZXI6OnJlc29sdmUoSlNDOjpKU1ZhbHVlIHZhbHVlKQoraW5s aW5lIHZvaWQgRGVmZXJyZWRXcmFwcGVyOjpyZWplY3Q8RXhjZXB0aW9uQ29kZT4oY29uc3QgRXhj ZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgQVNTRVJUKG1fZGVmZXJyZWQpOwogICAgIEFTU0VSVCht X2dsb2JhbE9iamVjdCk7CiAgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSBtX2dsb2JhbE9iamVj dC0+Z2xvYmFsRXhlYygpOwogICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2tlcihleGVjKTsKLSAg ICByZXNvbHZlKCpleGVjLCB2YWx1ZSk7CisgICAgcmVqZWN0KCpleGVjLCBjcmVhdGVET01FeGNl cHRpb24oZXhlYywgZWMpKTsKIH0KIAogdGVtcGxhdGU8PgotaW5saW5lIHZvaWQgRGVmZXJyZWRX cmFwcGVyOjpyZWplY3QoSlNDOjpKU1ZhbHVlIHZhbHVlKQoraW5saW5lIHZvaWQgRGVmZXJyZWRX cmFwcGVyOjpyZXNvbHZlPFN0cmluZz4oY29uc3QgU3RyaW5nJiByZXN1bHQpCiB7CiAgICAgQVNT RVJUKG1fZGVmZXJyZWQpOwogICAgIEFTU0VSVChtX2dsb2JhbE9iamVjdCk7CiAgICAgSlNDOjpF eGVjU3RhdGUqIGV4ZWMgPSBtX2dsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwogICAgIEpTQzo6 SlNMb2NrSG9sZGVyIGxvY2tlcihleGVjKTsKLSAgICByZWplY3QoKmV4ZWMsIHZhbHVlKTsKKyAg ICByZXNvbHZlKCpleGVjLCBqc1N0cmluZyhleGVjLCByZXN1bHQpKTsKIH0KIAogdGVtcGxhdGU8 PgotaW5saW5lIHZvaWQgRGVmZXJyZWRXcmFwcGVyOjpyZXNvbHZlKHN0ZDo6bnVsbHB0cl90KQor aW5saW5lIHZvaWQgRGVmZXJyZWRXcmFwcGVyOjpyZXNvbHZlPGJvb2w+KGNvbnN0IGJvb2wmIHJl c3VsdCkKIHsKICAgICBBU1NFUlQobV9kZWZlcnJlZCk7CiAgICAgQVNTRVJUKG1fZ2xvYmFsT2Jq ZWN0KTsKICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IG1fZ2xvYmFsT2JqZWN0LT5nbG9iYWxF eGVjKCk7CiAgICAgSlNDOjpKU0xvY2tIb2xkZXIgbG9ja2VyKGV4ZWMpOwotICAgIHJlc29sdmUo KmV4ZWMsIEpTQzo6anNVbmRlZmluZWQoKSk7CisgICAgcmVzb2x2ZSgqZXhlYywgSlNDOjpqc0Jv b2xlYW4ocmVzdWx0KSk7CiB9CiAKIHRlbXBsYXRlPD4KLWlubGluZSB2b2lkIERlZmVycmVkV3Jh cHBlcjo6cmVqZWN0KHN0ZDo6bnVsbHB0cl90KQoraW5saW5lIHZvaWQgRGVmZXJyZWRXcmFwcGVy OjpyZXNvbHZlPEpTQzo6SlNWYWx1ZT4oY29uc3QgSlNDOjpKU1ZhbHVlJiB2YWx1ZSkKIHsKICAg ICBBU1NFUlQobV9kZWZlcnJlZCk7CiAgICAgQVNTRVJUKG1fZ2xvYmFsT2JqZWN0KTsKICAgICBK U0M6OkV4ZWNTdGF0ZSogZXhlYyA9IG1fZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAgICAg SlNDOjpKU0xvY2tIb2xkZXIgbG9ja2VyKGV4ZWMpOwotICAgIHJlamVjdCgqZXhlYywgSlNDOjpq c051bGwoKSk7CisgICAgcmVzb2x2ZSgqZXhlYywgdmFsdWUpOwogfQogCiB0ZW1wbGF0ZTw+Ci1p bmxpbmUgdm9pZCBEZWZlcnJlZFdyYXBwZXI6OnJlc29sdmUoY29uc3QgU3RyaW5nJiByZXN1bHQp CitpbmxpbmUgdm9pZCBEZWZlcnJlZFdyYXBwZXI6OnJlc29sdmUoY29uc3Qgc3RkOjpudWxscHRy X3QmKQogewogICAgIEFTU0VSVChtX2RlZmVycmVkKTsKICAgICBBU1NFUlQobV9nbG9iYWxPYmpl Y3QpOwogICAgIEpTQzo6RXhlY1N0YXRlKiBleGVjID0gbV9nbG9iYWxPYmplY3QtPmdsb2JhbEV4 ZWMoKTsKICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrZXIoZXhlYyk7Ci0gICAgcmVzb2x2ZSgq ZXhlYywganNTdHJpbmcoZXhlYywgcmVzdWx0KSk7CisgICAgcmVzb2x2ZSgqZXhlYywgSlNDOjpq c1VuZGVmaW5lZCgpKTsKIH0KIAogdGVtcGxhdGU8PgotaW5saW5lIHZvaWQgRGVmZXJyZWRXcmFw cGVyOjpyZWplY3QoY29uc3QgU3RyaW5nJiByZXN1bHQpCitpbmxpbmUgdm9pZCBEZWZlcnJlZFdy YXBwZXI6OnJlamVjdDxTdHJpbmc+KGNvbnN0IFN0cmluZyYgcmVzdWx0KQogewogICAgIEFTU0VS VChtX2RlZmVycmVkKTsKICAgICBBU1NFUlQobV9nbG9iYWxPYmplY3QpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNTdWJ0bGVDcnlwdG9DdXN0b20uY3BwIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNTdWJ0bGVDcnlwdG9DdXN0b20uY3BwCmluZGV4IDhj NmQ4OGE1ODRhOTZmM2I3YTA1ODJmNGUyMmVlYzgxZTIxYTFiMDMuLjRmYTY3ODI0ZTc1ZWRiNWNi M2U2YmE4ODAxYTZhNzRhY2NmODhkYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTU3VidGxlQ3J5cHRvQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU1N1YnRsZUNyeXB0b0N1c3RvbS5jcHAKQEAgLTU1MCw3ICs1NTAsNyBAQCBKU1Zh bHVlIEpTU3VidGxlQ3J5cHRvOjppbXBvcnRLZXkoRXhlY1N0YXRlJiBzdGF0ZSkKICAgICBKU1By b21pc2VEZWZlcnJlZCogcHJvbWlzZURlZmVycmVkID0gSlNQcm9taXNlRGVmZXJyZWQ6OmNyZWF0 ZSgmc3RhdGUsIGdsb2JhbE9iamVjdCgpKTsKICAgICBEZWZlcnJlZFdyYXBwZXIgd3JhcHBlcigm c3RhdGUsIGdsb2JhbE9iamVjdCgpLCBwcm9taXNlRGVmZXJyZWQpOwogICAgIGF1dG8gc3VjY2Vz c0NhbGxiYWNrID0gW3dyYXBwZXJdKENyeXB0b0tleSYgcmVzdWx0KSBtdXRhYmxlIHsKLSAgICAg ICAgd3JhcHBlci5yZXNvbHZlKHJlc3VsdCk7CisgICAgICAgIHdyYXBwZXIucmVzb2x2ZSgmcmVz dWx0KTsKICAgICB9OwogICAgIGF1dG8gZmFpbHVyZUNhbGxiYWNrID0gW3dyYXBwZXJdKCkgbXV0 YWJsZSB7CiAgICAgICAgIHdyYXBwZXIucmVqZWN0KG51bGxwdHIpOwpAQCAtNzg1LDcgKzc4NSw3 IEBAIEpTVmFsdWUgSlNTdWJ0bGVDcnlwdG86OnVud3JhcEtleShFeGVjU3RhdGUmIHN0YXRlKQog CiAgICAgYXV0byBkZWNyeXB0U3VjY2Vzc0NhbGxiYWNrID0gW2RvbUdsb2JhbE9iamVjdCwga2V5 Rm9ybWF0LCB1bndyYXBwZWRLZXlBbGdvcml0aG1QdHIsIHVud3JhcHBlZEtleUFsZ29yaXRobVBh cmFtZXRlcnNQdHIsIGV4dHJhY3RhYmxlLCBrZXlVc2FnZXMsIHdyYXBwZXJdKGNvbnN0IFZlY3Rv cjx1aW50OF90PiYgcmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgYXV0byBpbXBvcnRTdWNjZXNz Q2FsbGJhY2sgPSBbd3JhcHBlcl0oQ3J5cHRvS2V5JiBrZXkpIG11dGFibGUgewotICAgICAgICAg ICAgd3JhcHBlci5yZXNvbHZlKGtleSk7CisgICAgICAgICAgICB3cmFwcGVyLnJlc29sdmUoJmtl eSk7CiAgICAgICAgIH07CiAgICAgICAgIGF1dG8gaW1wb3J0RmFpbHVyZUNhbGxiYWNrID0gW3dy YXBwZXJdKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICB3cmFwcGVyLnJlamVjdChudWxscHRyKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZS5oIGIvU291cmNlL1dlYkNv cmUvY3NzL0ZvbnRGYWNlLmgKaW5kZXggZTI0OTM0ZDc3NDJkNTBkZTBkMjY2NjdmYTdhNmFmYWNi NjM5ZDE5MS4uODk3MWVmMWQyOTdhMjJmYmVjYmNlM2UwZWFiZjAzOWE0NzZlMTM2MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv Y3NzL0ZvbnRGYWNlLmgKQEAgLTY1LDcgKzY1LDcgQEAgcHVibGljOgogICAgIGVudW0gY2xhc3Mg TG9hZFN0YXR1cyB7IFVubG9hZGVkLCBMb2FkaW5nLCBMb2FkZWQsIEVycm9yIH07CiAgICAgTG9h ZFN0YXR1cyBzdGF0dXMoKSBjb25zdDsKIAotICAgIHR5cGVkZWYgRE9NUHJvbWlzZTxGb250RmFj ZSY+IFByb21pc2U7CisgICAgdHlwZWRlZiBET01Qcm9taXNlPEZvbnRGYWNlJiwgRXhjZXB0aW9u Q29kZT4gUHJvbWlzZTsKICAgICB2b2lkIHJlZ2lzdGVyTG9hZGVkKFByb21pc2UmJik7CiAKICAg ICB2b2lkIGxvYWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNl dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2VTZXQuY3BwCmluZGV4IDE4OWU1YmRm YWZkMDE3YWFhODZmZDhkMzc3YTkwNWNmY2VjNzgzNWEuLjdlNzQ0OTgzZGY4MWU3YWJkMGRjMTIz MWFlNTYyMDQ0MjFmOThjMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFj ZVNldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmNwcApAQCAtODMs NyArODMsNyBAQCBSZWZQdHI8Rm9udEZhY2U+IEZvbnRGYWNlU2V0OjpJdGVyYXRvcjo6bmV4dCgp CiAgICAgcmV0dXJuIG1fdGFyZ2V0LT5iYWNraW5nKClbbV9pbmRleCsrXS53cmFwcGVyKCk7CiB9 CiAKLUZvbnRGYWNlU2V0OjpQZW5kaW5nUHJvbWlzZTo6UGVuZGluZ1Byb21pc2UoTG9hZFByb21p c2UmJiBwcm9taXNlKQorRm9udEZhY2VTZXQ6OlBlbmRpbmdQcm9taXNlOjpQZW5kaW5nUHJvbWlz ZShQcm9taXNlJiYgcHJvbWlzZSkKICAgICA6IHByb21pc2UoV1RGTW92ZShwcm9taXNlKSkKIHsK IH0KQEAgLTEyMyw3ICsxMjMsNyBAQCB2b2lkIEZvbnRGYWNlU2V0OjpjbGVhcigpCiAgICAgICAg IG1fYmFja2luZy0+cmVtb3ZlKG1fYmFja2luZy5nZXQoKVswXSk7CiB9CiAKLXZvaWQgRm9udEZh Y2VTZXQ6OmxvYWQoY29uc3QgU3RyaW5nJiBmb250LCBjb25zdCBTdHJpbmcmIHRleHQsIExvYWRQ cm9taXNlJiYgcHJvbWlzZSkKK3ZvaWQgRm9udEZhY2VTZXQ6OmxvYWQoY29uc3QgU3RyaW5nJiBm b250LCBjb25zdCBTdHJpbmcmIHRleHQsIERlZmVycmVkV3JhcHBlciYmIHByb21pc2UpCiB7CiAg ICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgYXV0byBtYXRjaGluZ0ZhY2VzID0gbV9iYWNr aW5nLT5tYXRjaGluZ0ZhY2VzKGZvbnQsIHRleHQsIGVjKTsKQEAgLTE0Miw3ICsxNDIsNyBAQCB2 b2lkIEZvbnRGYWNlU2V0Ojpsb2FkKGNvbnN0IFN0cmluZyYgZm9udCwgY29uc3QgU3RyaW5nJiB0 ZXh0LCBMb2FkUHJvbWlzZSYmIHBybwogCiAgICAgZm9yIChhdXRvJiBmYWNlIDogbWF0Y2hpbmdG YWNlcykgewogICAgICAgICBpZiAoZmFjZS5nZXQoKS5zdGF0dXMoKSA9PSBDU1NGb250RmFjZTo6 U3RhdHVzOjpGYWlsdXJlKSB7Ci0gICAgICAgICAgICBwcm9taXNlLnJlamVjdChET01Db3JlRXhj ZXB0aW9uOjpjcmVhdGUoRXhjZXB0aW9uQ29kZURlc2NyaXB0aW9uKE5FVFdPUktfRVJSKSkpOwor ICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoRE9NQ29yZUV4Y2VwdGlvbjo6Y3JlYXRlKEV4Y2Vw dGlvbkNvZGVEZXNjcmlwdGlvbihORVRXT1JLX0VSUikpLnB0cigpKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogICAgIH0KQEAgLTE2Nyw3ICsxNjcsNyBAQCBib29sIEZvbnRGYWNl U2V0OjpjaGVjayhjb25zdCBTdHJpbmcmIGZhbWlseSwgY29uc3QgU3RyaW5nJiB0ZXh0LCBFeGNl cHRpb25Db2RlJgogICAgIHJldHVybiBtX2JhY2tpbmctPmNoZWNrKGZhbWlseSwgdGV4dCwgZWMp OwogfQogCi12b2lkIEZvbnRGYWNlU2V0OjpyZWdpc3RlclJlYWR5KFJlYWR5UHJvbWlzZSYmIHBy b21pc2UpCit2b2lkIEZvbnRGYWNlU2V0OjpyZWdpc3RlclJlYWR5KFByb21pc2UmJiBwcm9taXNl KQogewogICAgIEFTU0VSVCghbV9wcm9taXNlKTsKICAgICBpZiAobV9pc1JlYWR5KSB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2VTZXQuaCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9Gb250RmFjZVNldC5oCmluZGV4IDg5YWQwOGQwOWJjZjI3ZDk3ODE0OTYzZDhjN2Y5ZGY2 MzMzODc5MjQuLmYwNDcwZTlkNjI4YmJlN2MwMjhhOTEwYmY3MGYwOWJmYWM2ZjhlMDEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9Gb250RmFjZVNldC5oCkBAIC00NywxNSArNDcsMTQgQEAgcHVibGljOgogICAgIGJv b2wgcmVtb3ZlKEZvbnRGYWNlJik7CiAgICAgdm9pZCBjbGVhcigpOwogCi0gICAgdHlwZWRlZiBE T01Qcm9taXNlPFZlY3RvcjxSZWZQdHI8Rm9udEZhY2U+Pj4gTG9hZFByb21pc2U7Ci0gICAgdm9p ZCBsb2FkKGNvbnN0IFN0cmluZyYgZm9udCwgY29uc3QgU3RyaW5nJiB0ZXh0LCBMb2FkUHJvbWlz ZSYmKTsKKyAgICB2b2lkIGxvYWQoY29uc3QgU3RyaW5nJiBmb250LCBjb25zdCBTdHJpbmcmIHRl eHQsIERlZmVycmVkV3JhcHBlciYmIHByb21pc2UpOwogICAgIGJvb2wgY2hlY2soY29uc3QgU3Ry aW5nJiBmb250LCBjb25zdCBTdHJpbmcmIHRleHQsIEV4Y2VwdGlvbkNvZGUmKTsKIAogICAgIGVu dW0gY2xhc3MgTG9hZFN0YXR1cyB7IExvYWRpbmcsIExvYWRlZCB9OwogICAgIExvYWRTdGF0dXMg c3RhdHVzKCkgY29uc3Q7CiAKLSAgICB0eXBlZGVmIERPTVByb21pc2U8Rm9udEZhY2VTZXQmPiBS ZWFkeVByb21pc2U7Ci0gICAgdm9pZCByZWdpc3RlclJlYWR5KFJlYWR5UHJvbWlzZSYmKTsKKyAg ICB0eXBlZGVmIERPTVByb21pc2U8Rm9udEZhY2VTZXQmLCBET01Db3JlRXhjZXB0aW9uJj4gUHJv bWlzZTsKKyAgICB2b2lkIHJlZ2lzdGVyUmVhZHkoUHJvbWlzZSYmKTsKIAogICAgIENTU0ZvbnRG YWNlU2V0JiBiYWNraW5nKCkgeyByZXR1cm4gbV9iYWNraW5nOyB9CiAKQEAgLTc1LDE4ICs3NCwx OSBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgc3RydWN0IFBlbmRpbmdQcm9taXNlIDogUmVm Q291bnRlZDxQZW5kaW5nUHJvbWlzZT4gewotICAgICAgICBzdGF0aWMgUmVmPFBlbmRpbmdQcm9t aXNlPiBjcmVhdGUoTG9hZFByb21pc2UmJiBwcm9taXNlKQorICAgICAgICB0eXBlZGVmIERPTVBy b21pc2U8VmVjdG9yPFJlZlB0cjxGb250RmFjZT4+JiwgRE9NQ29yZUV4Y2VwdGlvbiY+IFByb21p c2U7CisgICAgICAgIHN0YXRpYyBSZWY8UGVuZGluZ1Byb21pc2U+IGNyZWF0ZShQcm9taXNlJiYg cHJvbWlzZSkKICAgICAgICAgewogICAgICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgUGVu ZGluZ1Byb21pc2UoV1RGTW92ZShwcm9taXNlKSkpOwogICAgICAgICB9CiAgICAgICAgIH5QZW5k aW5nUHJvbWlzZSgpOwogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgUGVuZGluZ1Byb21pc2UoTG9h ZFByb21pc2UmJik7CisgICAgICAgIFBlbmRpbmdQcm9taXNlKFByb21pc2UmJik7CiAKICAgICBw dWJsaWM6CiAgICAgICAgIFZlY3RvcjxSZWZQdHI8Rm9udEZhY2U+PiBmYWNlczsKLSAgICAgICAg TG9hZFByb21pc2UgcHJvbWlzZTsKKyAgICAgICAgUHJvbWlzZSBwcm9taXNlOwogICAgICAgICBi b29sIGhhc1JlYWNoZWRUZXJtaW5hbFN0YXRlIHsgZmFsc2UgfTsKICAgICB9OwogCkBAIC0xMTAs NyArMTEwLDcgQEAgcHJpdmF0ZToKIAogICAgIFJlZjxDU1NGb250RmFjZVNldD4gbV9iYWNraW5n OwogICAgIEhhc2hNYXA8UmVmUHRyPENTU0ZvbnRGYWNlPiwgVmVjdG9yPFJlZjxQZW5kaW5nUHJv bWlzZT4+PiBtX3BlbmRpbmdQcm9taXNlczsKLSAgICBPcHRpb25hbDxSZWFkeVByb21pc2U+IG1f cHJvbWlzZTsKKyAgICBPcHRpb25hbDxQcm9taXNlPiBtX3Byb21pc2U7CiAgICAgYm9vbCBtX2lz UmVhZHkgeyBmYWxzZSB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu aAppbmRleCAwMTg0YmUwODU2YThjZGNlODdjYzY2OWZkYzVmYTc4MjM0MzM4ZjY0Li5kOGJjMTU1 ZDE3MmYwM2Q2YTgzMmQ0NjIwODg4Zjc0NzFhY2E4Y2JmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxNZWRpYUVsZW1lbnQuaApAQCAtMjEyLDcgKzIxMiw3IEBAIHB1YmxpYzoKICAgICBib29sIGxv b3AoKSBjb25zdDsKICAgICB2b2lkIHNldExvb3AoYm9vbCBiKTsKIAotICAgIHR5cGVkZWYgRE9N UHJvbWlzZTxzdGQ6Om51bGxwdHJfdD4gUGxheVByb21pc2U7CisgICAgdHlwZWRlZiBET01Qcm9t aXNlPHN0ZDo6bnVsbHB0cl90LCBET01FcnJvciY+IFBsYXlQcm9taXNlOwogICAgIHZvaWQgcGxh eShQbGF5UHJvbWlzZSYmKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcGxheSgpIG92ZXJy aWRlOwo=