128869 2014-02-15 01:22:03 -0800 Split compilation state between querySelector and CSS matching 2014-02-16 19:09:43 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin allan.jensen barraclough commit-queue esprehn+autocc glenn gyuyoung.kim kangil.han kling macpherson menard oldest_to_newest 981146 0 benjamin 2014-02-15 01:22:03 -0800 Split compilation state between querySelector and CSS matching 981150 1 224293 benjamin 2014-02-15 01:41:20 -0800 Created attachment 224293 Patch 981314 2 224293 benjamin 2014-02-16 19:09:36 -0800 Comment on attachment 224293 Patch Clearing flags on attachment: 224293 Committed r164202: <http://trac.webkit.org/changeset/164202> 981315 3 benjamin 2014-02-16 19:09:43 -0800 All reviewed patches have been landed. Closing bug. 224293 2014-02-15 01:41:20 -0800 2014-02-16 19:09:36 -0800 Patch bug-128869-20140215014119.patch text/plain 22832 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGU0YjBhYmUzYzc1NDFl MDlhZTU3OTkyNDg5NmEyOTZjY2ExNjg0NS4uNGM3YzBmODU1ZjA3NmE1Yjk3NzkzMTVmZjg2YmE5 YmNjZGUwMDkyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDE0LTAyLTE1ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBTcGxpdCBjb21w aWxhdGlvbiBzdGF0ZSBiZXR3ZWVuIHF1ZXJ5U2VsZWN0b3IgYW5kIENTUyBtYXRjaGluZworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4ODY5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYW51cCBhZnRl ciByZWNlbnQgY2hhbmdlczoKKyAgICAgICAgLVNlbGVjdG9yQ29tcGlsZXIgbm93IGhhcyBhIFNl bGVjdG9yQ29udGV4dCBkZWZpbmluZyBpZiB0aGUgY29kZSBpcyBjb21waWxlZCBmb3IgUXVlcnlT ZWxlY3RvcgorICAgICAgICAgb3IgZm9yIEVsZW1lbnRSdWxlQ29sbGVjdG9yLgorICAgICAgICAt R2VuZXJhbGl6ZSBtX3NlbGVjdG9yQ2Fubm90TWF0Y2hBbnl0aGluZyBieSBtYWtpbmcgaXQgcGFy dCBvZiB0aGUgRnVuY3Rpb25UeXBlLiBGdW5jdGlvblR5cGUgbm93CisgICAgICAgICBmdWxseSBy ZXByZXNlbnQgdGhlIHR5cGUgb2YgY29kZSBnZW5lcmF0aW9uIGFuZCB3ZSBkb24ndCByZWx5IGlt cGxpY2l0bHkgb24gbV9zZWxlY3RvckZyYWdtZW50cyBiZWluZworICAgICAgICAgZW1wdHkuCisK KyAgICAgICAgKiBjc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RWxlbWVudFJ1bGVDb2xsZWN0b3I6OnJ1bGVNYXRjaGVzKToKKworICAgICAgICAqIGNzc2pp dC9TZWxlY3RvckNvbXBpbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ29tcGls ZXI6OmNvbXBpbGVTZWxlY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckNvbXBpbGVy OjpTZWxlY3RvckNvZGVHZW5lcmF0b3I6OlNlbGVjdG9yQ29kZUdlbmVyYXRvcik6CisgICAgICAg IFRoZXJlIGlzIG5vIHRyZWUgbWFya2luZyBmb3IgUXVlcnlTZWxlY3Rvciwgc28gd2UgY2FuIGdl bmVyYXRlIGEgc2ltcGxlIHNlbGVjdG9yCisgICAgICAgIGZvciB0aGUgc2libGluZyBzZWxlY3Rv cnMuCisKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ29tcGlsZXI6OlNlbGVjdG9yQ29kZUdl bmVyYXRvcjo6Y29tcGlsZSk6CisgICAgICAgIFRoZSBjb2RlIGlzIHNwbGl0IHRvIG1ha2UgaXQg c2ltcGxlci4gVGhlIGNsYXNzaWMgY29kZSBnZW5lcmF0aW9uIGhhcyBiZWVuIG1vdmVkCisgICAg ICAgIHRvIGdlbmVyYXRlU2VsZWN0b3JDaGVja2VyKCkuCisgICAgICAgIFRoZSBkZWNpc2lvbiBv biB3aGF0IHRvIGdlbmVyYXRlIGlzIHJlZHVjZWQgdG8gYSBzaW1wbGUgc3dpdGNoLWNhc2UuCisK KyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ29tcGlsZXI6OlNlbGVjdG9yQ29kZUdlbmVyYXRv cjo6Z2VuZXJhdGVTZWxlY3RvckNoZWNrZXIpOgorICAgICAgICBUaGUgY29kZSB0aGF0IHdhcyBw cmV2aW91c2x5IGluIGNvbXBpbGUoKS4KKworICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JDb21w aWxlcjo6U2VsZWN0b3JDb2RlR2VuZXJhdG9yOjptYXJrUGFyZW50RWxlbWVudElmUmVzb2x2aW5n U3R5bGUpOgorICAgICAgICBXZSBzaG91bGQgbm90IGdlbmVyYXRlIHRyZWUgbWFya2luZyBvbiBx dWVyeVNlbGVjdG9yIHRyYXZlcnNhbC4gU2luY2UgdGhlIGNvbnN0cnVjdG9yCisgICAgICAgIG5v dyBnZW5lcmF0ZSBhIFNpbXBsZUNoZWNrZXIsIGl0IHdvdWxkIGFsc28gYmUgaW5jb3JyZWN0IHRv IGF0dGVtcHQgdG8gYWNjZXNzIHRoZSBjaGVja2luZ0NvbnRleHQKKyAgICAgICAgb24gdGhlIHN0 YWNrLgorICAgICAgICBXZSBjYW4ganVzdCBza2lwIHRoZSBtYXJraW5nIGVudGllcmx5LgorCisg ICAgICAgICogY3Nzaml0L1NlbGVjdG9yQ29tcGlsZXIuaDoKKyAgICAgICAgKiBkb20vU2VsZWN0 b3JRdWVyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckRhdGFMaXN0OjpleGVjdXRl KToKKyAgICAgICAgV2l0aCB0aGUgY2hhbmdlcyBvZiBTZWxlY3RvckNvbnRleHQsIHdlIGNhbiBu byBsb25nZXIgZ2VuZXJhdGUgYSBjb21wbGV4IGNoZWNrZXIgZm9yIHF1ZXJ5U2VsZWN0b3IuCisg ICAgICAgIFRoaXMgY29kZSBtYXkgY29tZSBiYWNrIGluIHRoZSBmdXR1cmUgYnV0IGF0IHRoZSBt b21lbnQgaXQgaXMgdXNlbGVzcy4KKwogMjAxNC0wMi0xNCAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAogICAgICAgICBzZXRTZWxlY3Rpb25SYW5nZSBzaG91bGRuJ3QgdHJpZ2dl ciBhIHN5bmNocm9ub3VzIGxheW91dCB0byBjaGVjayBmb2N1c2FiaWxpdHkgd2hlbiB0ZXh0IGZp ZWxkIGlzIGFscmVhZHkgZm9jdXNlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0Vs ZW1lbnRSdWxlQ29sbGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNv bGxlY3Rvci5jcHAKaW5kZXggZTJiNTA1ZDkyMDNmYTA4MDgzMWI0MzA1MDY4YzY2MTVjYTVkOWQ2 NC4uZTk1NDg2ZjNjODVjNzA0MmFmYjM2NjlkNjFlNmQyNTFiNjcxMjY4MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCkBAIC0yOTgsNyArMjk4LDcgQEAg aW5saW5lIGJvb2wgRWxlbWVudFJ1bGVDb2xsZWN0b3I6OnJ1bGVNYXRjaGVzKGNvbnN0IFJ1bGVE YXRhJiBydWxlRGF0YSwgUHNldWRvSWQKICAgICAgICAgSlNDOjpWTSogdm0gPSBtX2VsZW1lbnQu ZG9jdW1lbnQoKS5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnZtKCk7CiAgICAgICAgIFNlbGVj dG9yQ29tcGlsYXRpb25TdGF0dXMgY29tcGlsYXRpb25TdGF0dXM7CiAgICAgICAgIEpTQzo6TWFj cm9Bc3NlbWJsZXJDb2RlUmVmIGNvbXBpbGVkU2VsZWN0b3JDb2RlUmVmOwotICAgICAgICBjb21w aWxhdGlvblN0YXR1cyA9IFNlbGVjdG9yQ29tcGlsZXI6OmNvbXBpbGVTZWxlY3RvcihydWxlRGF0 YS5zZWxlY3RvcigpLCB2bSwgY29tcGlsZWRTZWxlY3RvckNvZGVSZWYpOworICAgICAgICBjb21w aWxhdGlvblN0YXR1cyA9IFNlbGVjdG9yQ29tcGlsZXI6OmNvbXBpbGVTZWxlY3RvcihydWxlRGF0 YS5zZWxlY3RvcigpLCB2bSwgU2VsZWN0b3JDb21waWxlcjo6U2VsZWN0b3JDb250ZXh0OjpSdWxl Q29sbGVjdG9yLCBjb21waWxlZFNlbGVjdG9yQ29kZVJlZik7CiAKICAgICAgICAgcnVsZURhdGEu c2V0Q29tcGlsZWRTZWxlY3Rvcihjb21waWxhdGlvblN0YXR1cywgY29tcGlsZWRTZWxlY3RvckNv ZGVSZWYpOwogICAgICAgICBjb21waWxlZFNlbGVjdG9yQ2hlY2tlciA9IHJ1bGVEYXRhLmNvbXBp bGVkU2VsZWN0b3JDb2RlUmVmKCkuY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3NqaXQvU2VsZWN0b3JDb21waWxlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9jc3NqaXQvU2VsZWN0b3JDb21waWxlci5jcHAKaW5kZXggNmNiNDlhNmY4Y2QxZTVj ZWM1MzdjNGI0N2M2NTk2Njc3NWQyOTdjMi4uY2U4ZGE3NDczZGRkN2U0YWMyNDczNTkxN2E3YjUy YWRiNTMzMzkyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nzaml0L1NlbGVjdG9yQ29t cGlsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzc2ppdC9TZWxlY3RvckNvbXBpbGVyLmNw cApAQCAtODYsNiArODYsNyBAQCBlbnVtIGNsYXNzIEZyYWdtZW50UmVsYXRpb24gewogZW51bSBj bGFzcyBGdW5jdGlvblR5cGUgewogICAgIFNpbXBsZVNlbGVjdG9yQ2hlY2tlciwKICAgICBTZWxl Y3RvckNoZWNrZXJXaXRoQ2hlY2tpbmdDb250ZXh0LAorICAgIENhbm5vdE1hdGNoQW55dGhpbmcs CiAgICAgQ2Fubm90Q29tcGlsZQogfTsKIApAQCAtMTE4LDcgKzExOSw3IEBAIHR5cGVkZWYgVmVj dG9yPFNlbGVjdG9yRnJhZ21lbnQsIDg+IFNlbGVjdG9yRnJhZ21lbnRMaXN0OwogCiBjbGFzcyBT ZWxlY3RvckNvZGVHZW5lcmF0b3IgewogcHVibGljOgotICAgIFNlbGVjdG9yQ29kZUdlbmVyYXRv cihjb25zdCBDU1NTZWxlY3RvciopOworICAgIFNlbGVjdG9yQ29kZUdlbmVyYXRvcihjb25zdCBD U1NTZWxlY3RvciosIFNlbGVjdG9yQ29udGV4dCk7CiAgICAgU2VsZWN0b3JDb21waWxhdGlvblN0 YXR1cyBjb21waWxlKEpTQzo6Vk0qLCBKU0M6Ok1hY3JvQXNzZW1ibGVyQ29kZVJlZiYpOwogCiBw cml2YXRlOgpAQCAtMTI5LDYgKzEzMCw3IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIHZvaWQg Y29tcHV0ZUJhY2t0cmFja2luZ0luZm9ybWF0aW9uKCk7CisgICAgdm9pZCBnZW5lcmF0ZVNlbGVj dG9yQ2hlY2tlcigpOwogCiAgICAgLy8gRWxlbWVudCByZWxhdGlvbnMgdHJlZSB3YWxrZXIuCiAg ICAgdm9pZCBnZW5lcmF0ZVdhbGtUb1BhcmVudEVsZW1lbnQoQXNzZW1ibGVyOjpKdW1wTGlzdCYg ZmFpbHVyZUNhc2VzLCBBc3NlbWJsZXI6OlJlZ2lzdGVySUQgdGFyZ2V0UmVnaXN0ZXIpOwpAQCAt MTYzLDkgKzE2NSw5IEBAIHByaXZhdGU6CiAgICAgU3RhY2tBbGxvY2F0b3IgbV9zdGFja0FsbG9j YXRvcjsKICAgICBWZWN0b3I8c3RkOjpwYWlyPEFzc2VtYmxlcjo6Q2FsbCwgSlNDOjpGdW5jdGlv blB0cj4+IG1fZnVuY3Rpb25DYWxsczsKIAorICAgIFNlbGVjdG9yQ29udGV4dCBtX3NlbGVjdG9y Q29udGV4dDsKICAgICBGdW5jdGlvblR5cGUgbV9mdW5jdGlvblR5cGU7CiAgICAgU2VsZWN0b3JG cmFnbWVudExpc3QgbV9zZWxlY3RvckZyYWdtZW50czsKLSAgICBib29sIG1fc2VsZWN0b3JDYW5u b3RNYXRjaEFueXRoaW5nOwogCiAgICAgU3RhY2tBbGxvY2F0b3I6OlN0YWNrUmVmZXJlbmNlIG1f Y2hlY2tpbmdDb250ZXh0U3RhY2tSZWZlcmVuY2U7CiAKQEAgLTE4MywxMSArMTg1LDExIEBAIHBy aXZhdGU6CiAjZW5kaWYKIH07CiAKLVNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXMgY29tcGlsZVNl bGVjdG9yKGNvbnN0IENTU1NlbGVjdG9yKiBsYXN0U2VsZWN0b3IsIEpTQzo6Vk0qIHZtLCBKU0M6 Ok1hY3JvQXNzZW1ibGVyQ29kZVJlZiYgY29kZVJlZikKK1NlbGVjdG9yQ29tcGlsYXRpb25TdGF0 dXMgY29tcGlsZVNlbGVjdG9yKGNvbnN0IENTU1NlbGVjdG9yKiBsYXN0U2VsZWN0b3IsIEpTQzo6 Vk0qIHZtLCBTZWxlY3RvckNvbnRleHQgc2VsZWN0b3JDb250ZXh0LCBKU0M6Ok1hY3JvQXNzZW1i bGVyQ29kZVJlZiYgY29kZVJlZikKIHsKICAgICBpZiAoIXZtLT5jYW5Vc2VKSVQoKSkKICAgICAg ICAgcmV0dXJuIFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6OkNhbm5vdENvbXBpbGU7Ci0gICAg U2VsZWN0b3JDb2RlR2VuZXJhdG9yIGNvZGVHZW5lcmF0b3IobGFzdFNlbGVjdG9yKTsKKyAgICBT ZWxlY3RvckNvZGVHZW5lcmF0b3IgY29kZUdlbmVyYXRvcihsYXN0U2VsZWN0b3IsIHNlbGVjdG9y Q29udGV4dCk7CiAgICAgcmV0dXJuIGNvZGVHZW5lcmF0b3IuY29tcGlsZSh2bSwgY29kZVJlZik7 CiB9CiAKQEAgLTI4NywxMCArMjg5LDEwIEBAIHN0YXRpYyBpbmxpbmUgRnVuY3Rpb25UeXBlIGFk ZFBzZXVkb1R5cGUoQ1NTU2VsZWN0b3I6OlBzZXVkb1R5cGUgdHlwZSwgU2VsZWN0b3JGCiAgICAg cmV0dXJuIEZ1bmN0aW9uVHlwZTo6Q2Fubm90Q29tcGlsZTsKIH0KIAotaW5saW5lIFNlbGVjdG9y Q29kZUdlbmVyYXRvcjo6U2VsZWN0b3JDb2RlR2VuZXJhdG9yKGNvbnN0IENTU1NlbGVjdG9yKiBy b290U2VsZWN0b3IpCitpbmxpbmUgU2VsZWN0b3JDb2RlR2VuZXJhdG9yOjpTZWxlY3RvckNvZGVH ZW5lcmF0b3IoY29uc3QgQ1NTU2VsZWN0b3IqIHJvb3RTZWxlY3RvciwgU2VsZWN0b3JDb250ZXh0 IHNlbGVjdG9yQ29udGV4dCkKICAgICA6IG1fc3RhY2tBbGxvY2F0b3IobV9hc3NlbWJsZXIpCisg ICAgLCBtX3NlbGVjdG9yQ29udGV4dChzZWxlY3RvckNvbnRleHQpCiAgICAgLCBtX2Z1bmN0aW9u VHlwZShGdW5jdGlvblR5cGU6OlNpbXBsZVNlbGVjdG9yQ2hlY2tlcikKLSAgICAsIG1fc2VsZWN0 b3JDYW5ub3RNYXRjaEFueXRoaW5nKGZhbHNlKQogI2lmIENTU19TRUxFQ1RPUl9KSVRfREVCVUdH SU5HCiAgICAgLCBtX29yaWdpbmFsU2VsZWN0b3Iocm9vdFNlbGVjdG9yKQogI2VuZGlmCkBAIC0z MTAsOCArMzEyLDEwIEBAIGlubGluZSBTZWxlY3RvckNvZGVHZW5lcmF0b3I6OlNlbGVjdG9yQ29k ZUdlbmVyYXRvcihjb25zdCBDU1NTZWxlY3Rvciogcm9vdFNlbGVjCiAgICAgICAgIGNhc2UgQ1NT U2VsZWN0b3I6OklkOiB7CiAgICAgICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGlkID0gc2Vs ZWN0b3ItPnZhbHVlKCk7CiAgICAgICAgICAgICBpZiAoZnJhZ21lbnQuaWQpIHsKLSAgICAgICAg ICAgICAgICBpZiAoaWQgIT0gKmZyYWdtZW50LmlkKQotICAgICAgICAgICAgICAgICAgICBnb3Rv IEluY29uc2lzdGVudFNlbGVjdG9yOworICAgICAgICAgICAgICAgIGlmIChpZCAhPSAqZnJhZ21l bnQuaWQpIHsKKyAgICAgICAgICAgICAgICAgICAgbV9mdW5jdGlvblR5cGUgPSBGdW5jdGlvblR5 cGU6OkNhbm5vdE1hdGNoQW55dGhpbmc7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICBmcmFn bWVudC5pZCA9ICYoc2VsZWN0b3ItPnZhbHVlKCkpOwogICAgICAgICAgICAgYnJlYWs7CkBAIC0z MjEsOCArMzI1LDggQEAgaW5saW5lIFNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6U2VsZWN0b3JDb2Rl R2VuZXJhdG9yKGNvbnN0IENTU1NlbGVjdG9yKiByb290U2VsZWMKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICBjYXNlIENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzczoKICAgICAgICAgICAgIG1f ZnVuY3Rpb25UeXBlID0gbW9zdFJlc3RyaWN0aXZlRnVuY3Rpb25UeXBlKG1fZnVuY3Rpb25UeXBl LCBhZGRQc2V1ZG9UeXBlKHNlbGVjdG9yLT5wc2V1ZG9UeXBlKCksIGZyYWdtZW50KSk7Ci0gICAg ICAgICAgICBpZiAobV9mdW5jdGlvblR5cGUgPT0gRnVuY3Rpb25UeXBlOjpDYW5ub3RDb21waWxl KQotICAgICAgICAgICAgICAgIGdvdG8gQ2Fubm90SGFuZGxlU2VsZWN0b3I7CisgICAgICAgICAg ICBpZiAobV9mdW5jdGlvblR5cGUgPT0gRnVuY3Rpb25UeXBlOjpDYW5ub3RDb21waWxlIHx8IG1f ZnVuY3Rpb25UeXBlID09IEZ1bmN0aW9uVHlwZTo6Q2Fubm90TWF0Y2hBbnl0aGluZykKKyAgICAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NT ZWxlY3Rvcjo6U2V0OgogICAgICAgICAgICAgZnJhZ21lbnQuYXR0cmlidXRlcy5hcHBlbmQoc2Vs ZWN0b3IpOwpAQCAtMzQ2LDggKzM1MCwxMiBAQCBpbmxpbmUgU2VsZWN0b3JDb2RlR2VuZXJhdG9y OjpTZWxlY3RvckNvZGVHZW5lcmF0b3IoY29uc3QgQ1NTU2VsZWN0b3IqIHJvb3RTZWxlYwogICAg ICAgICBpZiAocmVsYXRpb24gPT0gQ1NTU2VsZWN0b3I6OlNoYWRvd0Rlc2NlbmRhbnQgJiYgIXNl bGVjdG9yLT5pc0xhc3RJblRhZ0hpc3RvcnkoKSkKICAgICAgICAgICAgIGdvdG8gQ2Fubm90SGFu ZGxlU2VsZWN0b3I7CiAKLSAgICAgICAgaWYgKHJlbGF0aW9uID09IENTU1NlbGVjdG9yOjpEaXJl Y3RBZGphY2VudCB8fCByZWxhdGlvbiA9PSBDU1NTZWxlY3Rvcjo6SW5kaXJlY3RBZGphY2VudCkK LSAgICAgICAgICAgIG1fZnVuY3Rpb25UeXBlID0gc3RkOjptYXgobV9mdW5jdGlvblR5cGUsIEZ1 bmN0aW9uVHlwZTo6U2VsZWN0b3JDaGVja2VyV2l0aENoZWNraW5nQ29udGV4dCk7CisgICAgICAg IGlmIChyZWxhdGlvbiA9PSBDU1NTZWxlY3Rvcjo6RGlyZWN0QWRqYWNlbnQgfHwgcmVsYXRpb24g PT0gQ1NTU2VsZWN0b3I6OkluZGlyZWN0QWRqYWNlbnQpIHsKKyAgICAgICAgICAgIEZ1bmN0aW9u VHlwZSByZWxhdGlvbkZ1bmN0aW9uVHlwZSA9IEZ1bmN0aW9uVHlwZTo6U2VsZWN0b3JDaGVja2Vy V2l0aENoZWNraW5nQ29udGV4dDsKKyAgICAgICAgICAgIGlmIChtX3NlbGVjdG9yQ29udGV4dCA9 PSBTZWxlY3RvckNvbnRleHQ6OlF1ZXJ5U2VsZWN0b3IpCisgICAgICAgICAgICAgICAgcmVsYXRp b25GdW5jdGlvblR5cGUgPSBGdW5jdGlvblR5cGU6OlNpbXBsZVNlbGVjdG9yQ2hlY2tlcjsKKyAg ICAgICAgICAgIG1fZnVuY3Rpb25UeXBlID0gc3RkOjptYXgobV9mdW5jdGlvblR5cGUsIHJlbGF0 aW9uRnVuY3Rpb25UeXBlKTsKKyAgICAgICAgfQogCiAgICAgICAgIGZyYWdtZW50LnJlbGF0aW9u VG9MZWZ0RnJhZ21lbnQgPSBmcmFnbWVudFJlbGF0aW9uRm9yU2VsZWN0b3JSZWxhdGlvbihyZWxh dGlvbik7CiAgICAgICAgIGZyYWdtZW50LnJlbGF0aW9uVG9SaWdodEZyYWdtZW50ID0gcmVsYXRp b25Ub1ByZXZpb3VzRnJhZ21lbnQ7CkBAIC0zNjAsMTEgKzM2OCw4IEBAIGlubGluZSBTZWxlY3Rv ckNvZGVHZW5lcmF0b3I6OlNlbGVjdG9yQ29kZUdlbmVyYXRvcihjb25zdCBDU1NTZWxlY3Rvciog cm9vdFNlbGVjCiAgICAgY29tcHV0ZUJhY2t0cmFja2luZ0luZm9ybWF0aW9uKCk7CiAKICAgICBy ZXR1cm47Ci1JbmNvbnNpc3RlbnRTZWxlY3RvcjoKLSAgICBtX2Z1bmN0aW9uVHlwZSA9IEZ1bmN0 aW9uVHlwZTo6U2ltcGxlU2VsZWN0b3JDaGVja2VyOwotICAgIG1fc2VsZWN0b3JDYW5ub3RNYXRj aEFueXRoaW5nID0gdHJ1ZTsKIENhbm5vdEhhbmRsZVNlbGVjdG9yOgotICAgIG1fc2VsZWN0b3JG cmFnbWVudHMuY2xlYXIoKTsKKyAgICBtX2Z1bmN0aW9uVHlwZSA9IEZ1bmN0aW9uVHlwZTo6Q2Fu bm90Q29tcGlsZTsKIH0KIAogc3RhdGljIGlubGluZSB1bnNpZ25lZCBtaW5pbXVtUmVnaXN0ZXJS ZXF1aXJlbWVudHMoY29uc3QgU2VsZWN0b3JGcmFnbWVudExpc3QmIHNlbGVjdG9yRnJhZ21lbnRz KQpAQCAtNDAxLDEwMiArNDA2LDE3IEBAIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgbWluaW11bVJl Z2lzdGVyUmVxdWlyZW1lbnRzKGNvbnN0IFNlbGVjdG9yRnJhZ21lbnRMaXN0JiBzCiAKIGlubGlu ZSBTZWxlY3RvckNvbXBpbGF0aW9uU3RhdHVzIFNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6Y29tcGls ZShKU0M6OlZNKiB2bSwgSlNDOjpNYWNyb0Fzc2VtYmxlckNvZGVSZWYmIGNvZGVSZWYpCiB7Ci0g ICAgaWYgKG1fc2VsZWN0b3JGcmFnbWVudHMuaXNFbXB0eSgpICYmICFtX3NlbGVjdG9yQ2Fubm90 TWF0Y2hBbnl0aGluZykKLSAgICAgICAgcmV0dXJuIFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6 OkNhbm5vdENvbXBpbGU7Ci0KLSAgICBib29sIHJlc2VydmVkQ2FsbGVlU2F2ZWRSZWdpc3RlcnMg PSBmYWxzZTsKLSAgICB1bnNpZ25lZCBhdmFpbGFibGVSZWdpc3RlckNvdW50ID0gbV9yZWdpc3Rl ckFsbG9jYXRvci5hdmFpbGFibGVSZWdpc3RlckNvdW50KCk7Ci0gICAgdW5zaWduZWQgbWluaW11 bVJlZ2lzdGVyQ291bnRGb3JBdHRyaWJ1dGVzID0gbWluaW11bVJlZ2lzdGVyUmVxdWlyZW1lbnRz KG1fc2VsZWN0b3JGcmFnbWVudHMpOwotICAgIGlmIChhdmFpbGFibGVSZWdpc3RlckNvdW50IDwg bWluaW11bVJlZ2lzdGVyQ291bnRGb3JBdHRyaWJ1dGVzKSB7Ci0gICAgICAgIHJlc2VydmVkQ2Fs bGVlU2F2ZWRSZWdpc3RlcnMgPSB0cnVlOwotICAgICAgICBtX3JlZ2lzdGVyQWxsb2NhdG9yLnJl c2VydmVDYWxsZWVTYXZlZFJlZ2lzdGVycyhtX3N0YWNrQWxsb2NhdG9yLCBtaW5pbXVtUmVnaXN0 ZXJDb3VudEZvckF0dHJpYnV0ZXMgLSBhdmFpbGFibGVSZWdpc3RlckNvdW50KTsKLSAgICB9Ci0K LSAgICBtX3JlZ2lzdGVyQWxsb2NhdG9yLmFsbG9jYXRlUmVnaXN0ZXIoZWxlbWVudEFkZHJlc3NS ZWdpc3Rlcik7Ci0KLSAgICBpZiAobV9mdW5jdGlvblR5cGUgPT0gRnVuY3Rpb25UeXBlOjpTZWxl Y3RvckNoZWNrZXJXaXRoQ2hlY2tpbmdDb250ZXh0KQotICAgICAgICBtX2NoZWNraW5nQ29udGV4 dFN0YWNrUmVmZXJlbmNlID0gbV9zdGFja0FsbG9jYXRvci5wdXNoKGNoZWNraW5nQ29udGV4dFJl Z2lzdGVyKTsKLQotICAgIEFzc2VtYmxlcjo6SnVtcExpc3QgZmFpbHVyZUNhc2VzOwotCi0gICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fc2VsZWN0b3JGcmFnbWVudHMuc2l6ZSgpOyArK2kp IHsKLSAgICAgICAgY29uc3QgU2VsZWN0b3JGcmFnbWVudCYgZnJhZ21lbnQgPSBtX3NlbGVjdG9y RnJhZ21lbnRzW2ldOwotICAgICAgICBzd2l0Y2ggKGZyYWdtZW50LnJlbGF0aW9uVG9SaWdodEZy YWdtZW50KSB7Ci0gICAgICAgIGNhc2UgRnJhZ21lbnRSZWxhdGlvbjo6UmlnaHRtb3N0OgotICAg ICAgICAgICAgZ2VuZXJhdGVFbGVtZW50TWF0Y2hpbmcoZmFpbHVyZUNhc2VzLCBmcmFnbWVudCk7 Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBGcmFnbWVudFJlbGF0aW9uOjpEZXNj ZW5kYW50OgotICAgICAgICAgICAgZ2VuZXJhdGVBbmNlc3RvclRyZWVXYWxrZXIoZmFpbHVyZUNh c2VzLCBmcmFnbWVudCk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBGcmFnbWVu dFJlbGF0aW9uOjpDaGlsZDoKLSAgICAgICAgICAgIGdlbmVyYXRlUGFyZW50RWxlbWVudFRyZWVX YWxrZXIoZmFpbHVyZUNhc2VzLCBmcmFnbWVudCk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAg ICAgY2FzZSBGcmFnbWVudFJlbGF0aW9uOjpEaXJlY3RBZGphY2VudDoKLSAgICAgICAgICAgIGdl bmVyYXRlRGlyZWN0QWRqYWNlbnRUcmVlV2Fsa2VyKGZhaWx1cmVDYXNlcywgZnJhZ21lbnQpOwot ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgRnJhZ21lbnRSZWxhdGlvbjo6SW5kaXJl Y3RBZGphY2VudDoKLSAgICAgICAgICAgIGdlbmVyYXRlSW5kaXJlY3RBZGphY2VudFRyZWVXYWxr ZXIoZmFpbHVyZUNhc2VzLCBmcmFnbWVudCk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAg fQotICAgICAgICBnZW5lcmF0ZUJhY2t0cmFja2luZ1RhaWxzSWZOZWVkZWQoZnJhZ21lbnQpOwot ICAgIH0KLQotICAgIG1fcmVnaXN0ZXJBbGxvY2F0b3IuZGVhbGxvY2F0ZVJlZ2lzdGVyKGVsZW1l bnRBZGRyZXNzUmVnaXN0ZXIpOwotCi0gICAgaWYgKG1fZnVuY3Rpb25UeXBlID09IEZ1bmN0aW9u VHlwZTo6U2ltcGxlU2VsZWN0b3JDaGVja2VyICYmIG1fc2VsZWN0b3JDYW5ub3RNYXRjaEFueXRo aW5nKSB7CisgICAgc3dpdGNoIChtX2Z1bmN0aW9uVHlwZSkgeworICAgIGNhc2UgRnVuY3Rpb25U eXBlOjpTaW1wbGVTZWxlY3RvckNoZWNrZXI6CisgICAgY2FzZSBGdW5jdGlvblR5cGU6OlNlbGVj dG9yQ2hlY2tlcldpdGhDaGVja2luZ0NvbnRleHQ6CisgICAgICAgIGdlbmVyYXRlU2VsZWN0b3JD aGVja2VyKCk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRnVuY3Rpb25UeXBlOjpDYW5ub3RN YXRjaEFueXRoaW5nOgogICAgICAgICBtX2Fzc2VtYmxlci5tb3ZlKEFzc2VtYmxlcjo6VHJ1c3Rl ZEltbTMyKDApLCByZXR1cm5SZWdpc3Rlcik7CiAgICAgICAgIG1fYXNzZW1ibGVyLnJldCgpOwot ICAgIH0gZWxzZSBpZiAobV9mdW5jdGlvblR5cGUgPT0gRnVuY3Rpb25UeXBlOjpTaW1wbGVTZWxl Y3RvckNoZWNrZXIpIHsKLSAgICAgICAgLy8gU3VjY2Vzcy4KLSAgICAgICAgbV9hc3NlbWJsZXIu bW92ZShBc3NlbWJsZXI6OlRydXN0ZWRJbW0zMigxKSwgcmV0dXJuUmVnaXN0ZXIpOwotICAgICAg ICBpZiAoIXJlc2VydmVkQ2FsbGVlU2F2ZWRSZWdpc3RlcnMpCi0gICAgICAgICAgICBtX2Fzc2Vt Ymxlci5yZXQoKTsKLQotICAgICAgICAvLyBGYWlsdXJlLgotICAgICAgICBpZiAoIWZhaWx1cmVD YXNlcy5lbXB0eSgpKSB7Ci0gICAgICAgICAgICBBc3NlbWJsZXI6Okp1bXAgc2tpcEZhaWx1cmVD YXNlOwotICAgICAgICAgICAgaWYgKHJlc2VydmVkQ2FsbGVlU2F2ZWRSZWdpc3RlcnMpCi0gICAg ICAgICAgICAgICAgc2tpcEZhaWx1cmVDYXNlID0gbV9hc3NlbWJsZXIuanVtcCgpOwotCi0gICAg ICAgICAgICBmYWlsdXJlQ2FzZXMubGluaygmbV9hc3NlbWJsZXIpOwotICAgICAgICAgICAgbV9h c3NlbWJsZXIubW92ZShBc3NlbWJsZXI6OlRydXN0ZWRJbW0zMigwKSwgcmV0dXJuUmVnaXN0ZXIp OwotCi0gICAgICAgICAgICBpZiAoIXJlc2VydmVkQ2FsbGVlU2F2ZWRSZWdpc3RlcnMpCi0gICAg ICAgICAgICAgICAgbV9hc3NlbWJsZXIucmV0KCk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgc2tpcEZhaWx1cmVDYXNlLmxpbmsoJm1fYXNzZW1ibGVyKTsKLSAgICAgICAgfQot ICAgICAgICBpZiAocmVzZXJ2ZWRDYWxsZWVTYXZlZFJlZ2lzdGVycykgewotICAgICAgICAgICAg bV9yZWdpc3RlckFsbG9jYXRvci5yZXN0b3JlQ2FsbGVlU2F2ZWRSZWdpc3RlcnMobV9zdGFja0Fs bG9jYXRvcik7Ci0gICAgICAgICAgICBtX2Fzc2VtYmxlci5yZXQoKTsKLSAgICAgICAgfQotICAg IH0gZWxzZSB7Ci0gICAgICAgIEFTU0VSVChtX2Z1bmN0aW9uVHlwZSA9PSBGdW5jdGlvblR5cGU6 OlNlbGVjdG9yQ2hlY2tlcldpdGhDaGVja2luZ0NvbnRleHQpOwotICAgICAgICBBU1NFUlQoIW1f c2VsZWN0b3JDYW5ub3RNYXRjaEFueXRoaW5nKTsKLQotICAgICAgICAvLyBTdWNjZXNzLgotICAg ICAgICBtX2Fzc2VtYmxlci5tb3ZlKEFzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKDEpLCByZXR1cm5S ZWdpc3Rlcik7Ci0KLSAgICAgICAgU3RhY2tBbGxvY2F0b3Igc3VjY2Vzc1N0YWNrID0gbV9zdGFj a0FsbG9jYXRvcjsKLSAgICAgICAgU3RhY2tBbGxvY2F0b3IgZmFpbHVyZVN0YWNrID0gbV9zdGFj a0FsbG9jYXRvcjsKLQotICAgICAgICBMb2NhbFJlZ2lzdGVyIGNoZWNraW5nQ29udGV4dFJlZ2lz dGVyKG1fcmVnaXN0ZXJBbGxvY2F0b3IpOwotICAgICAgICBzdWNjZXNzU3RhY2sucG9wKG1fY2hl Y2tpbmdDb250ZXh0U3RhY2tSZWZlcmVuY2UsIGNoZWNraW5nQ29udGV4dFJlZ2lzdGVyKTsKLQot ICAgICAgICAvLyBGYWlsdXJlLgotICAgICAgICBpZiAoIWZhaWx1cmVDYXNlcy5lbXB0eSgpKSB7 Ci0gICAgICAgICAgICBBc3NlbWJsZXI6Okp1bXAgc2tpcEZhaWx1cmVDYXNlID0gbV9hc3NlbWJs ZXIuanVtcCgpOwotCi0gICAgICAgICAgICBmYWlsdXJlQ2FzZXMubGluaygmbV9hc3NlbWJsZXIp OwotICAgICAgICAgICAgZmFpbHVyZVN0YWNrLmRpc2NhcmQoKTsKLSAgICAgICAgICAgIG1fYXNz ZW1ibGVyLm1vdmUoQXNzZW1ibGVyOjpUcnVzdGVkSW1tMzIoMCksIHJldHVyblJlZ2lzdGVyKTsK LQotICAgICAgICAgICAgc2tpcEZhaWx1cmVDYXNlLmxpbmsoJm1fYXNzZW1ibGVyKTsKLSAgICAg ICAgfQotCi0gICAgICAgIG1fc3RhY2tBbGxvY2F0b3IubWVyZ2Uoc3RkOjptb3ZlKHN1Y2Nlc3NT dGFjayksIHN0ZDo6bW92ZShmYWlsdXJlU3RhY2spKTsKLSAgICAgICAgbV9yZWdpc3RlckFsbG9j YXRvci5yZXN0b3JlQ2FsbGVlU2F2ZWRSZWdpc3RlcnMobV9zdGFja0FsbG9jYXRvcik7Ci0gICAg ICAgIG1fYXNzZW1ibGVyLnJldCgpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZ1bmN0aW9u VHlwZTo6Q2Fubm90Q29tcGlsZToKKyAgICAgICAgcmV0dXJuIFNlbGVjdG9yQ29tcGlsYXRpb25T dGF0dXM6OkNhbm5vdENvbXBpbGU7CiAgICAgfQogCiAgICAgSlNDOjpMaW5rQnVmZmVyIGxpbmtC dWZmZXIoKnZtLCAmbV9hc3NlbWJsZXIsIENTU19DT0RFX0lEKTsKQEAgLTUwOSw3ICs0MjksNyBA QCBpbmxpbmUgU2VsZWN0b3JDb21waWxhdGlvblN0YXR1cyBTZWxlY3RvckNvZGVHZW5lcmF0b3I6 OmNvbXBpbGUoSlNDOjpWTSogdm0sIEpTQwogICAgIGNvZGVSZWYgPSBGSU5BTElaRV9DT0RFKGxp bmtCdWZmZXIsICgiQ1NTIFNlbGVjdG9yIEpJVCIpKTsKICNlbmRpZgogCi0gICAgaWYgKG1fZnVu Y3Rpb25UeXBlID09IEZ1bmN0aW9uVHlwZTo6U2ltcGxlU2VsZWN0b3JDaGVja2VyKQorICAgIGlm IChtX2Z1bmN0aW9uVHlwZSA9PSBGdW5jdGlvblR5cGU6OlNpbXBsZVNlbGVjdG9yQ2hlY2tlciB8 fCBtX2Z1bmN0aW9uVHlwZSA9PSBGdW5jdGlvblR5cGU6OkNhbm5vdE1hdGNoQW55dGhpbmcpCiAg ICAgICAgIHJldHVybiBTZWxlY3RvckNvbXBpbGF0aW9uU3RhdHVzOjpTaW1wbGVTZWxlY3RvckNo ZWNrZXI7CiAgICAgcmV0dXJuIFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6OlNlbGVjdG9yQ2hl Y2tlcldpdGhDaGVja2luZ0NvbnRleHQ7CiB9CkBAIC02NjIsNiArNTgyLDEwMCBAQCB2b2lkIFNl bGVjdG9yQ29kZUdlbmVyYXRvcjo6Y29tcHV0ZUJhY2t0cmFja2luZ0luZm9ybWF0aW9uKCkKICAg ICB9CiB9CiAKK3ZvaWQgU2VsZWN0b3JDb2RlR2VuZXJhdG9yOjpnZW5lcmF0ZVNlbGVjdG9yQ2hl Y2tlcigpCit7CisgICAgYm9vbCByZXNlcnZlZENhbGxlZVNhdmVkUmVnaXN0ZXJzID0gZmFsc2U7 CisgICAgdW5zaWduZWQgYXZhaWxhYmxlUmVnaXN0ZXJDb3VudCA9IG1fcmVnaXN0ZXJBbGxvY2F0 b3IuYXZhaWxhYmxlUmVnaXN0ZXJDb3VudCgpOworICAgIHVuc2lnbmVkIG1pbmltdW1SZWdpc3Rl ckNvdW50Rm9yQXR0cmlidXRlcyA9IG1pbmltdW1SZWdpc3RlclJlcXVpcmVtZW50cyhtX3NlbGVj dG9yRnJhZ21lbnRzKTsKKyAgICBpZiAoYXZhaWxhYmxlUmVnaXN0ZXJDb3VudCA8IG1pbmltdW1S ZWdpc3RlckNvdW50Rm9yQXR0cmlidXRlcykgeworICAgICAgICByZXNlcnZlZENhbGxlZVNhdmVk UmVnaXN0ZXJzID0gdHJ1ZTsKKyAgICAgICAgbV9yZWdpc3RlckFsbG9jYXRvci5yZXNlcnZlQ2Fs bGVlU2F2ZWRSZWdpc3RlcnMobV9zdGFja0FsbG9jYXRvciwgbWluaW11bVJlZ2lzdGVyQ291bnRG b3JBdHRyaWJ1dGVzIC0gYXZhaWxhYmxlUmVnaXN0ZXJDb3VudCk7CisgICAgfQorCisgICAgbV9y ZWdpc3RlckFsbG9jYXRvci5hbGxvY2F0ZVJlZ2lzdGVyKGVsZW1lbnRBZGRyZXNzUmVnaXN0ZXIp OworCisgICAgaWYgKG1fZnVuY3Rpb25UeXBlID09IEZ1bmN0aW9uVHlwZTo6U2VsZWN0b3JDaGVj a2VyV2l0aENoZWNraW5nQ29udGV4dCkKKyAgICAgICAgbV9jaGVja2luZ0NvbnRleHRTdGFja1Jl ZmVyZW5jZSA9IG1fc3RhY2tBbGxvY2F0b3IucHVzaChjaGVja2luZ0NvbnRleHRSZWdpc3Rlcik7 CisKKyAgICBBc3NlbWJsZXI6Okp1bXBMaXN0IGZhaWx1cmVDYXNlczsKKworICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBtX3NlbGVjdG9yRnJhZ21lbnRzLnNpemUoKTsgKytpKSB7CisgICAg ICAgIGNvbnN0IFNlbGVjdG9yRnJhZ21lbnQmIGZyYWdtZW50ID0gbV9zZWxlY3RvckZyYWdtZW50 c1tpXTsKKyAgICAgICAgc3dpdGNoIChmcmFnbWVudC5yZWxhdGlvblRvUmlnaHRGcmFnbWVudCkg eworICAgICAgICBjYXNlIEZyYWdtZW50UmVsYXRpb246OlJpZ2h0bW9zdDoKKyAgICAgICAgICAg IGdlbmVyYXRlRWxlbWVudE1hdGNoaW5nKGZhaWx1cmVDYXNlcywgZnJhZ21lbnQpOworICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRnJhZ21lbnRSZWxhdGlvbjo6RGVzY2VuZGFudDoK KyAgICAgICAgICAgIGdlbmVyYXRlQW5jZXN0b3JUcmVlV2Fsa2VyKGZhaWx1cmVDYXNlcywgZnJh Z21lbnQpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRnJhZ21lbnRSZWxhdGlv bjo6Q2hpbGQ6CisgICAgICAgICAgICBnZW5lcmF0ZVBhcmVudEVsZW1lbnRUcmVlV2Fsa2VyKGZh aWx1cmVDYXNlcywgZnJhZ21lbnQpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2Ug RnJhZ21lbnRSZWxhdGlvbjo6RGlyZWN0QWRqYWNlbnQ6CisgICAgICAgICAgICBnZW5lcmF0ZURp cmVjdEFkamFjZW50VHJlZVdhbGtlcihmYWlsdXJlQ2FzZXMsIGZyYWdtZW50KTsKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICBjYXNlIEZyYWdtZW50UmVsYXRpb246OkluZGlyZWN0QWRqYWNl bnQ6CisgICAgICAgICAgICBnZW5lcmF0ZUluZGlyZWN0QWRqYWNlbnRUcmVlV2Fsa2VyKGZhaWx1 cmVDYXNlcywgZnJhZ21lbnQpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAg ICAgZ2VuZXJhdGVCYWNrdHJhY2tpbmdUYWlsc0lmTmVlZGVkKGZyYWdtZW50KTsKKyAgICB9CisK KyAgICBtX3JlZ2lzdGVyQWxsb2NhdG9yLmRlYWxsb2NhdGVSZWdpc3RlcihlbGVtZW50QWRkcmVz c1JlZ2lzdGVyKTsKKworICAgIGlmIChtX2Z1bmN0aW9uVHlwZSA9PSBGdW5jdGlvblR5cGU6OlNp bXBsZVNlbGVjdG9yQ2hlY2tlcikgeworICAgICAgICAvLyBTdWNjZXNzLgorICAgICAgICBtX2Fz c2VtYmxlci5tb3ZlKEFzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKDEpLCByZXR1cm5SZWdpc3Rlcik7 CisgICAgICAgIGlmICghcmVzZXJ2ZWRDYWxsZWVTYXZlZFJlZ2lzdGVycykKKyAgICAgICAgICAg IG1fYXNzZW1ibGVyLnJldCgpOworCisgICAgICAgIC8vIEZhaWx1cmUuCisgICAgICAgIGlmICgh ZmFpbHVyZUNhc2VzLmVtcHR5KCkpIHsKKyAgICAgICAgICAgIEFzc2VtYmxlcjo6SnVtcCBza2lw RmFpbHVyZUNhc2U7CisgICAgICAgICAgICBpZiAocmVzZXJ2ZWRDYWxsZWVTYXZlZFJlZ2lzdGVy cykKKyAgICAgICAgICAgICAgICBza2lwRmFpbHVyZUNhc2UgPSBtX2Fzc2VtYmxlci5qdW1wKCk7 CisKKyAgICAgICAgICAgIGZhaWx1cmVDYXNlcy5saW5rKCZtX2Fzc2VtYmxlcik7CisgICAgICAg ICAgICBtX2Fzc2VtYmxlci5tb3ZlKEFzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKDApLCByZXR1cm5S ZWdpc3Rlcik7CisKKyAgICAgICAgICAgIGlmICghcmVzZXJ2ZWRDYWxsZWVTYXZlZFJlZ2lzdGVy cykKKyAgICAgICAgICAgICAgICBtX2Fzc2VtYmxlci5yZXQoKTsKKyAgICAgICAgICAgIGVsc2UK KyAgICAgICAgICAgICAgICBza2lwRmFpbHVyZUNhc2UubGluaygmbV9hc3NlbWJsZXIpOworICAg ICAgICB9CisgICAgICAgIGlmIChyZXNlcnZlZENhbGxlZVNhdmVkUmVnaXN0ZXJzKSB7CisgICAg ICAgICAgICBtX3JlZ2lzdGVyQWxsb2NhdG9yLnJlc3RvcmVDYWxsZWVTYXZlZFJlZ2lzdGVycyht X3N0YWNrQWxsb2NhdG9yKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnJldCgpOworICAgICAg ICB9CisgICAgfSBlbHNlIHsKKyAgICAgICAgQVNTRVJUKG1fZnVuY3Rpb25UeXBlID09IEZ1bmN0 aW9uVHlwZTo6U2VsZWN0b3JDaGVja2VyV2l0aENoZWNraW5nQ29udGV4dCk7CisKKyAgICAgICAg Ly8gU3VjY2Vzcy4KKyAgICAgICAgbV9hc3NlbWJsZXIubW92ZShBc3NlbWJsZXI6OlRydXN0ZWRJ bW0zMigxKSwgcmV0dXJuUmVnaXN0ZXIpOworCisgICAgICAgIFN0YWNrQWxsb2NhdG9yIHN1Y2Nl c3NTdGFjayA9IG1fc3RhY2tBbGxvY2F0b3I7CisgICAgICAgIFN0YWNrQWxsb2NhdG9yIGZhaWx1 cmVTdGFjayA9IG1fc3RhY2tBbGxvY2F0b3I7CisKKyAgICAgICAgTG9jYWxSZWdpc3RlciBjaGVj a2luZ0NvbnRleHRSZWdpc3RlcihtX3JlZ2lzdGVyQWxsb2NhdG9yKTsKKyAgICAgICAgc3VjY2Vz c1N0YWNrLnBvcChtX2NoZWNraW5nQ29udGV4dFN0YWNrUmVmZXJlbmNlLCBjaGVja2luZ0NvbnRl eHRSZWdpc3Rlcik7CisKKyAgICAgICAgLy8gRmFpbHVyZS4KKyAgICAgICAgaWYgKCFmYWlsdXJl Q2FzZXMuZW1wdHkoKSkgeworICAgICAgICAgICAgQXNzZW1ibGVyOjpKdW1wIHNraXBGYWlsdXJl Q2FzZSA9IG1fYXNzZW1ibGVyLmp1bXAoKTsKKworICAgICAgICAgICAgZmFpbHVyZUNhc2VzLmxp bmsoJm1fYXNzZW1ibGVyKTsKKyAgICAgICAgICAgIGZhaWx1cmVTdGFjay5kaXNjYXJkKCk7Cisg ICAgICAgICAgICBtX2Fzc2VtYmxlci5tb3ZlKEFzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKDApLCBy ZXR1cm5SZWdpc3Rlcik7CisKKyAgICAgICAgICAgIHNraXBGYWlsdXJlQ2FzZS5saW5rKCZtX2Fz c2VtYmxlcik7CisgICAgICAgIH0KKworICAgICAgICBtX3N0YWNrQWxsb2NhdG9yLm1lcmdlKHN0 ZDo6bW92ZShzdWNjZXNzU3RhY2spLCBzdGQ6Om1vdmUoZmFpbHVyZVN0YWNrKSk7CisgICAgICAg IG1fcmVnaXN0ZXJBbGxvY2F0b3IucmVzdG9yZUNhbGxlZVNhdmVkUmVnaXN0ZXJzKG1fc3RhY2tB bGxvY2F0b3IpOworICAgICAgICBtX2Fzc2VtYmxlci5yZXQoKTsKKyAgICB9Cit9CisKIHN0YXRp YyBpbmxpbmUgQXNzZW1ibGVyOjpKdW1wIHRlc3RJc0VsZW1lbnRGbGFnT25Ob2RlKEFzc2VtYmxl cjo6UmVzdWx0Q29uZGl0aW9uIGNvbmRpdGlvbiwgQXNzZW1ibGVyJiBhc3NlbWJsZXIsIEFzc2Vt Ymxlcjo6UmVnaXN0ZXJJRCBub2RlQWRkcmVzcykKIHsKICAgICByZXR1cm4gYXNzZW1ibGVyLmJy YW5jaFRlc3QzMihjb25kaXRpb24sIEFzc2VtYmxlcjo6QWRkcmVzcyhub2RlQWRkcmVzcywgTm9k ZTo6bm9kZUZsYWdzTWVtb3J5T2Zmc2V0KCkpLCBBc3NlbWJsZXI6OlRydXN0ZWRJbW0zMihOb2Rl OjpmbGFnSXNFbGVtZW50KCkpKTsKQEAgLTc3OCw2ICs3OTIsOSBAQCB2b2lkIFNlbGVjdG9yQ29k ZUdlbmVyYXRvcjo6Z2VuZXJhdGVJbmRpcmVjdEFkamFjZW50VHJlZVdhbGtlcihBc3NlbWJsZXI6 Okp1bXBMaQogCiB2b2lkIFNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6bWFya1BhcmVudEVsZW1lbnRJ ZlJlc29sdmluZ1N0eWxlKEpTQzo6RnVuY3Rpb25QdHIgbWFya2luZ0Z1bmN0aW9uKQogeworICAg IGlmIChtX3NlbGVjdG9yQ29udGV4dCA9PSBTZWxlY3RvckNvbnRleHQ6OlF1ZXJ5U2VsZWN0b3Ip CisgICAgICAgIHJldHVybjsKKwogICAgIC8vICAgICBpZiAoY2hlY2tpbmdDb250ZXh0LnJlc29s dmluZ01vZGUgPT0gUmVzb2x2aW5nU3R5bGUpIHsKICAgICAvLyAgICAgICAgIEVsZW1lbnQqIHBh cmVudCA9IGVsZW1lbnQtPnBhcmVudE5vZGUoKTsKICAgICAvLyAgICAgICAgIG1hcmtpbmdGdW5j dGlvbihwYXJlbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nzaml0L1NlbGVjdG9y Q29tcGlsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzc2ppdC9TZWxlY3RvckNvbXBpbGVyLmgKaW5k ZXggNzE4NzhiN2E0MWRjZDljODM0MTgzNDUxZTY3ODk2MjA0MGYzYzkwOS4uOGJlOTM5Njk5YmNi ZDYyZTY2MDA2ZTRkYWM2MThjNDU0OGExMTI1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3Nzaml0L1NlbGVjdG9yQ29tcGlsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3NqaXQvU2Vs ZWN0b3JDb21waWxlci5oCkBAIC03Miw5ICs3MiwxNyBAQCBzdHJ1Y3QgQ2hlY2tpbmdDb250ZXh0 IHsKICAgICBSZW5kZXJTdHlsZSogZWxlbWVudFN0eWxlOwogfTsKIAorZW51bSBjbGFzcyBTZWxl Y3RvckNvbnRleHQgeworICAgIC8vIFJ1bGUgQ29sbGVjdG9yIG5lZWRzIGEgcmVzb2x2aW5nTW9k ZSBhbmQgY2FuIG1vZGlmeSB0aGUgdHJlZSBhcyBpdCBtYXRjaGVzLgorICAgIFJ1bGVDb2xsZWN0 b3IsCisKKyAgICAvLyBRdWVyeSBTZWxlY3RvciBkb2VzIG5vdCBtb2RpZnkgdGhlIHRyZWUgYW5k IG5ldmVyIG1hdGNoIDp2aXNpdGVkLgorICAgIFF1ZXJ5U2VsZWN0b3IKK307CisKIHR5cGVkZWYg dW5zaWduZWQgKCpTaW1wbGVTZWxlY3RvckNoZWNrZXIpKEVsZW1lbnQqKTsKIHR5cGVkZWYgdW5z aWduZWQgKCpTZWxlY3RvckNoZWNrZXJXaXRoQ2hlY2tpbmdDb250ZXh0KShFbGVtZW50KiwgY29u c3QgQ2hlY2tpbmdDb250ZXh0Kik7Ci1TZWxlY3RvckNvbXBpbGF0aW9uU3RhdHVzIGNvbXBpbGVT ZWxlY3Rvcihjb25zdCBDU1NTZWxlY3RvciosIEpTQzo6Vk0qLCBKU0M6Ok1hY3JvQXNzZW1ibGVy Q29kZVJlZiYgb3V0cHV0Q29kZVJlZik7CitTZWxlY3RvckNvbXBpbGF0aW9uU3RhdHVzIGNvbXBp bGVTZWxlY3Rvcihjb25zdCBDU1NTZWxlY3RvciosIEpTQzo6Vk0qLCBTZWxlY3RvckNvbnRleHQs IEpTQzo6TWFjcm9Bc3NlbWJsZXJDb2RlUmVmJiBvdXRwdXRDb2RlUmVmKTsKIAogaW5saW5lIFNp bXBsZVNlbGVjdG9yQ2hlY2tlciBzaW1wbGVTZWxlY3RvckNoZWNrZXJGdW5jdGlvbih2b2lkKiBl eGVjdXRhYmxlQWRkcmVzcywgU2VsZWN0b3JDb21waWxhdGlvblN0YXR1cyBjb21waWxhdGlvblN0 YXR1cykKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcAppbmRleCA0YmVkMGIxOTRj YTFhMTAyOTVhYjhlODJhNzY1YjA1NzM1MGI1NGYzLi40ZmE1NzdlNWIxMTBhNWU4N2IwNTIxNTFj ODFmZWVlYzhhNzE3MDk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JR dWVyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwCkBAIC0z MDgsMjMgKzMwOCwxNCBAQCBBTFdBWVNfSU5MSU5FIHZvaWQgU2VsZWN0b3JEYXRhTGlzdDo6ZXhl Y3V0ZShDb250YWluZXJOb2RlJiByb290Tm9kZSwgdHlwZW5hbWUgUwogICAgICAgICAgICAgdm9p ZCogY29tcGlsZWRTZWxlY3RvckNoZWNrZXIgPSBzZWxlY3RvckRhdGEuY29tcGlsZWRTZWxlY3Rv ckNvZGVSZWYuY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCk7CiAgICAgICAgICAgICBpZiAoIWNv bXBpbGVkU2VsZWN0b3JDaGVja2VyICYmIHNlbGVjdG9yRGF0YS5jb21waWxhdGlvblN0YXR1cyA9 PSBTZWxlY3RvckNvbXBpbGF0aW9uU3RhdHVzOjpOb3RDb21waWxlZCkgewogICAgICAgICAgICAg ICAgIEpTQzo6Vk0qIHZtID0gcm9vdE5vZGUuZG9jdW1lbnQoKS5zY3JpcHRFeGVjdXRpb25Db250 ZXh0KCktPnZtKCk7Ci0gICAgICAgICAgICAgICAgc2VsZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3Rh dHVzID0gU2VsZWN0b3JDb21waWxlcjo6Y29tcGlsZVNlbGVjdG9yKHNlbGVjdG9yRGF0YS5zZWxl Y3Rvciwgdm0sIHNlbGVjdG9yRGF0YS5jb21waWxlZFNlbGVjdG9yQ29kZVJlZik7CisgICAgICAg ICAgICAgICAgc2VsZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3RhdHVzID0gU2VsZWN0b3JDb21waWxl cjo6Y29tcGlsZVNlbGVjdG9yKHNlbGVjdG9yRGF0YS5zZWxlY3Rvciwgdm0sIFNlbGVjdG9yQ29t cGlsZXI6OlNlbGVjdG9yQ29udGV4dDo6UXVlcnlTZWxlY3Rvciwgc2VsZWN0b3JEYXRhLmNvbXBp bGVkU2VsZWN0b3JDb2RlUmVmKTsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVChzZWxl Y3RvckRhdGEuY29tcGlsYXRpb25TdGF0dXMgIT0gU2VsZWN0b3JDb21waWxhdGlvblN0YXR1czo6 U2VsZWN0b3JDaGVja2VyV2l0aENoZWNraW5nQ29udGV4dCk7CiAgICAgICAgICAgICAgICAgY29t cGlsZWRTZWxlY3RvckNoZWNrZXIgPSBzZWxlY3RvckRhdGEuY29tcGlsZWRTZWxlY3RvckNvZGVS ZWYuY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAg ICAgIGlmIChjb21waWxlZFNlbGVjdG9yQ2hlY2tlcikgewotICAgICAgICAgICAgICAgIGlmIChz ZWxlY3RvckRhdGEuY29tcGlsYXRpb25TdGF0dXMgPT0gU2VsZWN0b3JDb21waWxhdGlvblN0YXR1 czo6U2ltcGxlU2VsZWN0b3JDaGVja2VyKSB7Ci0gICAgICAgICAgICAgICAgICAgIFNlbGVjdG9y Q29tcGlsZXI6OlNpbXBsZVNlbGVjdG9yQ2hlY2tlciBzZWxlY3RvckNoZWNrZXIgPSBTZWxlY3Rv ckNvbXBpbGVyOjpzaW1wbGVTZWxlY3RvckNoZWNrZXJGdW5jdGlvbihjb21waWxlZFNlbGVjdG9y Q2hlY2tlciwgc2VsZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3RhdHVzKTsKLSAgICAgICAgICAgICAg ICAgICAgZXhlY3V0ZUNvbXBpbGVkU2ltcGxlU2VsZWN0b3JDaGVja2VyPFNlbGVjdG9yUXVlcnlU cmFpdD4ocm9vdE5vZGUsIHNlbGVjdG9yQ2hlY2tlciwgb3V0cHV0KTsKLSAgICAgICAgICAgICAg ICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICBBU1NFUlQoc2VsZWN0b3JEYXRhLmNvbXBp bGF0aW9uU3RhdHVzID09IFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6OlNlbGVjdG9yQ2hlY2tl cldpdGhDaGVja2luZ0NvbnRleHQpOwotICAgICAgICAgICAgICAgICAgICBTZWxlY3RvckNvbXBp bGVyOjpTZWxlY3RvckNoZWNrZXJXaXRoQ2hlY2tpbmdDb250ZXh0IHNlbGVjdG9yQ2hlY2tlciA9 IFNlbGVjdG9yQ29tcGlsZXI6OnNlbGVjdG9yQ2hlY2tlckZ1bmN0aW9uV2l0aENoZWNraW5nQ29u dGV4dChjb21waWxlZFNlbGVjdG9yQ2hlY2tlciwgc2VsZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3Rh dHVzKTsKLQotICAgICAgICAgICAgICAgICAgICBTZWxlY3RvckNvbXBpbGVyOjpDaGVja2luZ0Nv bnRleHQgY29udGV4dDsKLSAgICAgICAgICAgICAgICAgICAgY29udGV4dC5lbGVtZW50U3R5bGUg PSBudWxscHRyOwotICAgICAgICAgICAgICAgICAgICBjb250ZXh0LnJlc29sdmluZ01vZGUgPSBT ZWxlY3RvckNoZWNrZXI6OlF1ZXJ5aW5nUnVsZXM7Ci0gICAgICAgICAgICAgICAgICAgIGV4ZWN1 dGVDb21waWxlZFNlbGVjdG9yQ2hlY2tlcldpdGhDb250ZXh0PFNlbGVjdG9yUXVlcnlUcmFpdD4o cm9vdE5vZGUsIHNlbGVjdG9yQ2hlY2tlciwgY29udGV4dCwgb3V0cHV0KTsKLSAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgU2VsZWN0b3JDb21waWxlcjo6U2ltcGxlU2VsZWN0b3JD aGVja2VyIHNlbGVjdG9yQ2hlY2tlciA9IFNlbGVjdG9yQ29tcGlsZXI6OnNpbXBsZVNlbGVjdG9y Q2hlY2tlckZ1bmN0aW9uKGNvbXBpbGVkU2VsZWN0b3JDaGVja2VyLCBzZWxlY3RvckRhdGEuY29t cGlsYXRpb25TdGF0dXMpOworICAgICAgICAgICAgICAgIGV4ZWN1dGVDb21waWxlZFNpbXBsZVNl bGVjdG9yQ2hlY2tlcjxTZWxlY3RvclF1ZXJ5VHJhaXQ+KHJvb3ROb2RlLCBzZWxlY3RvckNoZWNr ZXIsIG91dHB1dCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogI2Vu ZGlmIC8vIEVOQUJMRShDU1NfU0VMRUNUT1JfSklUKQo=