217120 2020-09-29 21:27:26 -0700 [LFC Display] Basic text display 2020-09-29 22:57:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1693306 0 simon.fraser 2020-09-29 21:27:26 -0700 [LFC Display] Basic text display 1693307 1 410092 simon.fraser 2020-09-29 21:29:06 -0700 Created attachment 410092 Patch 1693312 2 ews-feeder 2020-09-29 22:56:15 -0700 Committed r267781: <https://trac.webkit.org/changeset/267781> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410092. 1693313 3 webkit-bug-importer 2020-09-29 22:57:16 -0700 <rdar://problem/69778571> 410092 2020-09-29 21:29:06 -0700 2020-09-29 22:56:16 -0700 Patch bug-217120-20200929212905.patch text/plain 21057 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGEwMzg4NWJmYTI0ODUw OGU3YzlhOTg3M2NlY2M2MjhmM2JlMjIxMy4uMzdkMTQxZTdiNGJlZjU2OTY1YzQ2YWI1MWNkOTk3 YTkyNWNhNjQ5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDIwLTA5LTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtMRkMgRGlzcGxh eV0gQmFzaWMgdGV4dCBkaXNwbGF5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTcxMjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgYmFzaWMgdGV4dCBwYWludGluZyB0byBMRkMgZGlzcGxheS4gRGlz cGxheTo6VGV4dEJveCgpIHJlcHJlc2VudHMgYSBydW4gb2YgdGV4dC4KKyAgICAgICAgRGlzcGxh eTo6VHJlZUJ1aWxkZXIgZ2FpbnMgY29kZSB0byBidWlsZCB0aGUgaW5saW5lIHRyZWUgYnkgdHJh dmVyc2luZyBydW5zLCBhbmQKKyAgICAgICAgQ1NTUGFpbnRlciBnZXRzIHRoZSBhYmlsaXR5IHRv IHBhaW50IHRleHQgYm94ZXMuCisKKyAgICAgICAgKiBTb3VyY2VzLnR4dDoKKyAgICAgICAgKiBX ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogZGlzcGxheS9EaXNw bGF5VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6VHJlZUJ1aWxk ZXI6OmJ1aWxkSW5saW5lRGlzcGxheVRyZWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlz cGxheTo6VHJlZUJ1aWxkZXI6OnJlY3Vyc2l2ZUJ1aWxkRGlzcGxheVRyZWUgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6RGlzcGxheTo6b3V0cHV0RGlzcGxheUJveCk6CisgICAgICAgICogZGlz cGxheS9EaXNwbGF5VHJlZUJ1aWxkZXIuaDoKKyAgICAgICAgKiBkaXNwbGF5L2Nzcy9EaXNwbGF5 Qm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OmlzVGV4dEJveCBjb25zdCk6 CisgICAgICAgICogZGlzcGxheS9jc3MvRGlzcGxheUNTU1BhaW50ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RGlzcGxheTo6Q1NTUGFpbnRlcjo6cGFpbnRCb3hDb250ZW50KToKKyAgICAgICAg KiBkaXNwbGF5L2Nzcy9EaXNwbGF5U3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxh eTo6U3R5bGU6OlN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OlN0eWxlOjphdXRv V3JhcCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpTdHlsZTo6cHJlc2VydmVO ZXdsaW5lIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OlN0eWxlOjpjb2xsYXBz ZVdoaXRlU3BhY2UgY29uc3QpOgorICAgICAgICAqIGRpc3BsYXkvY3NzL0Rpc3BsYXlTdHlsZS5o OgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6U3R5bGU6OmNvbG9yIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkRpc3BsYXk6OlN0eWxlOjpmb250Q2FzY2FkZSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpEaXNwbGF5OjpTdHlsZTo6Zm9udE1ldHJpY3MgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6RGlzcGxheTo6U3R5bGU6OndoaXRlU3BhY2UgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6RGlzcGxheTo6U3R5bGU6OnRhYlNpemUgY29uc3QpOgorICAgICAgICAqIGRpc3BsYXkv Y3NzL0Rpc3BsYXlUZXh0Qm94LmNwcDogQ29waWVkIGZyb20gU291cmNlL1dlYkNvcmUvZGlzcGxh eS9EaXNwbGF5VHJlZUJ1aWxkZXIuaC4KKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OlRleHRC b3g6OlRleHRCb3gpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6bV90ZXh0KToKKyAgICAg ICAgKFdlYkNvcmU6OkRpc3BsYXk6OlRleHRCb3g6OmRlYnVnRGVzY3JpcHRpb24gY29uc3QpOgor ICAgICAgICAqIGRpc3BsYXkvY3NzL0Rpc3BsYXlUZXh0Qm94Lmg6IENvcGllZCBmcm9tIFNvdXJj ZS9XZWJDb3JlL2Rpc3BsYXkvRGlzcGxheVRyZWVCdWlsZGVyLmguCisgICAgICAgIChXZWJDb3Jl OjpEaXNwbGF5OjpUZXh0Qm94OjpleHBhbnNpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 RGlzcGxheTo6VGV4dEJveDo6dGV4dCBjb25zdCk6CisKIDIwMjAtMDktMjkgIFBlbmcgTGl1ICA8 cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBbTWVkaWEgaW4gR1BVIFByb2Nlc3NdIFVz ZSBWaWRlb0xheWVyTWFuYWdlciB0byBtYW5hZ2UgbGF5ZXJzIG9mIE1lZGlhUGxheWVyUHJpdmF0 ZVJlbW90ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQgYi9Tb3VyY2Uv V2ViQ29yZS9Tb3VyY2VzLnR4dAppbmRleCBkMzM2ODc2NDIxODc3ZTExYTg2N2YyNmMwNTZiNzA3 MzYzYmRkMzUzLi5hMzdkNDA2YTNmNTk1NjJiN2E5M2YzNTJjNjVlMTc3N2NjNzVmY2JkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Tb3VyY2VzLnR4dAorKysgYi9Tb3VyY2UvV2ViQ29yZS9T b3VyY2VzLnR4dApAQCAtODAzLDYgKzgwMyw3IEBAIGRpc3BsYXkvY3NzL0Rpc3BsYXlDU1NQYWlu dGVyLmNwcAogZGlzcGxheS9jc3MvRGlzcGxheUltYWdlQm94LmNwcAogZGlzcGxheS9jc3MvRGlz cGxheVJlcGxhY2VkQm94LmNwcAogZGlzcGxheS9jc3MvRGlzcGxheVN0eWxlLmNwcAorZGlzcGxh eS9jc3MvRGlzcGxheVRleHRCb3guY3BwCiBkaXNwbGF5L0Rpc3BsYXlMYXllckNvbnRyb2xsZXIu Y3BwCiBkaXNwbGF5L0Rpc3BsYXlUcmVlLmNwcAogZGlzcGxheS9EaXNwbGF5VHJlZUJ1aWxkZXIu Y3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKaW5kZXggYjg2NDE3NDU2YzI4YjI0YWRiMDgzZmQ3MmNlNDI0ZmU1NWFjZWI2MC4uNGIwYzlm MGU0NjU4ZGIzOTU2ZjgyMTQyYTgyZDVlZjFmOWQyOTA5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNjAwNCw2ICs2MDA0LDgg QEAKIAkJMEZBMEEwRTUyM0FFQUEzNTAwMEVFQjk0IC8qIGRpYWxvZy5jc3MgKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0 ZXh0LmNzczsgcGF0aCA9IGRpYWxvZy5jc3M7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTBGQTI0RDc3MTYyREY5MTkwMEEzRjRDMCAvKiBHcmFwaGljc0xheWVyVXBkYXRlci5jcHAgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBHcmFwaGljc0xheWVyVXBkYXRlci5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGQTI0RDc4MTYyREY5MTkwMEEzRjRD MCAvKiBHcmFwaGljc0xheWVyVXBkYXRlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBHcmFwaGljc0xheWVyVXBkYXRlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owor CQkwRkIwNjg5NDI1MjQzQjkwMDAxRThFNzUgLyogRGlzcGxheVRleHRCb3guY3BwICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAu Y3BwOyBwYXRoID0gRGlzcGxheVRleHRCb3guY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OworCQkwRkIwNjg5NjI1MjQzQjkwMDAxRThFNzUgLyogRGlzcGxheVRleHRCb3guaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gRGlzcGxheVRleHRCb3guaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ MEZCNjI1MkMxOERFMUIxNTAwQTA3QzA1IC8qIEdlb21ldHJ5VXRpbGl0aWVzLmNwcCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEdlb21ldHJ5VXRpbGl0aWVzLmNwcDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMEZCNjI1MkQxOERFMUIxNTAwQTA3QzA1IC8qIEdl b21ldHJ5VXRpbGl0aWVzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEdlb21l dHJ5VXRpbGl0aWVzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGQjg4OTBDMTY3 RDMwMTYwMDEwQ0RBNSAvKiBTY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUuY3BwICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlLmNwcDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTE3NTEwLDYgKzE3NTEyLDggQEAKIAkJCQkw RkZGMUI3OTI1MUJDNjU3MDA5ODc5NUEgLyogRGlzcGxheVJlcGxhY2VkQm94LmggKi8sCiAJCQkJ MEZGRjFCNzYyNTFCQzY1NzAwOTg3OTVBIC8qIERpc3BsYXlTdHlsZS5jcHAgKi8sCiAJCQkJMEZG RjFCNzMyNTFCQzY1NzAwOTg3OTVBIC8qIERpc3BsYXlTdHlsZS5oICovLAorCQkJCTBGQjA2ODk0 MjUyNDNCOTAwMDFFOEU3NSAvKiBEaXNwbGF5VGV4dEJveC5jcHAgKi8sCisJCQkJMEZCMDY4OTYy NTI0M0I5MDAwMUU4RTc1IC8qIERpc3BsYXlUZXh0Qm94LmggKi8sCiAJCQkpOwogCQkJcGF0aCA9 IGNzczsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9kaXNwbGF5L0Rpc3BsYXlUcmVlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kaXNw bGF5L0Rpc3BsYXlUcmVlQnVpbGRlci5jcHAKaW5kZXggMjNhNGMwOGRiNGYwZmNmNmEwNzhlNDI3 OTJiZDYzYzgwZTdkYTUxMy4uYzhiMjVjMDQ2YzcxZDUzMzA3Y2E5ZjI1MzYyZjcxYmRjZDBlOTU3 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9EaXNwbGF5VHJlZUJ1aWxkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvRGlzcGxheVRyZWVCdWlsZGVyLmNwcApA QCAtMzEsNyArMzEsOSBAQAogI2luY2x1ZGUgIkRpc3BsYXlDb250YWluZXJCb3guaCIKICNpbmNs dWRlICJEaXNwbGF5SW1hZ2VCb3guaCIKICNpbmNsdWRlICJEaXNwbGF5U3R5bGUuaCIKKyNpbmNs dWRlICJEaXNwbGF5VGV4dEJveC5oIgogI2luY2x1ZGUgIkRpc3BsYXlUcmVlLmgiCisjaW5jbHVk ZSAiSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgiCiAjaW5jbHVkZSAiTGF5b3V0Qm94R2VvbWV0cnku aCIKICNpbmNsdWRlICJMYXlvdXRDaGlsZEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiTGF5b3V0Q29u dGFpbmVyQm94LmgiCkBAIC04MCw3ICs4MiwzNiBAQCBzdGQ6OnVuaXF1ZV9wdHI8VHJlZT4gVHJl ZUJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExheW91dDo6TGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKQog ICAgIHJldHVybiBtYWtlVW5pcXVlPFRyZWU+KFdURk1vdmUocm9vdERpc3BsYXlDb250YWluZXJC b3gpKTsKIH0KIAotQm94KiBUcmVlQnVpbGRlcjo6cmVjdXJzaXZlQnVpbGREaXNwbGF5VHJlZShj b25zdCBMYXlvdXQ6OkxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgTGF5b3V0U2l6ZSBvZmZzZXRG cm9tUm9vdCwgY29uc3QgTGF5b3V0OjpCb3gmIGJveCwgRGlzcGxheTo6Q29udGFpbmVyQm94JiBw YXJlbnREaXNwbGF5Qm94LCBEaXNwbGF5OjpCb3gqIHByZXZpb3VzU2libGluZ0JveCkgY29uc3QK K3ZvaWQgVHJlZUJ1aWxkZXI6OmJ1aWxkSW5saW5lRGlzcGxheVRyZWUoY29uc3QgTGF5b3V0OjpM YXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIExheW91dFNpemUgb2Zmc2V0RnJvbVJvb3QsIGNvbnN0 IExheW91dDo6Q29udGFpbmVyQm94JiBpbmxpbmVGb3JtYXR0aW5nUm9vdCwgQ29udGFpbmVyQm94 JiBwYXJlbnREaXNwbGF5Qm94KSBjb25zdAoreworICAgIGF1dG8mIGlubGluZUZvcm1hdHRpbmdT dGF0ZSA9IGxheW91dFN0YXRlLmVzdGFibGlzaGVkSW5saW5lRm9ybWF0dGluZ1N0YXRlKGlubGlu ZUZvcm1hdHRpbmdSb290KTsKKworICAgIEJveCogcHJldmlvdXNTaWJsaW5nQm94ID0gbnVsbHB0 cjsKKworICAgIGZvciAoYXV0byYgcnVuIDogaW5saW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVSdW5z KCkpIHsKKyAgICAgICAgYXV0byYgbGluZUdlb21ldHJ5ID0gaW5saW5lRm9ybWF0dGluZ1N0YXRl LmxpbmVzKCkuYXQocnVuLmxpbmVJbmRleCgpKTsKKworICAgICAgICBhdXRvIGxpbmVSZWN0ID0g bGluZUdlb21ldHJ5LmxvZ2ljYWxSZWN0KCk7CisgICAgICAgIGF1dG8gbGluZUxheW91dFJlY3Qg PSBMYXlvdXRSZWN0IHsgbGluZVJlY3QubGVmdCgpLCBsaW5lUmVjdC50b3AoKSwgbGluZVJlY3Qu d2lkdGgoKSwgbGluZVJlY3QuaGVpZ2h0KCkgfTsKKworICAgICAgICBhdXRvIHJ1blJlY3QgPSBM YXlvdXRSZWN0IHsgcnVuLmxvZ2ljYWxMZWZ0KCksIHJ1bi5sb2dpY2FsVG9wKCksIHJ1bi5sb2dp Y2FsV2lkdGgoKSwgcnVuLmxvZ2ljYWxIZWlnaHQoKSB9OworICAgICAgICBydW5SZWN0Lm1vdmVC eShsaW5lTGF5b3V0UmVjdC5sb2NhdGlvbigpKTsKKyAgICAgICAgcnVuUmVjdC5tb3ZlKG9mZnNl dEZyb21Sb290KTsKKworICAgICAgICBhdXRvIHN0eWxlID0gU3R5bGUgeyBydW4ubGF5b3V0Qm94 KCkuc3R5bGUoKSB9OworICAgICAgICBhdXRvIHRleHRCb3ggPSBtYWtlVW5pcXVlPFRleHRCb3g+ KHNuYXBSZWN0VG9EZXZpY2VQaXhlbHMocnVuUmVjdCwgbV9waXhlbFNuYXBwaW5nRmFjdG9yKSwg V1RGTW92ZShzdHlsZSksIHJ1bik7CisgICAgICAgIGF1dG8gdGV4dEJveFB0ciA9IHRleHRCb3gu Z2V0KCk7CisKKyAgICAgICAgaWYgKHByZXZpb3VzU2libGluZ0JveCkKKyAgICAgICAgICAgIHBy ZXZpb3VzU2libGluZ0JveC0+c2V0TmV4dFNpYmxpbmcoV1RGTW92ZSh0ZXh0Qm94KSk7CisgICAg ICAgIGVsc2UKKyAgICAgICAgICAgIHBhcmVudERpc3BsYXlCb3guc2V0Rmlyc3RDaGlsZChXVEZN b3ZlKHRleHRCb3gpKTsKKworICAgICAgICBwcmV2aW91c1NpYmxpbmdCb3ggPSB0ZXh0Qm94UHRy OworICAgIH0KK30KKworQm94KiBUcmVlQnVpbGRlcjo6cmVjdXJzaXZlQnVpbGREaXNwbGF5VHJl ZShjb25zdCBMYXlvdXQ6OkxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgTGF5b3V0U2l6ZSBvZmZz ZXRGcm9tUm9vdCwgY29uc3QgTGF5b3V0OjpCb3gmIGJveCwgQ29udGFpbmVyQm94JiBwYXJlbnRE aXNwbGF5Qm94LCBCb3gqIHByZXZpb3VzU2libGluZ0JveCkgY29uc3QKIHsKICAgICBhdXRvIGdl b21ldHJ5ID0gbGF5b3V0U3RhdGUuZ2VvbWV0cnlGb3JCb3goYm94KTsKICAgICBhdXRvIGRpc3Bs YXlCb3ggPSBkaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGdlb21ldHJ5LCBib3gsIG9mZnNldEZyb21S b290KTsKQEAgLTEwNCwxMiArMTM1LDE1IEBAIEJveCogVHJlZUJ1aWxkZXI6OnJlY3Vyc2l2ZUJ1 aWxkRGlzcGxheVRyZWUoY29uc3QgTGF5b3V0OjpMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhCiAKICAg ICBhdXRvJiBkaXNwbGF5Q29udGFpbmVyQm94ID0gZG93bmNhc3Q8Q29udGFpbmVyQm94PigqcmVz dWx0KTsKIAorICAgIGlmIChsYXlvdXRDb250YWluZXJCb3guZXN0YWJsaXNoZXNJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dCgpKSB7CisgICAgICAgIGJ1aWxkSW5saW5lRGlzcGxheVRyZWUobGF5b3V0 U3RhdGUsIG9mZnNldEZyb21Sb290LCBkb3duY2FzdDxMYXlvdXQ6OkNvbnRhaW5lckJveD4obGF5 b3V0Q29udGFpbmVyQm94KSwgZGlzcGxheUNvbnRhaW5lckJveCk7CisgICAgICAgIHJldHVybiBy ZXN1bHQ7CisgICAgfQorCiAgICAgRGlzcGxheTo6Qm94KiBjdXJyU2libGluZ0Rpc3BsYXlCb3gg PSBudWxscHRyOwogICAgIGZvciAoYXV0byYgY2hpbGQgOiBMYXlvdXQ6OmNoaWxkcmVuT2ZUeXBl PExheW91dDo6Qm94PihsYXlvdXRDb250YWluZXJCb3gpKSB7Ci0gICAgICAgIGlmICghbGF5b3V0 U3RhdGUuaGFzQm94R2VvbWV0cnkoY2hpbGQpKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAg ICAgICAgY3VyclNpYmxpbmdEaXNwbGF5Qm94ID0gcmVjdXJzaXZlQnVpbGREaXNwbGF5VHJlZShs YXlvdXRTdGF0ZSwgb2Zmc2V0RnJvbVJvb3QsIGNoaWxkLCBkaXNwbGF5Q29udGFpbmVyQm94LCBj dXJyU2libGluZ0Rpc3BsYXlCb3gpOworICAgICAgICBpZiAobGF5b3V0U3RhdGUuaGFzQm94R2Vv bWV0cnkoY2hpbGQpKQorICAgICAgICAgICAgY3VyclNpYmxpbmdEaXNwbGF5Qm94ID0gcmVjdXJz aXZlQnVpbGREaXNwbGF5VHJlZShsYXlvdXRTdGF0ZSwgb2Zmc2V0RnJvbVJvb3QsIGNoaWxkLCBk aXNwbGF5Q29udGFpbmVyQm94LCBjdXJyU2libGluZ0Rpc3BsYXlCb3gpOwogICAgIH0KIAogICAg IHJldHVybiByZXN1bHQ7CkBAIC0xNjcsNyArMjAxLDcgQEAgc3RhdGljIHZvaWQgb3V0cHV0RGlz cGxheUJveChUZXh0U3RyZWFtJiBzdHJlYW0sIGNvbnN0IEJveCYgZGlzcGxheUJveCwgdW5zaWdu ZWQKICAgICBzdHJlYW0ud3JpdGVJbmRlbnQoKTsKIAogICAgIHN0cmVhbSA8PCBkaXNwbGF5Qm94 LmRlYnVnRGVzY3JpcHRpb24oKTsKLSAgICBzdHJlYW0ubmV4dExpbmUoKTsKKyAgICBzdHJlYW0g PDwgIlxuIjsKIH0KIAogc3RhdGljIHZvaWQgb3V0cHV0RGlzcGxheVRyZWUoVGV4dFN0cmVhbSYg c3RyZWFtLCBjb25zdCBCb3gmIGRpc3BsYXlCb3gsIHVuc2lnbmVkIGRlcHRoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9EaXNwbGF5VHJlZUJ1aWxkZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2Rpc3BsYXkvRGlzcGxheVRyZWVCdWlsZGVyLmgKaW5kZXggZTM0OGUyMmMzYjhkNWIy MGJhYjNkNGIxYzBiMzc1Y2ExNDM3MTY2Ni4uMWM2NGY2MDIxOTk5OTAxZTkzNDUzMmRmNWZlNzRh YWRmY2RmODNmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9EaXNwbGF5VHJl ZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L0Rpc3BsYXlUcmVlQnVpbGRl ci5oCkBAIC01NSw2ICs1NSw4IEBAIHByaXZhdGU6CiAKICAgICBCb3gqIHJlY3Vyc2l2ZUJ1aWxk RGlzcGxheVRyZWUoY29uc3QgTGF5b3V0OjpMYXlvdXRTdGF0ZSYsIExheW91dFNpemUgb2Zmc2V0 RnJvbVJvb3QsIGNvbnN0IExheW91dDo6Qm94JiwgRGlzcGxheTo6Q29udGFpbmVyQm94JiBwYXJl bnREaXNwbGF5Qm94LCBEaXNwbGF5OjpCb3gqIHByZXZpb3VzU2libGluZ0JveCA9IG51bGxwdHIp IGNvbnN0OwogCisgICAgdm9pZCBidWlsZElubGluZURpc3BsYXlUcmVlKGNvbnN0IExheW91dDo6 TGF5b3V0U3RhdGUmLCBMYXlvdXRTaXplIG9mZnNldEZyb21Sb290LCBjb25zdCBMYXlvdXQ6OkNv bnRhaW5lckJveCYsIERpc3BsYXk6OkNvbnRhaW5lckJveCYgcGFyZW50RGlzcGxheUJveCkgY29u c3Q7CisKICAgICBmbG9hdCBtX3BpeGVsU25hcHBpbmdGYWN0b3IgeyAxIH07CiB9OwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94LmggYi9Tb3VyY2Uv V2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94LmgKaW5kZXggYzJiNWFkNzRhMjRkMmNhYzkw ZDAwODZjZWNlMDhkNTc4YjRjNzA4NC4uZDg3YzNmYjAyNzE5MGUwOTgxNGJkZTU5MWJlN2NhZTVk ZGM4OWI1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUJv eC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlCb3guaApAQCAtNDQs NiArNDQsNyBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBGbGFncyA6IHVpbnQ4X3QgewogICAg ICAgICBDb250YWluZXJCb3ggICAgPSAxIDw8IDAsCiAgICAgICAgIEltYWdlQm94ICAgICAgICA9 IDEgPDwgMSwKKyAgICAgICAgVGV4dEJveCAgICAgICAgID0gMSA8PCAyLAogICAgIH07CiAKICAg ICBCb3goQWJzb2x1dGVGbG9hdFJlY3QgYm9yZGVyQm94LCBTdHlsZSYmLCBPcHRpb25TZXQ8Rmxh Z3M+ID0geyB9KTsKQEAgLTU2LDYgKzU3LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNDb250YWlu ZXJCb3goKSBjb25zdCB7IHJldHVybiBtX2ZsYWdzLmNvbnRhaW5zKEZsYWdzOjpDb250YWluZXJC b3gpOyB9CiAgICAgYm9vbCBpc0ltYWdlQm94KCkgY29uc3QgeyByZXR1cm4gbV9mbGFncy5jb250 YWlucyhGbGFnczo6SW1hZ2VCb3gpOyB9CiAgICAgYm9vbCBpc1JlcGxhY2VkQm94KCkgY29uc3Qg eyByZXR1cm4gbV9mbGFncy5jb250YWlucyhGbGFnczo6SW1hZ2VCb3gpOyAvKiBhbmQgb3RoZXIg dHlwZXMgbGF0ZXIuICovIH0KKyAgICBib29sIGlzVGV4dEJveCgpIGNvbnN0IHsgcmV0dXJuIG1f ZmxhZ3MuY29udGFpbnMoRmxhZ3M6OlRleHRCb3gpOyB9CiAKICAgICBjb25zdCBCb3gqIG5leHRT aWJsaW5nKCkgY29uc3QgeyByZXR1cm4gbV9uZXh0U2libGluZy5nZXQoKTsgfQogICAgIHZvaWQg c2V0TmV4dFNpYmxpbmcoc3RkOjp1bmlxdWVfcHRyPEJveD4mJik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Q1NTUGFpbnRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Q1NTUGFpbnRlci5jcHAKaW5kZXggZTExNDVjY2ViZTk0 NWIyYjIwYTEzZmM5ZjYxMDVjNmI5YWQ1ZTUyZi4uM2JkMWY0MWJjMDA4MjNkMGI5YzhlNGFiMWIw Yzg0ZjkxNmIxY2Q2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlz cGxheUNTU1BhaW50ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3Bs YXlDU1NQYWludGVyLmNwcApAQCAtMzMsMTAgKzMzLDEyIEBACiAjaW5jbHVkZSAiRGlzcGxheUNv bnRhaW5lckJveC5oIgogI2luY2x1ZGUgIkRpc3BsYXlJbWFnZUJveC5oIgogI2luY2x1ZGUgIkRp c3BsYXlTdHlsZS5oIgorI2luY2x1ZGUgIkRpc3BsYXlUZXh0Qm94LmgiCiAjaW5jbHVkZSAiRGlz cGxheVRyZWUuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJJbnRS ZWN0LmgiCiAjaW5jbHVkZSAiTGF5b3V0U3RhdGUuaCIKKyNpbmNsdWRlICJUZXh0UnVuLmgiCiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBEaXNwbGF5IHsKQEAgLTExMyw2ICsxMTUs MzAgQEAgdm9pZCBDU1NQYWludGVyOjpwYWludEJveENvbnRlbnQoY29uc3QgQm94JiBib3gsIEdy YXBoaWNzQ29udGV4dCYgY29udGV4dCkKIAogICAgICAgICBpZiAoaW1hZ2UpCiAgICAgICAgICAg ICBjb250ZXh0LmRyYXdJbWFnZSgqaW1hZ2UsIGltYWdlUmVjdCk7CisKKyAgICAgICAgcmV0dXJu OworICAgIH0KKyAgICAKKyAgICBpZiAoaXM8VGV4dEJveD4oYm94KSkgeworICAgICAgICBhdXRv JiB0ZXh0Qm94ID0gZG93bmNhc3Q8VGV4dEJveD4oYm94KTsKKyAgICAgICAgaWYgKCF0ZXh0Qm94 LnRleHQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBhdXRvJiBzdHlsZSA9IGJv eC5zdHlsZSgpOworICAgICAgICBhdXRvIHRleHRSZWN0ID0gYm94LmJvcmRlckJveEZyYW1lKCk7 CisKKyAgICAgICAgY29udGV4dC5zZXRTdHJva2VDb2xvcihzdHlsZS5jb2xvcigpKTsKKyAgICAg ICAgY29udGV4dC5zZXRGaWxsQ29sb3Ioc3R5bGUuY29sb3IoKSk7CisKKyAgICAgICAgLy8gRklY TUU6IEFkZCBub24tYmFzZWxpbmUgYWxpZ24gcGFpbnRpbmcKKyAgICAgICAgYXV0byBiYXNlbGlu ZSA9IHRleHRSZWN0LnkoKSArIHN0eWxlLmZvbnRNZXRyaWNzKCkuYXNjZW50KCk7CisgICAgICAg IGF1dG8gZXhwYW5zaW9uID0gdGV4dEJveC5leHBhbnNpb24oKTsKKworICAgICAgICBhdXRvIHRl eHRSdW4gPSBUZXh0UnVuIHsgdGV4dEJveC50ZXh0KCktPmNvbnRlbnQoKS5zdWJzdHJpbmcodGV4 dEJveC50ZXh0KCktPnN0YXJ0KCksIHRleHRCb3gudGV4dCgpLT5sZW5ndGgoKSksIHRleHRSZWN0 LngoKSwgZXhwYW5zaW9uLmhvcml6b250YWxFeHBhbnNpb24sIGV4cGFuc2lvbi5iZWhhdmlvciB9 OworICAgICAgICB0ZXh0UnVuLnNldFRhYlNpemUoIXN0eWxlLmNvbGxhcHNlV2hpdGVTcGFjZSgp LCBzdHlsZS50YWJTaXplKCkpOworICAgICAgICBjb250ZXh0LmRyYXdUZXh0KHN0eWxlLmZvbnRD YXNjYWRlKCksIHRleHRSdW4sIHsgdGV4dFJlY3QueCgpLCBiYXNlbGluZSB9KTsKKyAgICAgICAg CisgICAgICAgIHJldHVybjsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Rpc3BsYXkvY3NzL0Rpc3BsYXlTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nz cy9EaXNwbGF5U3R5bGUuY3BwCmluZGV4IDVkMGFmN2ZmNzRiNWQyNjBmY2E5MDAzM2ZjMTViMzZj ZWI0NGJkYTkuLmNmZDg0Njk2ZTdjODc1N2FkNmQ5YzE4NDkxMGZmYTBhMmJhNWFiZGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlTdHlsZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheVN0eWxlLmNwcApAQCAtMzYsNyArMzYs MTMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIERpc3BsYXkgewogCiBTdHlsZTo6 U3R5bGUoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQorICAgIDogbV9mb250Q2FzY2FkZShzdHls ZS5mb250Q2FzY2FkZSgpKQorICAgICwgbV93aGl0ZVNwYWNlKHN0eWxlLndoaXRlU3BhY2UoKSkK KyAgICAsIG1fdGFiU2l6ZShzdHlsZS50YWJTaXplKCkpCiB7CisgICAgLy8gRklYTUU6IElzIGN1 cnJlbnRDb2xvciByZXNvdmxlZCBoZXJlPworICAgIG1fY29sb3IgPSBzdHlsZS52aXNpdGVkRGVw ZW5kZW50Q29sb3JXaXRoQ29sb3JGaWx0ZXIoQ1NTUHJvcGVydHlDb2xvcik7CisKICAgICBtX2Jh Y2tncm91bmRDb2xvciA9IHN0eWxlLnZpc2l0ZWREZXBlbmRlbnRDb2xvcldpdGhDb2xvckZpbHRl cihDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvcik7CiAKICAgICBjb25zdCBhdXRvJiBib3JkZXJE YXRhID0gc3R5bGUuYm9yZGVyKCk7CkBAIC03Miw2ICs3OCwyMSBAQCBib29sIFN0eWxlOjpoYXNW aXNpYmxlQm9yZGVyKCkgY29uc3QKICAgICByZXR1cm4gbV9ib3JkZXIubGVmdC5pc1Zpc2libGUo IWhhdmVJbWFnZSkgfHwgbV9ib3JkZXIucmlnaHQuaXNWaXNpYmxlKCFoYXZlSW1hZ2UpIHx8IG1f Ym9yZGVyLnRvcC5pc1Zpc2libGUoIWhhdmVJbWFnZSkgfHwgbV9ib3JkZXIuYm90dG9tLmlzVmlz aWJsZSghaGF2ZUltYWdlKTsKIH0KIAorYm9vbCBTdHlsZTo6YXV0b1dyYXAoKSBjb25zdAorewor ICAgIHJldHVybiBSZW5kZXJTdHlsZTo6YXV0b1dyYXAod2hpdGVTcGFjZSgpKTsKK30KKworYm9v bCBTdHlsZTo6cHJlc2VydmVOZXdsaW5lKCkgY29uc3QKK3sKKyAgICByZXR1cm4gUmVuZGVyU3R5 bGU6OnByZXNlcnZlTmV3bGluZSh3aGl0ZVNwYWNlKCkpOworfQorCitib29sIFN0eWxlOjpjb2xs YXBzZVdoaXRlU3BhY2UoKSBjb25zdAoreworICAgIHJldHVybiBSZW5kZXJTdHlsZTo6Y29sbGFw c2VXaGl0ZVNwYWNlKHdoaXRlU3BhY2UoKSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIERpc3BsYXkK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZGlz cGxheS9jc3MvRGlzcGxheVN0eWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNw bGF5U3R5bGUuaAppbmRleCA2ZTBjNWI3M2FmNjM4YWIyMDRjNmUyOThiMDAwNWVjYWRjZjllZmM1 Li5hMDQ5MjQ1YTgyOWY5N2NiZjdlOGI0ZWVhNDFkOTJlOWMyNTM2ZjMzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5U3R5bGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5U3R5bGUuaApAQCAtMjksNyArMjksMTAgQEAKIAogI2lu Y2x1ZGUgIkJvcmRlclZhbHVlLmgiCiAjaW5jbHVkZSAiQ29sb3IuaCIKKyNpbmNsdWRlICJGb250 Q2FzY2FkZS5oIgogI2luY2x1ZGUgIk5pbmVQaWVjZUltYWdlLmgiCisjaW5jbHVkZSAiUmVuZGVy U3R5bGVDb25zdGFudHMuaCIKKyNpbmNsdWRlICJUYWJTaXplLmgiCiAjaW5jbHVkZSA8d3RmL0lz b01hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9PcHRpb25TZXQuaD4KICNpbmNsdWRlIDx3dGYvT3B0 aW9uYWwuaD4KQEAgLTU0LDcgKzU3LDkgQEAgcHVibGljOgogICAgIH07CiAKICAgICBleHBsaWNp dCBTdHlsZShjb25zdCBSZW5kZXJTdHlsZSYpOwotICAgIAorCisgICAgY29uc3QgQ29sb3ImIGNv bG9yKCkgY29uc3QgeyByZXR1cm4gbV9jb2xvcjsgfQorCiAgICAgY29uc3QgQ29sb3ImIGJhY2tn cm91bmRDb2xvcigpIGNvbnN0IHsgcmV0dXJuIG1fYmFja2dyb3VuZENvbG9yOyB9CiAgICAgYm9v bCBoYXNCYWNrZ3JvdW5kKCkgY29uc3Q7CiAgICAgYm9vbCBoYXNCYWNrZ3JvdW5kSW1hZ2UoKSBj b25zdCB7IHJldHVybiBmYWxzZTsgfSAvLyBGSVhNRQpAQCAtNzMsMTAgKzc4LDIxIEBAIHB1Ymxp YzoKIAogICAgIGJvb2wgcGFydGljaXBhdGVzSW5aT3JkZXJTb3J0aW5nKCkgY29uc3QgeyByZXR1 cm4gaXNQb3NpdGlvbmVkKCkgfHwgaXNTdGFja2luZ0NvbnRleHQoKTsgfQogCisgICAgY29uc3Qg Rm9udENhc2NhZGUmIGZvbnRDYXNjYWRlKCkgY29uc3QgeyByZXR1cm4gbV9mb250Q2FzY2FkZTsg fQorICAgIGNvbnN0IEZvbnRNZXRyaWNzJiBmb250TWV0cmljcygpIGNvbnN0IHsgcmV0dXJuIG1f Zm9udENhc2NhZGUuZm9udE1ldHJpY3MoKTsgfQorCisgICAgV2hpdGVTcGFjZSB3aGl0ZVNwYWNl KCkgY29uc3QgeyByZXR1cm4gbV93aGl0ZVNwYWNlOyB9CisgICAgYm9vbCBhdXRvV3JhcCgpIGNv bnN0OworICAgIGJvb2wgcHJlc2VydmVOZXdsaW5lKCkgY29uc3Q7CisgICAgYm9vbCBjb2xsYXBz ZVdoaXRlU3BhY2UoKSBjb25zdDsKKworICAgIGNvbnN0IFRhYlNpemUmIHRhYlNpemUoKSBjb25z dCB7IHJldHVybiBtX3RhYlNpemU7IH0KKwogcHJpdmF0ZToKICAgICB2b2lkIHNldElzUG9zaXRp b25lZChib29sIHZhbHVlKSB7IG1fZmxhZ3Muc2V0KHsgRmxhZ3M6OlBvc2l0aW9uZWQgfSwgdmFs dWUpOyB9CiAgICAgdm9pZCBzZXRJc0Zsb2F0aW5nKGJvb2wgdmFsdWUpIHsgbV9mbGFncy5zZXQo eyBGbGFnczo6RmxvYXRpbmcgfSwgdmFsdWUpOyB9CiAKKyAgICBDb2xvciBtX2NvbG9yOwogICAg IENvbG9yIG1fYmFja2dyb3VuZENvbG9yOwogCiAgICAgc3RydWN0IHsKQEAgLTg4LDYgKzEwNCwx MCBAQCBwcml2YXRlOgogICAgICAgICBOaW5lUGllY2VJbWFnZSBpbWFnZTsKICAgICB9IG1fYm9y ZGVyOwogCisgICAgRm9udENhc2NhZGUgbV9mb250Q2FzY2FkZTsKKyAgICBXaGl0ZVNwYWNlIG1f d2hpdGVTcGFjZTsKKyAgICBUYWJTaXplIG1fdGFiU2l6ZTsKKwogICAgIE9wdGlvbmFsPGludD4g bV96SW5kZXg7CiAgICAgT3B0aW9uU2V0PEZsYWdzPiBtX2ZsYWdzOwogfTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlUZXh0Qm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlUZXh0Qm94LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42Njk5MDQx YzVhN2Q1NWFhYjhlOTJhYzNiYzExYjY0MzQ0NmIzMjllCi0tLSAvZGV2L251bGwKKysrIGIvU291 cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheVRleHRCb3guY3BwCkBAIC0wLDAgKzEsNjUg QEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4g UmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBt dXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAg ICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUg ZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUg SU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICog VEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S IEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hB TEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBE SVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBD T05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9D VVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0Us IERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIg Q0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09O VFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9S IE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiRGlzcGxheVRl eHRCb3guaCIKKworI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQorCisjaW5j bHVkZSA8d3RmL0lzb01hbGxvY0lubGluZXMuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0U3Ry ZWFtLmg+CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKK25hbWVzcGFjZSBEaXNwbGF5IHsKKworVGV4 dEJveDo6VGV4dEJveChBYnNvbHV0ZUZsb2F0UmVjdCBib3JkZXJCb3gsIFN0eWxlJiYgZGlzcGxh eVN0eWxlLCBjb25zdCBMYXlvdXQ6OkxpbmVSdW4mIGxpbmVSdW4pCisgICAgOiBCb3goYm9yZGVy Qm94LCBXVEZNb3ZlKGRpc3BsYXlTdHlsZSksIHsgRmxhZ3M6OlRleHRCb3ggfSkKKyAgICAsIG1f ZXhwYW5zaW9uKGxpbmVSdW4uZXhwYW5zaW9uKCkpCisgICAgLCBtX3RleHQobGluZVJ1bi50ZXh0 KCkpCit7Cit9CisKK1N0cmluZyBUZXh0Qm94OjpkZWJ1Z0Rlc2NyaXB0aW9uKCkgY29uc3QKK3sK KyAgICBUZXh0U3RyZWFtIHN0cmVhbTsKKworICAgIHN0cmVhbSA8PCAidGV4dCBib3ggIiA8PCBi b3JkZXJCb3hGcmFtZSgpIDw8ICIgKCIgPDwgdGhpcyA8PCAiKSI7CisgICAgYXV0byB0ZXh0Q29u dGVudCA9IHRleHQoKS0+Y29udGVudCgpLnN1YnN0cmluZyh0ZXh0KCktPnN0YXJ0KCksIHRleHQo KS0+bGVuZ3RoKCkpOworICAgIHRleHRDb250ZW50LnJlcGxhY2VXaXRoTGl0ZXJhbCgnXFwnLCAi XFxcXCIpOworICAgIHRleHRDb250ZW50LnJlcGxhY2VXaXRoTGl0ZXJhbCgnXG4nLCAiXFxuIik7 CisgICAgY29uc3Qgc2l6ZV90IG1heFByaW50ZWRMZW5ndGggPSA4MDsKKyAgICBpZiAodGV4dENv bnRlbnQubGVuZ3RoKCkgPiBtYXhQcmludGVkTGVuZ3RoKSB7CisgICAgICAgIGF1dG8gc3Vic3Ry aW5nID0gdGV4dENvbnRlbnQuc3Vic3RyaW5nKDAsIG1heFByaW50ZWRMZW5ndGgpOworICAgICAg ICBzdHJlYW0gPDwgIiBcIiIgPDwgc3Vic3RyaW5nIDw8ICJcIuKApiI7CisgICAgfSBlbHNlCisg ICAgICAgIHN0cmVhbSA8PCAiIFwiIiA8PCB0ZXh0Q29udGVudCA8PCAiXCIiOworCisgICAgcmV0 dXJuIHN0cmVhbS5yZWxlYXNlKCk7Cit9CisKK30gLy8gbmFtZXNwYWNlIERpc3BsYXkKK30gLy8g bmFtZXNwYWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19D T05URVhUKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheVRl eHRCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlUZXh0Qm94LmgKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uNmU0OTY1NzVkYWIxOTkwZDFiMGNmODRjY2Y2Yzg5MjIyYjNmMjVjNwotLS0gL2Rl di9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlUZXh0Qm94LmgK QEAgLTAsMCArMSw1OCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFy ZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4g dGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92 aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9W SURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5E IEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBB TkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJ TiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJ QUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1Q TEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VT OyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQ VElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVU SEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNwcmFnbWEgb25jZQorCisjaWYgRU5BQkxF KExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCisKKyNpbmNsdWRlICJEaXNwbGF5Qm94LmgiCisj aW5jbHVkZSAiSW5saW5lTGluZVJ1bi5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7CituYW1lc3Bh Y2UgRGlzcGxheSB7CisKK2NsYXNzIFRleHRCb3ggOiBwdWJsaWMgQm94IHsKKyAgICBXVEZfTUFL RV9GQVNUX0FMTE9DQVRFRF9XSVRIX0hFQVBfSURFTlRJRklFUihUZXh0Qm94KTsKK3B1YmxpYzoK KworICAgIFRleHRCb3goQWJzb2x1dGVGbG9hdFJlY3QgYm9yZGVyQm94LCBTdHlsZSYmLCBjb25z dCBMYXlvdXQ6OkxpbmVSdW4mKTsKKworICAgIExheW91dDo6TGluZVJ1bjo6RXhwYW5zaW9uIGV4 cGFuc2lvbigpIGNvbnN0IHsgcmV0dXJuIG1fZXhwYW5zaW9uOyB9CisgICAgT3B0aW9uYWw8TGF5 b3V0OjpMaW5lUnVuOjpUZXh0PiB0ZXh0KCkgY29uc3Qge3JldHVybiBtX3RleHQ7IH0KKworcHJp dmF0ZToKKworICAgIFN0cmluZyBkZWJ1Z0Rlc2NyaXB0aW9uKCkgY29uc3QgZmluYWw7CisgICAg CisgICAgTGF5b3V0OjpMaW5lUnVuOjpFeHBhbnNpb24gbV9leHBhbnNpb247CisgICAgT3B0aW9u YWw8TGF5b3V0OjpMaW5lUnVuOjpUZXh0PiBtX3RleHQ7Cit9OworCit9IC8vIG5hbWVzcGFjZSBE aXNwbGF5Cit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKK1NQRUNJQUxJWkVfVFlQRV9UUkFJVFNf RElTUExBWV9CT1goVGV4dEJveCwgaXNUZXh0Qm94KCkpCisKKyNlbmRpZiAvLyBFTkFCTEUoTEFZ T1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkK