206592 2020-01-22 09:53:09 -0800 [LFC][IFC] Use "inline box" or "atomic inline level box" instead of inline container 2020-01-22 20:49:33 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1609589 0 zalan 2020-01-22 09:53:09 -0800 inline container is not a spec term 1609590 1 webkit-bug-importer 2020-01-22 09:53:25 -0800 <rdar://problem/58799970> 1609592 2 388433 zalan 2020-01-22 09:54:56 -0800 Created attachment 388433 Patch 1609851 3 388484 zalan 2020-01-22 16:44:38 -0800 Created attachment 388484 Patch 1609928 4 388509 zalan 2020-01-22 18:52:58 -0800 Created attachment 388509 Patch 1609948 5 388509 commit-queue 2020-01-22 20:49:31 -0800 Comment on attachment 388509 Patch Clearing flags on attachment: 388509 Committed r254961: <https://trac.webkit.org/changeset/254961> 1609949 6 commit-queue 2020-01-22 20:49:33 -0800 All reviewed patches have been landed. Closing bug. 388433 2020-01-22 09:54:56 -0800 2020-01-22 11:04:48 -0800 Patch bug-206592-20200122095455.patch text/plain 8523 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjI3ZThlMTI2N2QyMjll NzBiZjRmZmQ4YmY2NDgwMjhkNDY2ODQxZi4uMGU3MDUxMTcwMmQwYTNjZTE3ODk2OTk0MjkyY2Fm MjRjOTg5ZTI4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBVc2UgImlu bGluZSBib3giIG9yICJhdG9taWMgaW5saW5lIGxldmVsIGJveCIgaW5zdGVhZCBvZiBpbmxpbmUg Y29udGFpbmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDY1OTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4Nzk5OTcwPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElubGluZSBjb250YWluZXIgaXMg bm90IGEgc3BlYyB0ZXJtLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhvcml6b250YWxBbmRWZXJ0aWNhbEdlb21ldHJ5 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb2xsZWN0SW5saW5lQ29udGVudElmTmVlZGVk KToKKyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpCb3g6OmlzSW5saW5lQm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Qm94Ojppc0F0b21pY0lubGluZUxldmVsQm94IGNvbnN0KToKKyAgICAgICAg KiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Qm94Ojppc0NvbnRhaW5lciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJv eDo6aXNCbG9ja0NvbnRhaW5lciBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJveDo6aXNJbmxpbmVDb250YWluZXIgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAq IGxheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6b3V0cHV0TGF5b3V0Qm94KToKKwogMjAyMC0wMS0yMiAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIERvIG5vdCBjcmVhdGUgYSBGb3Jt YXR0aW5nQ29udGV4dCB0byBjb21wdXRlIGludHJpbnNpYyB3aWR0aCB1bmxlc3MgdGhlcmUncyBz b21lIGNvbnRlbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggODM2 ZmJmOWE4Y2RlZTU0OTljOGIxMjkwOTZkYTczZmQwMWVjNTY2NC4uNTMzNGQyNjk5YTAyZGQ4ODUz ZTM3N2ZkYjIzNTZlM2JjMjRhZGFhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcApAQCAtMTU2LDggKzE1Niw4IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6Omxh eW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdChjb25zdCBCb3gmIGZvcm1hdHRpbmdDCiAKIHZvaWQg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIb3Jpem9udGFsQW5kVmVydGljYWxHZW9t ZXRyeShjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBo b3Jpem9udGFsQ29uc3RyYWludHMpCiB7Ci0gICAgaWYgKGlzPENvbnRhaW5lcj4obGF5b3V0Qm94 KSkgewotICAgICAgICAvLyBJbmxpbmUgY29udGFpbmVycyAoPHNwYW4+KSBjYW4ndCBnZXQgc2l6 ZWQvcG9zaXRpb25lZCB5ZXQuIEF0IHRoaXMgcG9pbnQgd2UgY2FuIG9ubHkgY29tcHV0ZSB0aGVp ciBtYXJnaW5zLCBib3JkZXJzIGFuZCBwYWRkaW5ncy4KKyAgICBpZiAobGF5b3V0Qm94LmlzSW5s aW5lQm94KCkpIHsKKyAgICAgICAgLy8gSW5saW5lIGJveGVzICg8c3Bhbj4pIGNhbid0IGdldCBz aXplZC9wb3NpdGlvbmVkIHlldC4gQXQgdGhpcyBwb2ludCB3ZSBjYW4gb25seSBjb21wdXRlIHRo ZWlyIG1hcmdpbnMsIGJvcmRlcnMgYW5kIHBhZGRpbmdzLgogICAgICAgICBjb21wdXRlSG9yaXpv bnRhbE1hcmdpbihsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CiAgICAgICAgIGNv bXB1dGVCb3JkZXJBbmRQYWRkaW5nKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsK ICAgICAgICAgLy8gSW5saW5lIGNvbnRhaW5lcnMgaGF2ZSAwIGNvbXB1dGVkIHZlcnRpY2FsIG1h cmdpbnMuCkBAIC0yMDEsNyArMjAxLDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dp ZHRoQ29uc3RyYWludHMgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW4KICAgICAg ICAgaWYgKGxheW91dEJveC0+ZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKSB7CiAgICAg ICAgICAgICBmb3JtYXR0aW5nQ29udGV4dFJvb3RMaXN0LmFwcGVuZChsYXlvdXRCb3gpOwogICAg ICAgICAgICAgY29tcHV0ZUludHJpbnNpY1dpZHRoRm9yRm9ybWF0dGluZ1Jvb3QoKmxheW91dEJv eCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKLSAgICAgICAgfSBlbHNlIGlmIChsYXlvdXRCb3gt PmlzUmVwbGFjZWQoKSB8fCBpczxDb250YWluZXI+KCpsYXlvdXRCb3gpKSB7CisgICAgICAgIH0g ZWxzZSBpZiAobGF5b3V0Qm94LT5pc1JlcGxhY2VkKCkgfHwgbGF5b3V0Qm94LT5pc0lubGluZUJv eCgpKSB7CiAgICAgICAgICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZygqbGF5b3V0Qm94LCBo b3Jpem9udGFsQ29uc3RyYWludHMpOwogICAgICAgICAgICAgLy8gaW5saW5lLWJsb2NrIGFuZCBy ZXBsYWNlZC4KICAgICAgICAgICAgIGF1dG8gbmVlZHNXaWR0aENvbXB1dGF0aW9uID0gbGF5b3V0 Qm94LT5pc1JlcGxhY2VkKCk7CkBAIC0zNDAsMTQgKzM0MCwxMSBAQCB2b2lkIElubGluZUZvcm1h dHRpbmdDb250ZXh0Ojpjb2xsZWN0SW5saW5lQ29udGVudElmTmVlZGVkKCkKICAgICBpZiAocm9v dCgpLmhhc0luRmxvd09yRmxvYXRpbmdDaGlsZCgpKQogICAgICAgICBsYXlvdXRRdWV1ZS5hcHBl bmQocm9vdCgpLmZpcnN0SW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpOwogICAgIHdoaWxlICghbGF5 b3V0UXVldWUuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGF1dG8gdHJlYXRBc0lubGluZUNvbnRhaW5l ciA9IFtdKGF1dG8mIGxheW91dEJveCkgewotICAgICAgICAgICAgcmV0dXJuIGlzPENvbnRhaW5l cj4obGF5b3V0Qm94KSAmJiAhbGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQo KTsKLSAgICAgICAgfTsKICAgICAgICAgd2hpbGUgKHRydWUpIHsKICAgICAgICAgICAgIGF1dG8m IGxheW91dEJveCA9ICpsYXlvdXRRdWV1ZS5sYXN0KCk7Ci0gICAgICAgICAgICBpZiAoIXRyZWF0 QXNJbmxpbmVDb250YWluZXIobGF5b3V0Qm94KSkKKyAgICAgICAgICAgIGlmICghbGF5b3V0Qm94 LmlzSW5saW5lQm94KCkpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAvLyBU aGlzIGlzIHRoZSBzdGFydCBvZiBhbiBpbmxpbmUgY29udGFpbmVyIChlLmcuIDxzcGFuPikuCisg ICAgICAgICAgICAvLyBUaGlzIGlzIHRoZSBzdGFydCBvZiBhbiBpbmxpbmUgYm94IChlLmcuIDxz cGFuPikuCiAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkSW5saW5lSXRlbSh7IGxheW91 dEJveCwgSW5saW5lSXRlbTo6VHlwZTo6Q29udGFpbmVyU3RhcnQgfSk7CiAgICAgICAgICAgICBh dXRvJiBjb250YWluZXIgPSBkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCk7CiAgICAgICAg ICAgICBpZiAoIWNvbnRhaW5lci5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKSkKQEAgLTM1OCw3 ICszNTUsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb2xsZWN0SW5saW5lQ29u dGVudElmTmVlZGVkKCkKICAgICAgICAgd2hpbGUgKCFsYXlvdXRRdWV1ZS5pc0VtcHR5KCkpIHsK ICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9ICpsYXlvdXRRdWV1ZS50YWtlTGFzdCgpOwog ICAgICAgICAgICAgLy8gVGhpcyBpcyB0aGUgZW5kIG9mIGFuIGlubGluZSBjb250YWluZXIgKGUu Zy4gPC9zcGFuPikuCi0gICAgICAgICAgICBpZiAodHJlYXRBc0lubGluZUNvbnRhaW5lcihsYXlv dXRCb3gpKQorICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJveCgpKQogICAgICAg ICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRJbmxpbmVJdGVtKHsgbGF5b3V0Qm94LCBJbmxp bmVJdGVtOjpUeXBlOjpDb250YWluZXJFbmQgfSk7CiAgICAgICAgICAgICBlbHNlIGlmIChsYXlv dXRCb3guaXNMaW5lQnJlYWtCb3goKSkKICAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUu YWRkSW5saW5lSXRlbSh7IGxheW91dEJveCwgSW5saW5lSXRlbTo6VHlwZTo6SGFyZExpbmVCcmVh ayB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91 dEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3Bw CmluZGV4IDdkNjQ3MTJkOTc0ZWVhZWQzY2E5NTZiMzM5Njg5OWNkZThiZjg0YTMuLjIzNTNjM2Uz ODE0NmZmMmEwNDBhOWJmZGRjMjc2MWU2ZTk0N2M3MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcApAQCAtMzA4LDYgKzMwOCwyMCBAQCBib29s IEJveDo6aXNJbmxpbmVMZXZlbEJveCgpIGNvbnN0CiAgICAgcmV0dXJuIGRpc3BsYXkgPT0gRGlz cGxheVR5cGU6OklubGluZSB8fCBpc0lubGluZUJsb2NrQm94KCkgfHwgZGlzcGxheSA9PSBEaXNw bGF5VHlwZTo6SW5saW5lVGFibGU7CiB9CiAKK2Jvb2wgQm94Ojppc0lubGluZUJveCgpIGNvbnN0 Cit7CisgICAgLy8gQW4gaW5saW5lIGJveCBpcyBvbmUgdGhhdCBpcyBib3RoIGlubGluZS1sZXZl bCBhbmQgd2hvc2UgY29udGVudHMgcGFydGljaXBhdGUgaW4gaXRzIGNvbnRhaW5pbmcgaW5saW5l IGZvcm1hdHRpbmcgY29udGV4dC4KKyAgICAvLyBBIG5vbi1yZXBsYWNlZCBlbGVtZW50IHdpdGgg YSAnZGlzcGxheScgdmFsdWUgb2YgJ2lubGluZScgZ2VuZXJhdGVzIGFuIGlubGluZSBib3guCisg ICAgcmV0dXJuIG1fc3R5bGUuZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpJbmxpbmUgJiYgIWlz UmVwbGFjZWQoKTsKK30KKworYm9vbCBCb3g6OmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSBjb25z dAoreworICAgIC8vIElubGluZS1sZXZlbCBib3hlcyB0aGF0IGFyZSBub3QgaW5saW5lIGJveGVz IChzdWNoIGFzIHJlcGxhY2VkIGlubGluZS1sZXZlbCBlbGVtZW50cywgaW5saW5lLWJsb2NrIGVs ZW1lbnRzLCBhbmQgaW5saW5lLXRhYmxlIGVsZW1lbnRzKQorICAgIC8vIGFyZSBjYWxsZWQgYXRv bWljIGlubGluZS1sZXZlbCBib3hlcyBiZWNhdXNlIHRoZXkgcGFydGljaXBhdGUgaW4gdGhlaXIg aW5saW5lIGZvcm1hdHRpbmcgY29udGV4dCBhcyBhIHNpbmdsZSBvcGFxdWUgYm94LgorICAgIHJl dHVybiBpc0lubGluZUxldmVsQm94KCkgJiYgIWlzSW5saW5lQm94KCk7Cit9CisKIGJvb2wgQm94 Ojppc0Jsb2NrQ29udGFpbmVyQm94KCkgY29uc3QKIHsKICAgICBhdXRvIGRpc3BsYXkgPSBtX3N0 eWxlLmRpc3BsYXkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0 cmVlL0xheW91dEJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0 Qm94LmgKaW5kZXggY2U1ZTIyM2I0ODA3ZjA0NGZiZWFlZGVkYmUwZjM0MDA5YTdmMzA1Mi4uNDk0 MzczZjlmZGJhMDE2MGY4YzVkODJiYzk1ZTczNzM1YzY5ZGQ2NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmgKQEAgLTEwOSw2ICsxMDksOCBAQCBwdWJs aWM6CiAKICAgICBib29sIGlzQmxvY2tMZXZlbEJveCgpIGNvbnN0OwogICAgIGJvb2wgaXNJbmxp bmVMZXZlbEJveCgpIGNvbnN0OworICAgIGJvb2wgaXNJbmxpbmVCb3goKSBjb25zdDsKKyAgICBi b29sIGlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSBjb25zdDsKICAgICBib29sIGlzSW5saW5lQmxv Y2tCb3goKSBjb25zdDsKICAgICBib29sIGlzQmxvY2tDb250YWluZXJCb3goKSBjb25zdDsKICAg ICBib29sIGlzSW5pdGlhbENvbnRhaW5pbmdCbG9jaygpIGNvbnN0OwpAQCAtMTQyLDggKzE0NCw2 IEBAIHB1YmxpYzoKICAgICBCb3gqIG5leHRTaWJsaW5nKCkgeyByZXR1cm4gbV9uZXh0U2libGlu ZzsgfQogCiAgICAgYm9vbCBpc0NvbnRhaW5lcigpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZVR5cGVG bGFncyAmIENvbnRhaW5lckZsYWc7IH0KLSAgICBib29sIGlzQmxvY2tDb250YWluZXIoKSBjb25z dCB7IHJldHVybiBpc0Jsb2NrTGV2ZWxCb3goKSAmJiBpc0NvbnRhaW5lcigpOyB9Ci0gICAgYm9v bCBpc0lubGluZUNvbnRhaW5lcigpIGNvbnN0IHsgcmV0dXJuIGlzSW5saW5lTGV2ZWxCb3goKSAm JiBpc0NvbnRhaW5lcigpOyB9CiAKICAgICBib29sIGlzUGFkZGluZ0FwcGxpY2FibGUoKSBjb25z dDsKICAgICBib29sIGlzT3ZlcmZsb3dWaXNpYmxlKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAKaW5kZXgg NmJmNzg0ODE5MWM3ZTAzMGE0YWY4YmU0MWIzZDlkYTZiYjc1MWY0Yi4uNjg2ZTQ4YTFmMWZjZTIw MzAyMzI0ZjYwNjZmNjg1YTBkNDg1OTc3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcApAQCAtMzg1LDEwICszODUs MTAgQEAgc3RhdGljIHZvaWQgb3V0cHV0TGF5b3V0Qm94KFRleHRTdHJlYW0mIHN0cmVhbSwgY29u c3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IERpc3AKICAgICBlbHNlIGlmIChsYXlvdXRCb3guaXNU YWJsZVJvdygpKQogICAgICAgICBzdHJlYW0gPDwgIlRSIjsKICAgICBlbHNlIGlmIChsYXlvdXRC b3guaXNJbmxpbmVCbG9ja0JveCgpKQotICAgICAgICBzdHJlYW0gPDwgIklubGluZS1ibG9jayBj b250YWluZXIiOworICAgICAgICBzdHJlYW0gPDwgIklubGluZS1ibG9jayI7CiAgICAgZWxzZSBp ZiAobGF5b3V0Qm94LmlzSW5saW5lTGV2ZWxCb3goKSkgewotICAgICAgICBpZiAobGF5b3V0Qm94 LmlzSW5saW5lQ29udGFpbmVyKCkpCi0gICAgICAgICAgICBzdHJlYW0gPDwgIlNQQU4gaW5saW5l IGNvbnRhaW5lciI7CisgICAgICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVCb3goKSkKKyAgICAg ICAgICAgIHN0cmVhbSA8PCAiU1BBTiBpbmxpbmUgYm94IjsKICAgICAgICAgZWxzZSBpZiAobGF5 b3V0Qm94LnJlcGxhY2VkKCkpCiAgICAgICAgICAgICBzdHJlYW0gPDwgIklNRyByZXBsYWNlZCBp bmxpbmUgYm94IjsKICAgICAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzQW5vbnltb3VzKCkpCkBA IC0zOTYsNyArMzk2LDcgQEAgc3RhdGljIHZvaWQgb3V0cHV0TGF5b3V0Qm94KFRleHRTdHJlYW0m IHN0cmVhbSwgY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IERpc3AKICAgICAgICAgZWxzZSBp ZiAobGF5b3V0Qm94LmlzTGluZUJyZWFrQm94KCkpCiAgICAgICAgICAgICBzdHJlYW0gPDwgIkJS IGxpbmUgYnJlYWsiOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBzdHJlYW0gPDwgImlubGlu ZSBib3giOworICAgICAgICAgICAgc3RyZWFtIDw8ICJvdGhlciBpbmxpbmUgbGV2ZWwgYm94IjsK ICAgICB9IGVsc2UgaWYgKGxheW91dEJveC5pc0Jsb2NrTGV2ZWxCb3goKSkKICAgICAgICAgc3Ry ZWFtIDw8ICJibG9jayBib3giOwogICAgIGVsc2UK 388484 2020-01-22 16:44:38 -0800 2020-01-22 18:52:56 -0800 Patch bug-206592-20200122164437.patch text/plain 9070 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0OTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWJkMjM3OWQ0YzkzNDQ1 NjY2NzA2NmJlNGMwNTY5YTNjNGY1MTcwNS4uMzBjMmQ0ODBhZDkxNGQ5ZmMxNDYxYTk0OGRjYmJm NTRjN2E3MGZkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBVc2UgImlu bGluZSBib3giIG9yICJhdG9taWMgaW5saW5lIGxldmVsIGJveCIgaW5zdGVhZCBvZiBpbmxpbmUg Y29udGFpbmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDY1OTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4Nzk5OTcwPgorCisgICAgICAgIFJl dmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIElubGluZSBjb250YWluZXIgaXMg bm90IGEgc3BlYyB0ZXJtLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhvcml6b250YWxBbmRWZXJ0aWNhbEdlb21ldHJ5 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb2xsZWN0SW5saW5lQ29udGVudElmTmVlZGVk KToKKyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpCb3g6OmlzSW5saW5lQm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Qm94Ojppc0F0b21pY0lubGluZUxldmVsQm94IGNvbnN0KToKKyAgICAgICAg KiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Qm94Ojppc0NvbnRhaW5lciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJv eDo6aXNCbG9ja0NvbnRhaW5lciBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJveDo6aXNJbmxpbmVDb250YWluZXIgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAq IGxheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6b3V0cHV0TGF5b3V0Qm94KToKKwogMjAyMC0wMS0yMiAgTmlrb3MgTW91Y2h0 YXJpcyAgPG5tb3VjaHRhcmlzQGFwcGxlLmNvbT4KIAogICAgICAgICBBdXRvbWF0aWMgbGluayBy ZXBsYWNlbWVudCB2aWEgIlNtYXJ0IGxpbmtzIiBzaG91bGQgZW1pdCAiaW5zZXJ0TGluayIgaW5w dXQgZXZlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggODM2ZmJm OWE4Y2RlZTU0OTljOGIxMjkwOTZkYTczZmQwMWVjNTY2NC4uNjA2YzZmODdiODQ1YTg4YzVmZDk0 YzQ5ZjJmNWIzNmE3OWY2YWExZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cApAQCAtMTU2LDggKzE1Niw4IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91 dEZvcm1hdHRpbmdDb250ZXh0Um9vdChjb25zdCBCb3gmIGZvcm1hdHRpbmdDCiAKIHZvaWQgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIb3Jpem9udGFsQW5kVmVydGljYWxHZW9tZXRy eShjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBob3Jp em9udGFsQ29uc3RyYWludHMpCiB7Ci0gICAgaWYgKGlzPENvbnRhaW5lcj4obGF5b3V0Qm94KSkg ewotICAgICAgICAvLyBJbmxpbmUgY29udGFpbmVycyAoPHNwYW4+KSBjYW4ndCBnZXQgc2l6ZWQv cG9zaXRpb25lZCB5ZXQuIEF0IHRoaXMgcG9pbnQgd2UgY2FuIG9ubHkgY29tcHV0ZSB0aGVpciBt YXJnaW5zLCBib3JkZXJzIGFuZCBwYWRkaW5ncy4KKyAgICBpZiAobGF5b3V0Qm94LmlzSW5saW5l Qm94KCkgJiYgIWxheW91dEJveC5pc0Fub255bW91cygpKSB7CisgICAgICAgIC8vIElubGluZSBi b3hlcyAoPHNwYW4+KSBjYW4ndCBnZXQgc2l6ZWQvcG9zaXRpb25lZCB5ZXQuIEF0IHRoaXMgcG9p bnQgd2UgY2FuIG9ubHkgY29tcHV0ZSB0aGVpciBtYXJnaW5zLCBib3JkZXJzIGFuZCBwYWRkaW5n cy4KICAgICAgICAgY29tcHV0ZUhvcml6b250YWxNYXJnaW4obGF5b3V0Qm94LCBob3Jpem9udGFs Q29uc3RyYWludHMpOwogICAgICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gs IGhvcml6b250YWxDb25zdHJhaW50cyk7CiAgICAgICAgIC8vIElubGluZSBjb250YWluZXJzIGhh dmUgMCBjb21wdXRlZCB2ZXJ0aWNhbCBtYXJnaW5zLgpAQCAtMjAxLDcgKzIwMSw3IEBAIEZvcm1h dHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIElubGluZUZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlZEluCiAgICAgICAgIGlmIChsYXlvdXRCb3gtPmVzdGFibGlzaGVzRm9y bWF0dGluZ0NvbnRleHQoKSkgewogICAgICAgICAgICAgZm9ybWF0dGluZ0NvbnRleHRSb290TGlz dC5hcHBlbmQobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNXaWR0aEZv ckZvcm1hdHRpbmdSb290KCpsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7Ci0gICAg ICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94LT5pc1JlcGxhY2VkKCkgfHwgaXM8Q29udGFpbmVyPigq bGF5b3V0Qm94KSkgeworICAgICAgICB9IGVsc2UgaWYgKGxheW91dEJveC0+aXNSZXBsYWNlZCgp IHx8IChsYXlvdXRCb3gtPmlzSW5saW5lQm94KCkgJiYgIWxheW91dEJveC0+aXNBbm9ueW1vdXMo KSkgewogICAgICAgICAgICAgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmcoKmxheW91dEJveCwgaG9y aXpvbnRhbENvbnN0cmFpbnRzKTsKICAgICAgICAgICAgIC8vIGlubGluZS1ibG9jayBhbmQgcmVw bGFjZWQuCiAgICAgICAgICAgICBhdXRvIG5lZWRzV2lkdGhDb21wdXRhdGlvbiA9IGxheW91dEJv eC0+aXNSZXBsYWNlZCgpOwpAQCAtMzM2LDE4ICszMzYsMTUgQEAgdm9pZCBJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6Y29sbGVjdElubGluZUNvbnRlbnRJZk5lZWRlZCgpCiAgICAgICAgIHJldHVy bjsKICAgICAvLyBUcmF2ZXJzZSB0aGUgdHJlZSBhbmQgY3JlYXRlIGlubGluZSBpdGVtcyBvdXQg b2YgY29udGFpbmVycyBhbmQgbGVhZiBub2Rlcy4gVGhpcyBlc3NlbnRpYWxseSB0dXJucyB0aGUg dHJlZSBpbmxpbmUgc3RydWN0dXJlIGludG8gYSBmbGF0IG9uZS4KICAgICAvLyA8c3Bhbj50ZXh0 PHNwYW4+PC9zcGFuPjxpbWc+PC9zcGFuPiAtPiBbQ29udGFpbmVyU3RhcnRdW0lubGluZUJveF1b Q29udGFpbmVyU3RhcnRdW0NvbnRhaW5lckVuZF1bSW5saW5lQm94XVtDb250YWluZXJFbmRdCisg ICAgQVNTRVJUKHJvb3QoKS5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKSk7CiAgICAgTGF5b3V0 UXVldWUgbGF5b3V0UXVldWU7Ci0gICAgaWYgKHJvb3QoKS5oYXNJbkZsb3dPckZsb2F0aW5nQ2hp bGQoKSkKLSAgICAgICAgbGF5b3V0UXVldWUuYXBwZW5kKHJvb3QoKS5maXJzdEluRmxvd09yRmxv YXRpbmdDaGlsZCgpKTsKKyAgICBsYXlvdXRRdWV1ZS5hcHBlbmQocm9vdCgpLmZpcnN0SW5GbG93 T3JGbG9hdGluZ0NoaWxkKCkpOwogICAgIHdoaWxlICghbGF5b3V0UXVldWUuaXNFbXB0eSgpKSB7 Ci0gICAgICAgIGF1dG8gdHJlYXRBc0lubGluZUNvbnRhaW5lciA9IFtdKGF1dG8mIGxheW91dEJv eCkgewotICAgICAgICAgICAgcmV0dXJuIGlzPENvbnRhaW5lcj4obGF5b3V0Qm94KSAmJiAhbGF5 b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKTsKLSAgICAgICAgfTsKICAgICAg ICAgd2hpbGUgKHRydWUpIHsKICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9ICpsYXlvdXRR dWV1ZS5sYXN0KCk7Ci0gICAgICAgICAgICBpZiAoIXRyZWF0QXNJbmxpbmVDb250YWluZXIobGF5 b3V0Qm94KSkKKyAgICAgICAgICAgIGlmICghbGF5b3V0Qm94LmlzSW5saW5lQm94KCkgfHwgbGF5 b3V0Qm94LmlzQW5vbnltb3VzKCkpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICAvLyBUaGlzIGlzIHRoZSBzdGFydCBvZiBhbiBpbmxpbmUgY29udGFpbmVyIChlLmcuIDxzcGFu PikuCisgICAgICAgICAgICAvLyBUaGlzIGlzIHRoZSBzdGFydCBvZiBhbiBpbmxpbmUgYm94IChl LmcuIDxzcGFuPikuCiAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkSW5saW5lSXRlbSh7 IGxheW91dEJveCwgSW5saW5lSXRlbTo6VHlwZTo6Q29udGFpbmVyU3RhcnQgfSk7CiAgICAgICAg ICAgICBhdXRvJiBjb250YWluZXIgPSBkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCk7CiAg ICAgICAgICAgICBpZiAoIWNvbnRhaW5lci5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKSkKQEAg LTM1OCw3ICszNTUsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb2xsZWN0SW5s aW5lQ29udGVudElmTmVlZGVkKCkKICAgICAgICAgd2hpbGUgKCFsYXlvdXRRdWV1ZS5pc0VtcHR5 KCkpIHsKICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9ICpsYXlvdXRRdWV1ZS50YWtlTGFz dCgpOwogICAgICAgICAgICAgLy8gVGhpcyBpcyB0aGUgZW5kIG9mIGFuIGlubGluZSBjb250YWlu ZXIgKGUuZy4gPC9zcGFuPikuCi0gICAgICAgICAgICBpZiAodHJlYXRBc0lubGluZUNvbnRhaW5l cihsYXlvdXRCb3gpKQorICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJveCgpICYm ICFsYXlvdXRCb3guaXNBbm9ueW1vdXMoKSkKICAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3Rh dGUuYWRkSW5saW5lSXRlbSh7IGxheW91dEJveCwgSW5saW5lSXRlbTo6VHlwZTo6Q29udGFpbmVy RW5kIH0pOwogICAgICAgICAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzTGluZUJyZWFrQm94KCkp CiAgICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZElubGluZUl0ZW0oeyBsYXlvdXRC b3gsIElubGluZUl0ZW06OlR5cGU6OkhhcmRMaW5lQnJlYWsgfSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcAppbmRleCA3ZDY0NzEyZDk3NGVlYWVk M2NhOTU2YjMzOTY4OTljZGU4YmY4NGEzLi4yMzUzYzNlMzgxNDZmZjJhMDQwYTliZmRkYzI3NjFl NmU5NDdjNzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9M YXlvdXRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91 dEJveC5jcHAKQEAgLTMwOCw2ICszMDgsMjAgQEAgYm9vbCBCb3g6OmlzSW5saW5lTGV2ZWxCb3go KSBjb25zdAogICAgIHJldHVybiBkaXNwbGF5ID09IERpc3BsYXlUeXBlOjpJbmxpbmUgfHwgaXNJ bmxpbmVCbG9ja0JveCgpIHx8IGRpc3BsYXkgPT0gRGlzcGxheVR5cGU6OklubGluZVRhYmxlOwog fQogCitib29sIEJveDo6aXNJbmxpbmVCb3goKSBjb25zdAoreworICAgIC8vIEFuIGlubGluZSBi b3ggaXMgb25lIHRoYXQgaXMgYm90aCBpbmxpbmUtbGV2ZWwgYW5kIHdob3NlIGNvbnRlbnRzIHBh cnRpY2lwYXRlIGluIGl0cyBjb250YWluaW5nIGlubGluZSBmb3JtYXR0aW5nIGNvbnRleHQuCisg ICAgLy8gQSBub24tcmVwbGFjZWQgZWxlbWVudCB3aXRoIGEgJ2Rpc3BsYXknIHZhbHVlIG9mICdp bmxpbmUnIGdlbmVyYXRlcyBhbiBpbmxpbmUgYm94LgorICAgIHJldHVybiBtX3N0eWxlLmRpc3Bs YXkoKSA9PSBEaXNwbGF5VHlwZTo6SW5saW5lICYmICFpc1JlcGxhY2VkKCk7Cit9CisKK2Jvb2wg Qm94Ojppc0F0b21pY0lubGluZUxldmVsQm94KCkgY29uc3QKK3sKKyAgICAvLyBJbmxpbmUtbGV2 ZWwgYm94ZXMgdGhhdCBhcmUgbm90IGlubGluZSBib3hlcyAoc3VjaCBhcyByZXBsYWNlZCBpbmxp bmUtbGV2ZWwgZWxlbWVudHMsIGlubGluZS1ibG9jayBlbGVtZW50cywgYW5kIGlubGluZS10YWJs ZSBlbGVtZW50cykKKyAgICAvLyBhcmUgY2FsbGVkIGF0b21pYyBpbmxpbmUtbGV2ZWwgYm94ZXMg YmVjYXVzZSB0aGV5IHBhcnRpY2lwYXRlIGluIHRoZWlyIGlubGluZSBmb3JtYXR0aW5nIGNvbnRl eHQgYXMgYSBzaW5nbGUgb3BhcXVlIGJveC4KKyAgICByZXR1cm4gaXNJbmxpbmVMZXZlbEJveCgp ICYmICFpc0lubGluZUJveCgpOworfQorCiBib29sIEJveDo6aXNCbG9ja0NvbnRhaW5lckJveCgp IGNvbnN0CiB7CiAgICAgYXV0byBkaXNwbGF5ID0gbV9zdHlsZS5kaXNwbGF5KCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCmluZGV4IGNlNWUyMjNiNDgw N2YwNDRmYmVhZWRlZGJlMGYzNDAwOWE3ZjMwNTIuLjQ5NDM3M2Y5ZmRiYTAxNjBmOGM1ZDgyYmM5 NWU3MzczNWM2OWRkNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0 cmVlL0xheW91dEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xh eW91dEJveC5oCkBAIC0xMDksNiArMTA5LDggQEAgcHVibGljOgogCiAgICAgYm9vbCBpc0Jsb2Nr TGV2ZWxCb3goKSBjb25zdDsKICAgICBib29sIGlzSW5saW5lTGV2ZWxCb3goKSBjb25zdDsKKyAg ICBib29sIGlzSW5saW5lQm94KCkgY29uc3Q7CisgICAgYm9vbCBpc0F0b21pY0lubGluZUxldmVs Qm94KCkgY29uc3Q7CiAgICAgYm9vbCBpc0lubGluZUJsb2NrQm94KCkgY29uc3Q7CiAgICAgYm9v bCBpc0Jsb2NrQ29udGFpbmVyQm94KCkgY29uc3Q7CiAgICAgYm9vbCBpc0luaXRpYWxDb250YWlu aW5nQmxvY2soKSBjb25zdDsKQEAgLTE0Miw4ICsxNDQsNiBAQCBwdWJsaWM6CiAgICAgQm94KiBu ZXh0U2libGluZygpIHsgcmV0dXJuIG1fbmV4dFNpYmxpbmc7IH0KIAogICAgIGJvb2wgaXNDb250 YWluZXIoKSBjb25zdCB7IHJldHVybiBtX2Jhc2VUeXBlRmxhZ3MgJiBDb250YWluZXJGbGFnOyB9 Ci0gICAgYm9vbCBpc0Jsb2NrQ29udGFpbmVyKCkgY29uc3QgeyByZXR1cm4gaXNCbG9ja0xldmVs Qm94KCkgJiYgaXNDb250YWluZXIoKTsgfQotICAgIGJvb2wgaXNJbmxpbmVDb250YWluZXIoKSBj b25zdCB7IHJldHVybiBpc0lubGluZUxldmVsQm94KCkgJiYgaXNDb250YWluZXIoKTsgfQogCiAg ICAgYm9vbCBpc1BhZGRpbmdBcHBsaWNhYmxlKCkgY29uc3Q7CiAgICAgYm9vbCBpc092ZXJmbG93 VmlzaWJsZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91 dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91 dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwCmluZGV4IDZiZjc4NDgxOTFjN2UwMzBhNGFmOGJl NDFiM2Q5ZGE2YmI3NTFmNGIuLjY4NmU0OGExZjFmY2UyMDMwMjMyNGY2MDY2ZjY4NWEwZDQ4NTk3 NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRy ZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlv dXRUcmVlQnVpbGRlci5jcHAKQEAgLTM4NSwxMCArMzg1LDEwIEBAIHN0YXRpYyB2b2lkIG91dHB1 dExheW91dEJveChUZXh0U3RyZWFtJiBzdHJlYW0sIGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25z dCBEaXNwCiAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzVGFibGVSb3coKSkKICAgICAgICAgc3Ry ZWFtIDw8ICJUUiI7CiAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzSW5saW5lQmxvY2tCb3goKSkK LSAgICAgICAgc3RyZWFtIDw8ICJJbmxpbmUtYmxvY2sgY29udGFpbmVyIjsKKyAgICAgICAgc3Ry ZWFtIDw8ICJJbmxpbmUtYmxvY2siOwogICAgIGVsc2UgaWYgKGxheW91dEJveC5pc0lubGluZUxl dmVsQm94KCkpIHsKLSAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUNvbnRhaW5lcigpKQot ICAgICAgICAgICAgc3RyZWFtIDw8ICJTUEFOIGlubGluZSBjb250YWluZXIiOworICAgICAgICBp ZiAobGF5b3V0Qm94LmlzSW5saW5lQm94KCkpCisgICAgICAgICAgICBzdHJlYW0gPDwgIlNQQU4g aW5saW5lIGJveCI7CiAgICAgICAgIGVsc2UgaWYgKGxheW91dEJveC5yZXBsYWNlZCgpKQogICAg ICAgICAgICAgc3RyZWFtIDw8ICJJTUcgcmVwbGFjZWQgaW5saW5lIGJveCI7CiAgICAgICAgIGVs c2UgaWYgKGxheW91dEJveC5pc0Fub255bW91cygpKQpAQCAtMzk2LDcgKzM5Niw3IEBAIHN0YXRp YyB2b2lkIG91dHB1dExheW91dEJveChUZXh0U3RyZWFtJiBzdHJlYW0sIGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBjb25zdCBEaXNwCiAgICAgICAgIGVsc2UgaWYgKGxheW91dEJveC5pc0xpbmVCcmVh a0JveCgpKQogICAgICAgICAgICAgc3RyZWFtIDw8ICJCUiBsaW5lIGJyZWFrIjsKICAgICAgICAg ZWxzZQotICAgICAgICAgICAgc3RyZWFtIDw8ICJpbmxpbmUgYm94IjsKKyAgICAgICAgICAgIHN0 cmVhbSA8PCAib3RoZXIgaW5saW5lIGxldmVsIGJveCI7CiAgICAgfSBlbHNlIGlmIChsYXlvdXRC b3guaXNCbG9ja0xldmVsQm94KCkpCiAgICAgICAgIHN0cmVhbSA8PCAiYmxvY2sgYm94IjsKICAg ICBlbHNlCg== 388509 2020-01-22 18:52:58 -0800 2020-01-22 20:49:31 -0800 Patch bug-206592-20200122185257.patch text/plain 9071 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0OTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWJkMjM3OWQ0YzkzNDQ1 NjY2NzA2NmJlNGMwNTY5YTNjNGY1MTcwNS4uMzBjMmQ0ODBhZDkxNGQ5ZmMxNDYxYTk0OGRjYmJm NTRjN2E3MGZkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBVc2UgImlu bGluZSBib3giIG9yICJhdG9taWMgaW5saW5lIGxldmVsIGJveCIgaW5zdGVhZCBvZiBpbmxpbmUg Y29udGFpbmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDY1OTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4Nzk5OTcwPgorCisgICAgICAgIFJl dmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIElubGluZSBjb250YWluZXIgaXMg bm90IGEgc3BlYyB0ZXJtLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhvcml6b250YWxBbmRWZXJ0aWNhbEdlb21ldHJ5 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb2xsZWN0SW5saW5lQ29udGVudElmTmVlZGVk KToKKyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpCb3g6OmlzSW5saW5lQm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Qm94Ojppc0F0b21pY0lubGluZUxldmVsQm94IGNvbnN0KToKKyAgICAgICAg KiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Qm94Ojppc0NvbnRhaW5lciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJv eDo6aXNCbG9ja0NvbnRhaW5lciBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJveDo6aXNJbmxpbmVDb250YWluZXIgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAq IGxheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6b3V0cHV0TGF5b3V0Qm94KToKKwogMjAyMC0wMS0yMiAgTmlrb3MgTW91Y2h0 YXJpcyAgPG5tb3VjaHRhcmlzQGFwcGxlLmNvbT4KIAogICAgICAgICBBdXRvbWF0aWMgbGluayBy ZXBsYWNlbWVudCB2aWEgIlNtYXJ0IGxpbmtzIiBzaG91bGQgZW1pdCAiaW5zZXJ0TGluayIgaW5w dXQgZXZlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggODM2ZmJm OWE4Y2RlZTU0OTljOGIxMjkwOTZkYTczZmQwMWVjNTY2NC4uYzczYjE0ZmQ1MGU4MTc0OGQ2OTFh MTAwMzkzYjlkNjVjOTAyYzNmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cApAQCAtMTU2LDggKzE1Niw4IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91 dEZvcm1hdHRpbmdDb250ZXh0Um9vdChjb25zdCBCb3gmIGZvcm1hdHRpbmdDCiAKIHZvaWQgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIb3Jpem9udGFsQW5kVmVydGljYWxHZW9tZXRy eShjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBob3Jp em9udGFsQ29uc3RyYWludHMpCiB7Ci0gICAgaWYgKGlzPENvbnRhaW5lcj4obGF5b3V0Qm94KSkg ewotICAgICAgICAvLyBJbmxpbmUgY29udGFpbmVycyAoPHNwYW4+KSBjYW4ndCBnZXQgc2l6ZWQv cG9zaXRpb25lZCB5ZXQuIEF0IHRoaXMgcG9pbnQgd2UgY2FuIG9ubHkgY29tcHV0ZSB0aGVpciBt YXJnaW5zLCBib3JkZXJzIGFuZCBwYWRkaW5ncy4KKyAgICBpZiAobGF5b3V0Qm94LmlzSW5saW5l Qm94KCkgJiYgIWxheW91dEJveC5pc0Fub255bW91cygpKSB7CisgICAgICAgIC8vIElubGluZSBi b3hlcyAoPHNwYW4+KSBjYW4ndCBnZXQgc2l6ZWQvcG9zaXRpb25lZCB5ZXQuIEF0IHRoaXMgcG9p bnQgd2UgY2FuIG9ubHkgY29tcHV0ZSB0aGVpciBtYXJnaW5zLCBib3JkZXJzIGFuZCBwYWRkaW5n cy4KICAgICAgICAgY29tcHV0ZUhvcml6b250YWxNYXJnaW4obGF5b3V0Qm94LCBob3Jpem9udGFs Q29uc3RyYWludHMpOwogICAgICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gs IGhvcml6b250YWxDb25zdHJhaW50cyk7CiAgICAgICAgIC8vIElubGluZSBjb250YWluZXJzIGhh dmUgMCBjb21wdXRlZCB2ZXJ0aWNhbCBtYXJnaW5zLgpAQCAtMjAxLDcgKzIwMSw3IEBAIEZvcm1h dHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIElubGluZUZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlZEluCiAgICAgICAgIGlmIChsYXlvdXRCb3gtPmVzdGFibGlzaGVzRm9y bWF0dGluZ0NvbnRleHQoKSkgewogICAgICAgICAgICAgZm9ybWF0dGluZ0NvbnRleHRSb290TGlz dC5hcHBlbmQobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNXaWR0aEZv ckZvcm1hdHRpbmdSb290KCpsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7Ci0gICAg ICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94LT5pc1JlcGxhY2VkKCkgfHwgaXM8Q29udGFpbmVyPigq bGF5b3V0Qm94KSkgeworICAgICAgICB9IGVsc2UgaWYgKGxheW91dEJveC0+aXNSZXBsYWNlZCgp IHx8IChsYXlvdXRCb3gtPmlzSW5saW5lQm94KCkgJiYgIWxheW91dEJveC0+aXNBbm9ueW1vdXMo KSkpIHsKICAgICAgICAgICAgIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKCpsYXlvdXRCb3gsIGhv cml6b250YWxDb25zdHJhaW50cyk7CiAgICAgICAgICAgICAvLyBpbmxpbmUtYmxvY2sgYW5kIHJl cGxhY2VkLgogICAgICAgICAgICAgYXV0byBuZWVkc1dpZHRoQ29tcHV0YXRpb24gPSBsYXlvdXRC b3gtPmlzUmVwbGFjZWQoKTsKQEAgLTMzNiwxOCArMzM2LDE1IEBAIHZvaWQgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OmNvbGxlY3RJbmxpbmVDb250ZW50SWZOZWVkZWQoKQogICAgICAgICByZXR1 cm47CiAgICAgLy8gVHJhdmVyc2UgdGhlIHRyZWUgYW5kIGNyZWF0ZSBpbmxpbmUgaXRlbXMgb3V0 IG9mIGNvbnRhaW5lcnMgYW5kIGxlYWYgbm9kZXMuIFRoaXMgZXNzZW50aWFsbHkgdHVybnMgdGhl IHRyZWUgaW5saW5lIHN0cnVjdHVyZSBpbnRvIGEgZmxhdCBvbmUuCiAgICAgLy8gPHNwYW4+dGV4 dDxzcGFuPjwvc3Bhbj48aW1nPjwvc3Bhbj4gLT4gW0NvbnRhaW5lclN0YXJ0XVtJbmxpbmVCb3hd W0NvbnRhaW5lclN0YXJ0XVtDb250YWluZXJFbmRdW0lubGluZUJveF1bQ29udGFpbmVyRW5kXQor ICAgIEFTU0VSVChyb290KCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpOwogICAgIExheW91 dFF1ZXVlIGxheW91dFF1ZXVlOwotICAgIGlmIChyb290KCkuaGFzSW5GbG93T3JGbG9hdGluZ0No aWxkKCkpCi0gICAgICAgIGxheW91dFF1ZXVlLmFwcGVuZChyb290KCkuZmlyc3RJbkZsb3dPckZs b2F0aW5nQ2hpbGQoKSk7CisgICAgbGF5b3V0UXVldWUuYXBwZW5kKHJvb3QoKS5maXJzdEluRmxv d09yRmxvYXRpbmdDaGlsZCgpKTsKICAgICB3aGlsZSAoIWxheW91dFF1ZXVlLmlzRW1wdHkoKSkg ewotICAgICAgICBhdXRvIHRyZWF0QXNJbmxpbmVDb250YWluZXIgPSBbXShhdXRvJiBsYXlvdXRC b3gpIHsKLSAgICAgICAgICAgIHJldHVybiBpczxDb250YWluZXI+KGxheW91dEJveCkgJiYgIWxh eW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCk7Ci0gICAgICAgIH07CiAgICAg ICAgIHdoaWxlICh0cnVlKSB7CiAgICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSAqbGF5b3V0 UXVldWUubGFzdCgpOwotICAgICAgICAgICAgaWYgKCF0cmVhdEFzSW5saW5lQ29udGFpbmVyKGxh eW91dEJveCkpCisgICAgICAgICAgICBpZiAoIWxheW91dEJveC5pc0lubGluZUJveCgpIHx8IGxh eW91dEJveC5pc0Fub255bW91cygpKQogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgLy8gVGhpcyBpcyB0aGUgc3RhcnQgb2YgYW4gaW5saW5lIGNvbnRhaW5lciAoZS5nLiA8c3Bh bj4pLgorICAgICAgICAgICAgLy8gVGhpcyBpcyB0aGUgc3RhcnQgb2YgYW4gaW5saW5lIGJveCAo ZS5nLiA8c3Bhbj4pLgogICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZElubGluZUl0ZW0o eyBsYXlvdXRCb3gsIElubGluZUl0ZW06OlR5cGU6OkNvbnRhaW5lclN0YXJ0IH0pOwogICAgICAg ICAgICAgYXV0byYgY29udGFpbmVyID0gZG93bmNhc3Q8Q29udGFpbmVyPihsYXlvdXRCb3gpOwog ICAgICAgICAgICAgaWYgKCFjb250YWluZXIuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpCkBA IC0zNTgsNyArMzU1LDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29sbGVjdElu bGluZUNvbnRlbnRJZk5lZWRlZCgpCiAgICAgICAgIHdoaWxlICghbGF5b3V0UXVldWUuaXNFbXB0 eSgpKSB7CiAgICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSAqbGF5b3V0UXVldWUudGFrZUxh c3QoKTsKICAgICAgICAgICAgIC8vIFRoaXMgaXMgdGhlIGVuZCBvZiBhbiBpbmxpbmUgY29udGFp bmVyIChlLmcuIDwvc3Bhbj4pLgotICAgICAgICAgICAgaWYgKHRyZWF0QXNJbmxpbmVDb250YWlu ZXIobGF5b3V0Qm94KSkKKyAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVCb3goKSAm JiAhbGF5b3V0Qm94LmlzQW5vbnltb3VzKCkpCiAgICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0 YXRlLmFkZElubGluZUl0ZW0oeyBsYXlvdXRCb3gsIElubGluZUl0ZW06OlR5cGU6OkNvbnRhaW5l ckVuZCB9KTsKICAgICAgICAgICAgIGVsc2UgaWYgKGxheW91dEJveC5pc0xpbmVCcmVha0JveCgp KQogICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRJbmxpbmVJdGVtKHsgbGF5b3V0 Qm94LCBJbmxpbmVJdGVtOjpUeXBlOjpIYXJkTGluZUJyZWFrIH0pOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5jcHAKaW5kZXggN2Q2NDcxMmQ5NzRlZWFl ZDNjYTk1NmIzMzk2ODk5Y2RlOGJmODRhMy4uMjM1M2MzZTM4MTQ2ZmYyYTA0MGE5YmZkZGMyNzYx ZTZlOTQ3YzcyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUv TGF5b3V0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlv dXRCb3guY3BwCkBAIC0zMDgsNiArMzA4LDIwIEBAIGJvb2wgQm94Ojppc0lubGluZUxldmVsQm94 KCkgY29uc3QKICAgICByZXR1cm4gZGlzcGxheSA9PSBEaXNwbGF5VHlwZTo6SW5saW5lIHx8IGlz SW5saW5lQmxvY2tCb3goKSB8fCBkaXNwbGF5ID09IERpc3BsYXlUeXBlOjpJbmxpbmVUYWJsZTsK IH0KIAorYm9vbCBCb3g6OmlzSW5saW5lQm94KCkgY29uc3QKK3sKKyAgICAvLyBBbiBpbmxpbmUg Ym94IGlzIG9uZSB0aGF0IGlzIGJvdGggaW5saW5lLWxldmVsIGFuZCB3aG9zZSBjb250ZW50cyBw YXJ0aWNpcGF0ZSBpbiBpdHMgY29udGFpbmluZyBpbmxpbmUgZm9ybWF0dGluZyBjb250ZXh0Lgor ICAgIC8vIEEgbm9uLXJlcGxhY2VkIGVsZW1lbnQgd2l0aCBhICdkaXNwbGF5JyB2YWx1ZSBvZiAn aW5saW5lJyBnZW5lcmF0ZXMgYW4gaW5saW5lIGJveC4KKyAgICByZXR1cm4gbV9zdHlsZS5kaXNw bGF5KCkgPT0gRGlzcGxheVR5cGU6OklubGluZSAmJiAhaXNSZXBsYWNlZCgpOworfQorCitib29s IEJveDo6aXNBdG9taWNJbmxpbmVMZXZlbEJveCgpIGNvbnN0Cit7CisgICAgLy8gSW5saW5lLWxl dmVsIGJveGVzIHRoYXQgYXJlIG5vdCBpbmxpbmUgYm94ZXMgKHN1Y2ggYXMgcmVwbGFjZWQgaW5s aW5lLWxldmVsIGVsZW1lbnRzLCBpbmxpbmUtYmxvY2sgZWxlbWVudHMsIGFuZCBpbmxpbmUtdGFi bGUgZWxlbWVudHMpCisgICAgLy8gYXJlIGNhbGxlZCBhdG9taWMgaW5saW5lLWxldmVsIGJveGVz IGJlY2F1c2UgdGhleSBwYXJ0aWNpcGF0ZSBpbiB0aGVpciBpbmxpbmUgZm9ybWF0dGluZyBjb250 ZXh0IGFzIGEgc2luZ2xlIG9wYXF1ZSBib3guCisgICAgcmV0dXJuIGlzSW5saW5lTGV2ZWxCb3go KSAmJiAhaXNJbmxpbmVCb3goKTsKK30KKwogYm9vbCBCb3g6OmlzQmxvY2tDb250YWluZXJCb3go KSBjb25zdAogewogICAgIGF1dG8gZGlzcGxheSA9IG1fc3R5bGUuZGlzcGxheSgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaAppbmRleCBjZTVlMjIzYjQ4 MDdmMDQ0ZmJlYWVkZWRiZTBmMzQwMDlhN2YzMDUyLi40OTQzNzNmOWZkYmEwMTYwZjhjNWQ4MmJj OTVlNzM3MzVjNjlkZDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0 dHJlZS9MYXlvdXRCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9M YXlvdXRCb3guaApAQCAtMTA5LDYgKzEwOSw4IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaXNCbG9j a0xldmVsQm94KCkgY29uc3Q7CiAgICAgYm9vbCBpc0lubGluZUxldmVsQm94KCkgY29uc3Q7Cisg ICAgYm9vbCBpc0lubGluZUJveCgpIGNvbnN0OworICAgIGJvb2wgaXNBdG9taWNJbmxpbmVMZXZl bEJveCgpIGNvbnN0OwogICAgIGJvb2wgaXNJbmxpbmVCbG9ja0JveCgpIGNvbnN0OwogICAgIGJv b2wgaXNCbG9ja0NvbnRhaW5lckJveCgpIGNvbnN0OwogICAgIGJvb2wgaXNJbml0aWFsQ29udGFp bmluZ0Jsb2NrKCkgY29uc3Q7CkBAIC0xNDIsOCArMTQ0LDYgQEAgcHVibGljOgogICAgIEJveCog bmV4dFNpYmxpbmcoKSB7IHJldHVybiBtX25leHRTaWJsaW5nOyB9CiAKICAgICBib29sIGlzQ29u dGFpbmVyKCkgY29uc3QgeyByZXR1cm4gbV9iYXNlVHlwZUZsYWdzICYgQ29udGFpbmVyRmxhZzsg fQotICAgIGJvb2wgaXNCbG9ja0NvbnRhaW5lcigpIGNvbnN0IHsgcmV0dXJuIGlzQmxvY2tMZXZl bEJveCgpICYmIGlzQ29udGFpbmVyKCk7IH0KLSAgICBib29sIGlzSW5saW5lQ29udGFpbmVyKCkg Y29uc3QgeyByZXR1cm4gaXNJbmxpbmVMZXZlbEJveCgpICYmIGlzQ29udGFpbmVyKCk7IH0KIAog ICAgIGJvb2wgaXNQYWRkaW5nQXBwbGljYWJsZSgpIGNvbnN0OwogICAgIGJvb2wgaXNPdmVyZmxv d1Zpc2libGUoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlv dXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlv dXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcAppbmRleCA2YmY3ODQ4MTkxYzdlMDMwYTRhZjhi ZTQxYjNkOWRhNmJiNzUxZjRiLi42ODZlNDhhMWYxZmNlMjAzMDIzMjRmNjA2NmY2ODVhMGQ0ODU5 Nzc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRU cmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5 b3V0VHJlZUJ1aWxkZXIuY3BwCkBAIC0zODUsMTAgKzM4NSwxMCBAQCBzdGF0aWMgdm9pZCBvdXRw dXRMYXlvdXRCb3goVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBCb3gmIGxheW91dEJveCwgY29u c3QgRGlzcAogICAgIGVsc2UgaWYgKGxheW91dEJveC5pc1RhYmxlUm93KCkpCiAgICAgICAgIHN0 cmVhbSA8PCAiVFIiOwogICAgIGVsc2UgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkp Ci0gICAgICAgIHN0cmVhbSA8PCAiSW5saW5lLWJsb2NrIGNvbnRhaW5lciI7CisgICAgICAgIHN0 cmVhbSA8PCAiSW5saW5lLWJsb2NrIjsKICAgICBlbHNlIGlmIChsYXlvdXRCb3guaXNJbmxpbmVM ZXZlbEJveCgpKSB7Ci0gICAgICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVDb250YWluZXIoKSkK LSAgICAgICAgICAgIHN0cmVhbSA8PCAiU1BBTiBpbmxpbmUgY29udGFpbmVyIjsKKyAgICAgICAg aWYgKGxheW91dEJveC5pc0lubGluZUJveCgpKQorICAgICAgICAgICAgc3RyZWFtIDw8ICJTUEFO IGlubGluZSBib3giOwogICAgICAgICBlbHNlIGlmIChsYXlvdXRCb3gucmVwbGFjZWQoKSkKICAg ICAgICAgICAgIHN0cmVhbSA8PCAiSU1HIHJlcGxhY2VkIGlubGluZSBib3giOwogICAgICAgICBl bHNlIGlmIChsYXlvdXRCb3guaXNBbm9ueW1vdXMoKSkKQEAgLTM5Niw3ICszOTYsNyBAQCBzdGF0 aWMgdm9pZCBvdXRwdXRMYXlvdXRCb3goVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBCb3gmIGxh eW91dEJveCwgY29uc3QgRGlzcAogICAgICAgICBlbHNlIGlmIChsYXlvdXRCb3guaXNMaW5lQnJl YWtCb3goKSkKICAgICAgICAgICAgIHN0cmVhbSA8PCAiQlIgbGluZSBicmVhayI7CiAgICAgICAg IGVsc2UKLSAgICAgICAgICAgIHN0cmVhbSA8PCAiaW5saW5lIGJveCI7CisgICAgICAgICAgICBz dHJlYW0gPDwgIm90aGVyIGlubGluZSBsZXZlbCBib3giOwogICAgIH0gZWxzZSBpZiAobGF5b3V0 Qm94LmlzQmxvY2tMZXZlbEJveCgpKQogICAgICAgICBzdHJlYW0gPDwgImJsb2NrIGJveCI7CiAg ICAgZWxzZQo=