203184 2019-10-19 17:45:19 -0700 [LFC][IFC] Make InlineTextItem reusable when 'segment break' behavior changes 2019-10-20 08:09:27 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1581748 0 zalan 2019-10-19 17:45:19 -0700 when \n becomes whitespace 1581749 1 webkit-bug-importer 2019-10-19 17:45:49 -0700 <rdar://problem/56438945> 1581752 2 webkit-bug-importer 2019-10-19 18:14:07 -0700 <rdar://problem/56439111> 1581755 3 381383 zalan 2019-10-19 18:28:03 -0700 Created attachment 381383 Patch 1581756 4 381384 zalan 2019-10-19 18:28:44 -0700 Created attachment 381384 Patch 1581773 5 zalan 2019-10-20 08:09:27 -0700 Committed r251330: <https://trac.webkit.org/changeset/251330> 381383 2019-10-19 18:28:03 -0700 2019-10-19 18:28:42 -0700 Patch bug-203184-20191019182800.patch text/plain 9200 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2QzMzBjNmNkYjk3Yjkz M2JlYzNlNDZjNGVhZDBhODc0ZjY2YjM1Mi4uZDdhNTIxODM2ZDQyYzIyMDdlYmJhYzA5YzgzODE5 NWI0OWIwYTJlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTEwLTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNYWtlIElu bGluZVRleHRJdGVtIHJldXNhYmxlIHdoZW4gJ3NlZ21lbnQgYnJlYWsnIGJlaGF2aW9yIGNoYW5n ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzE4 NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTY0Mzg5NDU+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5saW5lVGV4dEl0ZW06OmlzV2hpdGVzcGFj ZSBzaG91bGQgZHluYW1pY2FsbHkgY2hlY2sgZm9yICdwcmVzZXJ2ZSBuZXcgbGluZScgYmVoYXZp b3IuIFRoaXMgd2F5IHdlIGRvbid0IGhhdmUgdG8gcmVidWlsZCB0aGUgaW5saW5lIGl0ZW0gbGlz dAorICAgICAgICB3aGVuIHRoZSByZWxhdGVkIHN0eWxlIHByb3BlcnR5IHZhbHVlIGNoYW5nZXMu CisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzV2hpdGVzcGFjZUNoYXJhY3Rlcik6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6Om1vdmVUb05leHROb25XaGl0ZXNwYWNlUG9zaXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlQW5kQXBwZW5k VGV4dEl0ZW1zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmNy ZWF0ZVdoaXRlc3BhY2VJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4 dEl0ZW06OmNyZWF0ZU5vbldoaXRlc3BhY2VJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lVGV4dEl0ZW06OmNyZWF0ZVNlZ21lbnRCcmVha0l0ZW0pOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlRW1wdHlJdGVtKToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OklubGluZVRleHRJdGVtKToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OnNwbGl0IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmlzV2hpdGVzcGFjZSBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzU29mdExpbmVCcmVhayk6IERlbGV0ZWQuCisg ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uaDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmlzU2VnbWVudEJyZWFrIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmlzV2hpdGVzcGFj ZSBjb25zdCk6IERlbGV0ZWQuCisKIDIwMTktMTAtMTkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE1vdmUgdGhlIGNvbGxhcHNlZCBiaXQgZnJv bSBJbmxpbmVJdGVtcyB0byBydW5zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAKaW5kZXggMmM5NGVmYjQ5Njll ODY1MjQxYTQyMjVkM2ZlNTNlOWZmZmMwNjY1Mi4uZjMzZTIxOWE1MDkzYjdjNThjMTQxYzdhOTYw MWMyNDQ1Nzg3MDU1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcApAQCAtMzMsMjAgKzMzLDE1IEBACiBu YW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAotc3RhdGljIGlubGluZSBi b29sIGlzV2hpdGVzcGFjZUNoYXJhY3RlcihjaGFyIGNoYXJhY3RlciwgYm9vbCBwcmVzZXJ2ZU5l d2xpbmUpCitzdGF0aWMgaW5saW5lIGJvb2wgaXNXaGl0ZXNwYWNlQ2hhcmFjdGVyKGNoYXIgY2hh cmFjdGVyKQogewotICAgIHJldHVybiBjaGFyYWN0ZXIgPT0gJyAnIHx8IGNoYXJhY3RlciA9PSAn XHQnIHx8IChjaGFyYWN0ZXIgPT0gJ1xuJyAmJiAhcHJlc2VydmVOZXdsaW5lKTsKKyAgICByZXR1 cm4gY2hhcmFjdGVyID09ICcgJyB8fCBjaGFyYWN0ZXIgPT0gJ1x0JzsKIH0KIAotc3RhdGljIGlu bGluZSBib29sIGlzU29mdExpbmVCcmVhayhjaGFyIGNoYXJhY3RlciwgYm9vbCBwcmVzZXJ2ZU5l d2xpbmUpCi17Ci0gICAgcmV0dXJuIHByZXNlcnZlTmV3bGluZSAmJiBjaGFyYWN0ZXIgPT0gJ1xu JzsKLX0KLQotc3RhdGljIHVuc2lnbmVkIG1vdmVUb05leHROb25XaGl0ZXNwYWNlUG9zaXRpb24o U3RyaW5nIHRleHRDb250ZW50LCB1bnNpZ25lZCBzdGFydFBvc2l0aW9uLCBib29sIHByZXNlcnZl TmV3bGluZSkKK3N0YXRpYyB1bnNpZ25lZCBtb3ZlVG9OZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9u KFN0cmluZyB0ZXh0Q29udGVudCwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbikKIHsKICAgICBhdXRv IG5leHROb25XaGl0ZVNwYWNlUG9zaXRpb24gPSBzdGFydFBvc2l0aW9uOwotICAgIHdoaWxlIChu ZXh0Tm9uV2hpdGVTcGFjZVBvc2l0aW9uIDwgdGV4dENvbnRlbnQubGVuZ3RoKCkgJiYgaXNXaGl0 ZXNwYWNlQ2hhcmFjdGVyKHRleHRDb250ZW50W25leHROb25XaGl0ZVNwYWNlUG9zaXRpb25dLCBw cmVzZXJ2ZU5ld2xpbmUpKQorICAgIHdoaWxlIChuZXh0Tm9uV2hpdGVTcGFjZVBvc2l0aW9uIDwg dGV4dENvbnRlbnQubGVuZ3RoKCkgJiYgaXNXaGl0ZXNwYWNlQ2hhcmFjdGVyKHRleHRDb250ZW50 W25leHROb25XaGl0ZVNwYWNlUG9zaXRpb25dKSkKICAgICAgICAgKytuZXh0Tm9uV2hpdGVTcGFj ZVBvc2l0aW9uOwogICAgIHJldHVybiBuZXh0Tm9uV2hpdGVTcGFjZVBvc2l0aW9uIC0gc3RhcnRQ b3NpdGlvbjsKIH0KQEAgLTg5LDM3ICs4NCw2NCBAQCB2b2lkIElubGluZVRleHRJdGVtOjpjcmVh dGVBbmRBcHBlbmRUZXh0SXRlbXMoSW5saW5lSXRlbXMmIGlubGluZUNvbnRlbnQsIGNvbnN0CiB7 CiAgICAgYXV0byB0ZXh0ID0gaW5saW5lQm94LnRleHRDb250ZW50KCk7CiAgICAgaWYgKCF0ZXh0 Lmxlbmd0aCgpKQotICAgICAgICByZXR1cm4gaW5saW5lQ29udGVudC5hcHBlbmQobWFrZVVuaXF1 ZTxJbmxpbmVUZXh0SXRlbT4oaW5saW5lQm94LCAwLCAwLCBmYWxzZSkpOworICAgICAgICByZXR1 cm4gaW5saW5lQ29udGVudC5hcHBlbmQoSW5saW5lVGV4dEl0ZW06OmNyZWF0ZUVtcHR5SXRlbShp bmxpbmVCb3gpKTsKIAogICAgIGF1dG8mIHN0eWxlID0gaW5saW5lQm94LnN0eWxlKCk7Ci0gICAg YXV0byBwcmVzZXJ2ZU5ld2xpbmUgPSBzdHlsZS5wcmVzZXJ2ZU5ld2xpbmUoKTsKICAgICBMYXp5 TGluZUJyZWFrSXRlcmF0b3IgbGluZUJyZWFrSXRlcmF0b3IodGV4dCk7CiAgICAgdW5zaWduZWQg Y3VycmVudFBvc2l0aW9uID0gMDsKICAgICB3aGlsZSAoY3VycmVudFBvc2l0aW9uIDwgdGV4dC5s ZW5ndGgoKSkgewotICAgICAgICAvLyBTb2Z0IGxpbmVicmVhaz8KLSAgICAgICAgaWYgKGlzU29m dExpbmVCcmVhayh0ZXh0W2N1cnJlbnRQb3NpdGlvbl0sIHByZXNlcnZlTmV3bGluZSkpIHsKLSAg ICAgICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKG1ha2VVbmlxdWU8SW5saW5lVGV4dEl0ZW0+ KGlubGluZUJveCwgY3VycmVudFBvc2l0aW9uLCAxLCB0cnVlKSk7CisgICAgICAgIGF1dG8gaXNT ZWdtZW50QnJlYWtDYW5kaWRhdGUgPSBbXShhdXRvIGNoYXJhY3RlcikgeworICAgICAgICAgICAg cmV0dXJuIGNoYXJhY3RlciA9PSAnXG4nOworICAgICAgICB9OworCisgICAgICAgIGlmIChpc1Nl Z21lbnRCcmVha0NhbmRpZGF0ZSh0ZXh0W2N1cnJlbnRQb3NpdGlvbl0pKSB7CisgICAgICAgICAg ICBpbmxpbmVDb250ZW50LmFwcGVuZChJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlU2VnbWVudEJyZWFr SXRlbShpbmxpbmVCb3gsIGN1cnJlbnRQb3NpdGlvbikpOwogICAgICAgICAgICAgKytjdXJyZW50 UG9zaXRpb247CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQotICAgICAgICBpZiAo aXNXaGl0ZXNwYWNlQ2hhcmFjdGVyKHRleHRbY3VycmVudFBvc2l0aW9uXSwgcHJlc2VydmVOZXds aW5lKSkgewotICAgICAgICAgICAgYXV0byBsZW5ndGggPSBtb3ZlVG9OZXh0Tm9uV2hpdGVzcGFj ZVBvc2l0aW9uKHRleHQsIGN1cnJlbnRQb3NpdGlvbiwgcHJlc2VydmVOZXdsaW5lKTsKLSAgICAg ICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKG1ha2VVbmlxdWU8SW5saW5lVGV4dEl0ZW0+KGlu bGluZUJveCwgY3VycmVudFBvc2l0aW9uLCBsZW5ndGgsIHRydWUpKTsKKyAgICAgICAgaWYgKGlz V2hpdGVzcGFjZUNoYXJhY3Rlcih0ZXh0W2N1cnJlbnRQb3NpdGlvbl0pKSB7CisgICAgICAgICAg ICBhdXRvIGxlbmd0aCA9IG1vdmVUb05leHROb25XaGl0ZXNwYWNlUG9zaXRpb24odGV4dCwgY3Vy cmVudFBvc2l0aW9uKTsKKyAgICAgICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKElubGluZVRl eHRJdGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRlbShpbmxpbmVCb3gsIGN1cnJlbnRQb3NpdGlvbiwg bGVuZ3RoKSk7CiAgICAgICAgICAgICBjdXJyZW50UG9zaXRpb24gKz0gbGVuZ3RoOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAogICAgICAgICBhdXRvIGxlbmd0aCA9IG1vdmVU b05leHRCcmVha2FibGVQb3NpdGlvbihjdXJyZW50UG9zaXRpb24sIGxpbmVCcmVha0l0ZXJhdG9y LCBzdHlsZSk7Ci0gICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKG1ha2VVbmlxdWU8SW5saW5l VGV4dEl0ZW0+KGlubGluZUJveCwgY3VycmVudFBvc2l0aW9uLCBsZW5ndGgsIGZhbHNlKSk7Cisg ICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKElubGluZVRleHRJdGVtOjpjcmVhdGVOb25XaGl0 ZXNwYWNlSXRlbShpbmxpbmVCb3gsIGN1cnJlbnRQb3NpdGlvbiwgbGVuZ3RoKSk7CiAgICAgICAg IGN1cnJlbnRQb3NpdGlvbiArPSBsZW5ndGg7CiAgICAgfQogfQogCi1JbmxpbmVUZXh0SXRlbTo6 SW5saW5lVGV4dEl0ZW0oY29uc3QgQm94JiBpbmxpbmVCb3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNp Z25lZCBsZW5ndGgsIGJvb2wgaXNXaGl0ZXNwYWNlKQorc3RkOjp1bmlxdWVfcHRyPElubGluZVRl eHRJdGVtPiBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlV2hpdGVzcGFjZUl0ZW0oY29uc3QgQm94JiBp bmxpbmVCb3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgpCit7CisgICAgcmV0dXJu IG1ha2VVbmlxdWU8SW5saW5lVGV4dEl0ZW0+KGlubGluZUJveCwgc3RhcnQsIGxlbmd0aCwgVGV4 dEl0ZW1UeXBlOjpXaGl0ZXNwYWNlKTsKK30KKworc3RkOjp1bmlxdWVfcHRyPElubGluZVRleHRJ dGVtPiBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlTm9uV2hpdGVzcGFjZUl0ZW0oY29uc3QgQm94JiBp bmxpbmVCb3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgpCit7CisgICAgcmV0dXJu IG1ha2VVbmlxdWU8SW5saW5lVGV4dEl0ZW0+KGlubGluZUJveCwgc3RhcnQsIGxlbmd0aCwgVGV4 dEl0ZW1UeXBlOjpOb25XaGl0ZXNwYWNlKTsKK30KKworc3RkOjp1bmlxdWVfcHRyPElubGluZVRl eHRJdGVtPiBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlU2VnbWVudEJyZWFrSXRlbShjb25zdCBCb3gm IGlubGluZUJveCwgdW5zaWduZWQgcG9zaXRpb24pCit7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8 SW5saW5lVGV4dEl0ZW0+KGlubGluZUJveCwgcG9zaXRpb24sIDEsIFRleHRJdGVtVHlwZTo6U2Vn bWVudEJyZWFrKTsKK30KKworc3RkOjp1bmlxdWVfcHRyPElubGluZVRleHRJdGVtPiBJbmxpbmVU ZXh0SXRlbTo6Y3JlYXRlRW1wdHlJdGVtKGNvbnN0IEJveCYgaW5saW5lQm94KQoreworICAgIHJl dHVybiBtYWtlVW5pcXVlPElubGluZVRleHRJdGVtPihpbmxpbmVCb3gpOworfQorCitJbmxpbmVU ZXh0SXRlbTo6SW5saW5lVGV4dEl0ZW0oY29uc3QgQm94JiBpbmxpbmVCb3gsIHVuc2lnbmVkIHN0 YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIFRleHRJdGVtVHlwZSB0ZXh0SXRlbVR5cGUpCiAgICAgOiBJ bmxpbmVJdGVtKGlubGluZUJveCwgVHlwZTo6VGV4dCkKICAgICAsIG1fc3RhcnQoc3RhcnQpCiAg ICAgLCBtX2xlbmd0aChsZW5ndGgpCi0gICAgLCBtX2lzV2hpdGVzcGFjZShpc1doaXRlc3BhY2Up CisgICAgLCBtX3RleHRJdGVtVHlwZSh0ZXh0SXRlbVR5cGUpCit7Cit9CisKK0lubGluZVRleHRJ dGVtOjpJbmxpbmVUZXh0SXRlbShjb25zdCBCb3gmIGlubGluZUJveCkKKyAgICA6IElubGluZUl0 ZW0oaW5saW5lQm94LCBUeXBlOjpUZXh0KQogewogfQogCkBAIC0xMjcsNyArMTQ5LDE1IEBAIHN0 ZDo6dW5pcXVlX3B0cjxJbmxpbmVUZXh0SXRlbT4gSW5saW5lVGV4dEl0ZW06OnNwbGl0KHVuc2ln bmVkIHNwbGl0UG9zaXRpb24sIHVuCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoc3BsaXRQb3NpdGlv biA+PSB0aGlzLT5zdGFydCgpKTsKICAgICBSRUxFQVNFX0FTU0VSVChzcGxpdFBvc2l0aW9uICsg bGVuZ3RoIDw9IGVuZCgpKTsKLSAgICByZXR1cm4gbWFrZVVuaXF1ZTxJbmxpbmVUZXh0SXRlbT4o bGF5b3V0Qm94KCksIHNwbGl0UG9zaXRpb24sIGxlbmd0aCwgaXNXaGl0ZXNwYWNlKCkpOworICAg IEFTU0VSVCghaXNTZWdtZW50QnJlYWsoKSk7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8SW5saW5l VGV4dEl0ZW0+KGxheW91dEJveCgpLCBzcGxpdFBvc2l0aW9uLCBsZW5ndGgsIG1fdGV4dEl0ZW1U eXBlKTsKK30KKworYm9vbCBJbmxpbmVUZXh0SXRlbTo6aXNXaGl0ZXNwYWNlKCkgY29uc3QKK3sK KyAgICBpZiAoaXNTZWdtZW50QnJlYWsoKSkKKyAgICAgICAgcmV0dXJuICFzdHlsZSgpLnByZXNl cnZlTmV3bGluZSgpOworICAgIHJldHVybiBtX3RleHRJdGVtVHlwZSA9PSBUZXh0SXRlbVR5cGU6 OldoaXRlc3BhY2U7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5oCmluZGV4IDQ1ZmE2ZTE0OGQ3YTkwYThj NTQ4NjQ5NDZhOWRhZGIwZjQyYTBmNzcuLjBhOWMzMDU0ZjE0MTZmOTc1YTAzZWVkYWQwZjNmNDgx NjE5ZmQyZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZVRleHRJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uaApAQCAtMzcsMjMgKzM3LDM2IEBAIGNsYXNzIElubGlu ZVRleHRJdGVtIDogcHVibGljIElubGluZUl0ZW0gewogcHVibGljOgogICAgIHN0YXRpYyB2b2lk IGNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyhJbmxpbmVJdGVtcyYsIGNvbnN0IEJveCYpOwogCi0g ICAgSW5saW5lVGV4dEl0ZW0oY29uc3QgQm94JiwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGxl bmd0aCwgYm9vbCBpc1doaXRlc3BhY2UpOworICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8SW5s aW5lVGV4dEl0ZW0+IGNyZWF0ZVdoaXRlc3BhY2VJdGVtKGNvbnN0IEJveCYsIHVuc2lnbmVkIHN0 YXJ0LCB1bnNpZ25lZCBsZW5ndGgpOworICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8SW5saW5l VGV4dEl0ZW0+IGNyZWF0ZU5vbldoaXRlc3BhY2VJdGVtKGNvbnN0IEJveCYsIHVuc2lnbmVkIHN0 YXJ0LCB1bnNpZ25lZCBsZW5ndGgpOworICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8SW5saW5l VGV4dEl0ZW0+IGNyZWF0ZVNlZ21lbnRCcmVha0l0ZW0oY29uc3QgQm94JiwgdW5zaWduZWQgcG9z aXRpb24pOworICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8SW5saW5lVGV4dEl0ZW0+IGNyZWF0 ZUVtcHR5SXRlbShjb25zdCBCb3gmKTsKIAogICAgIHVuc2lnbmVkIHN0YXJ0KCkgY29uc3QgeyBy ZXR1cm4gbV9zdGFydDsgfQogICAgIHVuc2lnbmVkIGVuZCgpIGNvbnN0IHsgcmV0dXJuIHN0YXJ0 KCkgKyBsZW5ndGgoKTsgfQogICAgIHVuc2lnbmVkIGxlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIG1f bGVuZ3RoOyB9CiAKLSAgICBib29sIGlzV2hpdGVzcGFjZSgpIGNvbnN0IHsgcmV0dXJuIG1faXNX aGl0ZXNwYWNlOyB9CisgICAgYm9vbCBpc1doaXRlc3BhY2UoKSBjb25zdDsKICAgICBib29sIGlz Q29sbGFwc2libGUoKSBjb25zdCB7IHJldHVybiBpc1doaXRlc3BhY2UoKSAmJiBzdHlsZSgpLmNv bGxhcHNlV2hpdGVTcGFjZSgpOyB9CisgICAgYm9vbCBpc1NlZ21lbnRCcmVhaygpIGNvbnN0Owog CiAgICAgc3RkOjp1bmlxdWVfcHRyPElubGluZVRleHRJdGVtPiBzcGxpdCh1bnNpZ25lZCBzcGxp dFBvc2l0aW9uLCB1bnNpZ25lZCBsZW5ndGgpIGNvbnN0OwogCisgICAgZW51bSBjbGFzcyBUZXh0 SXRlbVR5cGUgeyBVbmRlZmluZWQsIFdoaXRlc3BhY2UsIE5vbldoaXRlc3BhY2UsIFNlZ21lbnRC cmVhayB9OworICAgIElubGluZVRleHRJdGVtKGNvbnN0IEJveCYsIHVuc2lnbmVkIHN0YXJ0LCB1 bnNpZ25lZCBsZW5ndGgsIFRleHRJdGVtVHlwZSk7CisgICAgSW5saW5lVGV4dEl0ZW0oY29uc3Qg Qm94Jik7CisKIHByaXZhdGU6CiAgICAgdW5zaWduZWQgbV9zdGFydCB7IDAgfTsKICAgICB1bnNp Z25lZCBtX2xlbmd0aCB7IDAgfTsKLSAgICBib29sIG1faXNXaGl0ZXNwYWNlIHsgZmFsc2UgfTsK KyAgICBUZXh0SXRlbVR5cGUgbV90ZXh0SXRlbVR5cGUgeyBUZXh0SXRlbVR5cGU6OlVuZGVmaW5l ZCB9OwogfTsKIAoraW5saW5lIGJvb2wgSW5saW5lVGV4dEl0ZW06OmlzU2VnbWVudEJyZWFrKCkg Y29uc3QKK3sKKyAgICByZXR1cm4gbV90ZXh0SXRlbVR5cGUgPT0gVGV4dEl0ZW1UeXBlOjpTZWdt ZW50QnJlYWs7Cit9CisKIH0KIH0KIAo= 381384 2019-10-19 18:28:44 -0700 2019-10-20 00:37:29 -0700 Patch bug-203184-20191019182841.patch text/plain 9256 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2QzMzBjNmNkYjk3Yjkz M2JlYzNlNDZjNGVhZDBhODc0ZjY2YjM1Mi4uZDdhNTIxODM2ZDQyYzIyMDdlYmJhYzA5YzgzODE5 NWI0OWIwYTJlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTEwLTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNYWtlIElu bGluZVRleHRJdGVtIHJldXNhYmxlIHdoZW4gJ3NlZ21lbnQgYnJlYWsnIGJlaGF2aW9yIGNoYW5n ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzE4 NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTY0Mzg5NDU+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5saW5lVGV4dEl0ZW06OmlzV2hpdGVzcGFj ZSBzaG91bGQgZHluYW1pY2FsbHkgY2hlY2sgZm9yICdwcmVzZXJ2ZSBuZXcgbGluZScgYmVoYXZp b3IuIFRoaXMgd2F5IHdlIGRvbid0IGhhdmUgdG8gcmVidWlsZCB0aGUgaW5saW5lIGl0ZW0gbGlz dAorICAgICAgICB3aGVuIHRoZSByZWxhdGVkIHN0eWxlIHByb3BlcnR5IHZhbHVlIGNoYW5nZXMu CisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzV2hpdGVzcGFjZUNoYXJhY3Rlcik6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6Om1vdmVUb05leHROb25XaGl0ZXNwYWNlUG9zaXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlQW5kQXBwZW5k VGV4dEl0ZW1zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmNy ZWF0ZVdoaXRlc3BhY2VJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4 dEl0ZW06OmNyZWF0ZU5vbldoaXRlc3BhY2VJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lVGV4dEl0ZW06OmNyZWF0ZVNlZ21lbnRCcmVha0l0ZW0pOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlRW1wdHlJdGVtKToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OklubGluZVRleHRJdGVtKToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OnNwbGl0IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmlzV2hpdGVzcGFjZSBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzU29mdExpbmVCcmVhayk6IERlbGV0ZWQuCisg ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uaDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmlzU2VnbWVudEJyZWFrIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmlzV2hpdGVzcGFj ZSBjb25zdCk6IERlbGV0ZWQuCisKIDIwMTktMTAtMTkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE1vdmUgdGhlIGNvbGxhcHNlZCBiaXQgZnJv bSBJbmxpbmVJdGVtcyB0byBydW5zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAKaW5kZXggMmM5NGVmYjQ5Njll ODY1MjQxYTQyMjVkM2ZlNTNlOWZmZmMwNjY1Mi4uZjc5NDAzYzY3NzM3N2ExNDhjYWU1ZTgyNzM5 NGY4YjE5ZGViYWY1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcApAQCAtMzMsMjAgKzMzLDE1IEBACiBu YW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAotc3RhdGljIGlubGluZSBi b29sIGlzV2hpdGVzcGFjZUNoYXJhY3RlcihjaGFyIGNoYXJhY3RlciwgYm9vbCBwcmVzZXJ2ZU5l d2xpbmUpCitzdGF0aWMgaW5saW5lIGJvb2wgaXNXaGl0ZXNwYWNlQ2hhcmFjdGVyKGNoYXIgY2hh cmFjdGVyKQogewotICAgIHJldHVybiBjaGFyYWN0ZXIgPT0gJyAnIHx8IGNoYXJhY3RlciA9PSAn XHQnIHx8IChjaGFyYWN0ZXIgPT0gJ1xuJyAmJiAhcHJlc2VydmVOZXdsaW5lKTsKKyAgICByZXR1 cm4gY2hhcmFjdGVyID09ICcgJyB8fCBjaGFyYWN0ZXIgPT0gJ1x0JzsKIH0KIAotc3RhdGljIGlu bGluZSBib29sIGlzU29mdExpbmVCcmVhayhjaGFyIGNoYXJhY3RlciwgYm9vbCBwcmVzZXJ2ZU5l d2xpbmUpCi17Ci0gICAgcmV0dXJuIHByZXNlcnZlTmV3bGluZSAmJiBjaGFyYWN0ZXIgPT0gJ1xu JzsKLX0KLQotc3RhdGljIHVuc2lnbmVkIG1vdmVUb05leHROb25XaGl0ZXNwYWNlUG9zaXRpb24o U3RyaW5nIHRleHRDb250ZW50LCB1bnNpZ25lZCBzdGFydFBvc2l0aW9uLCBib29sIHByZXNlcnZl TmV3bGluZSkKK3N0YXRpYyB1bnNpZ25lZCBtb3ZlVG9OZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9u KFN0cmluZyB0ZXh0Q29udGVudCwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbikKIHsKICAgICBhdXRv IG5leHROb25XaGl0ZVNwYWNlUG9zaXRpb24gPSBzdGFydFBvc2l0aW9uOwotICAgIHdoaWxlIChu ZXh0Tm9uV2hpdGVTcGFjZVBvc2l0aW9uIDwgdGV4dENvbnRlbnQubGVuZ3RoKCkgJiYgaXNXaGl0 ZXNwYWNlQ2hhcmFjdGVyKHRleHRDb250ZW50W25leHROb25XaGl0ZVNwYWNlUG9zaXRpb25dLCBw cmVzZXJ2ZU5ld2xpbmUpKQorICAgIHdoaWxlIChuZXh0Tm9uV2hpdGVTcGFjZVBvc2l0aW9uIDwg dGV4dENvbnRlbnQubGVuZ3RoKCkgJiYgaXNXaGl0ZXNwYWNlQ2hhcmFjdGVyKHRleHRDb250ZW50 W25leHROb25XaGl0ZVNwYWNlUG9zaXRpb25dKSkKICAgICAgICAgKytuZXh0Tm9uV2hpdGVTcGFj ZVBvc2l0aW9uOwogICAgIHJldHVybiBuZXh0Tm9uV2hpdGVTcGFjZVBvc2l0aW9uIC0gc3RhcnRQ b3NpdGlvbjsKIH0KQEAgLTg5LDM3ICs4NCw2NCBAQCB2b2lkIElubGluZVRleHRJdGVtOjpjcmVh dGVBbmRBcHBlbmRUZXh0SXRlbXMoSW5saW5lSXRlbXMmIGlubGluZUNvbnRlbnQsIGNvbnN0CiB7 CiAgICAgYXV0byB0ZXh0ID0gaW5saW5lQm94LnRleHRDb250ZW50KCk7CiAgICAgaWYgKCF0ZXh0 Lmxlbmd0aCgpKQotICAgICAgICByZXR1cm4gaW5saW5lQ29udGVudC5hcHBlbmQobWFrZVVuaXF1 ZTxJbmxpbmVUZXh0SXRlbT4oaW5saW5lQm94LCAwLCAwLCBmYWxzZSkpOworICAgICAgICByZXR1 cm4gaW5saW5lQ29udGVudC5hcHBlbmQoSW5saW5lVGV4dEl0ZW06OmNyZWF0ZUVtcHR5SXRlbShp bmxpbmVCb3gpKTsKIAogICAgIGF1dG8mIHN0eWxlID0gaW5saW5lQm94LnN0eWxlKCk7Ci0gICAg YXV0byBwcmVzZXJ2ZU5ld2xpbmUgPSBzdHlsZS5wcmVzZXJ2ZU5ld2xpbmUoKTsKICAgICBMYXp5 TGluZUJyZWFrSXRlcmF0b3IgbGluZUJyZWFrSXRlcmF0b3IodGV4dCk7CiAgICAgdW5zaWduZWQg Y3VycmVudFBvc2l0aW9uID0gMDsKICAgICB3aGlsZSAoY3VycmVudFBvc2l0aW9uIDwgdGV4dC5s ZW5ndGgoKSkgewotICAgICAgICAvLyBTb2Z0IGxpbmVicmVhaz8KLSAgICAgICAgaWYgKGlzU29m dExpbmVCcmVhayh0ZXh0W2N1cnJlbnRQb3NpdGlvbl0sIHByZXNlcnZlTmV3bGluZSkpIHsKLSAg ICAgICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKG1ha2VVbmlxdWU8SW5saW5lVGV4dEl0ZW0+ KGlubGluZUJveCwgY3VycmVudFBvc2l0aW9uLCAxLCB0cnVlKSk7CisgICAgICAgIGF1dG8gaXNT ZWdtZW50QnJlYWtDYW5kaWRhdGUgPSBbXShhdXRvIGNoYXJhY3RlcikgeworICAgICAgICAgICAg cmV0dXJuIGNoYXJhY3RlciA9PSAnXG4nOworICAgICAgICB9OworCisgICAgICAgIGlmIChpc1Nl Z21lbnRCcmVha0NhbmRpZGF0ZSh0ZXh0W2N1cnJlbnRQb3NpdGlvbl0pKSB7CisgICAgICAgICAg ICBpbmxpbmVDb250ZW50LmFwcGVuZChJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlU2VnbWVudEJyZWFr SXRlbShpbmxpbmVCb3gsIGN1cnJlbnRQb3NpdGlvbikpOwogICAgICAgICAgICAgKytjdXJyZW50 UG9zaXRpb247CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQotICAgICAgICBpZiAo aXNXaGl0ZXNwYWNlQ2hhcmFjdGVyKHRleHRbY3VycmVudFBvc2l0aW9uXSwgcHJlc2VydmVOZXds aW5lKSkgewotICAgICAgICAgICAgYXV0byBsZW5ndGggPSBtb3ZlVG9OZXh0Tm9uV2hpdGVzcGFj ZVBvc2l0aW9uKHRleHQsIGN1cnJlbnRQb3NpdGlvbiwgcHJlc2VydmVOZXdsaW5lKTsKLSAgICAg ICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKG1ha2VVbmlxdWU8SW5saW5lVGV4dEl0ZW0+KGlu bGluZUJveCwgY3VycmVudFBvc2l0aW9uLCBsZW5ndGgsIHRydWUpKTsKKyAgICAgICAgaWYgKGlz V2hpdGVzcGFjZUNoYXJhY3Rlcih0ZXh0W2N1cnJlbnRQb3NpdGlvbl0pKSB7CisgICAgICAgICAg ICBhdXRvIGxlbmd0aCA9IG1vdmVUb05leHROb25XaGl0ZXNwYWNlUG9zaXRpb24odGV4dCwgY3Vy cmVudFBvc2l0aW9uKTsKKyAgICAgICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKElubGluZVRl eHRJdGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRlbShpbmxpbmVCb3gsIGN1cnJlbnRQb3NpdGlvbiwg bGVuZ3RoKSk7CiAgICAgICAgICAgICBjdXJyZW50UG9zaXRpb24gKz0gbGVuZ3RoOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAogICAgICAgICBhdXRvIGxlbmd0aCA9IG1vdmVU b05leHRCcmVha2FibGVQb3NpdGlvbihjdXJyZW50UG9zaXRpb24sIGxpbmVCcmVha0l0ZXJhdG9y LCBzdHlsZSk7Ci0gICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKG1ha2VVbmlxdWU8SW5saW5l VGV4dEl0ZW0+KGlubGluZUJveCwgY3VycmVudFBvc2l0aW9uLCBsZW5ndGgsIGZhbHNlKSk7Cisg ICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKElubGluZVRleHRJdGVtOjpjcmVhdGVOb25XaGl0 ZXNwYWNlSXRlbShpbmxpbmVCb3gsIGN1cnJlbnRQb3NpdGlvbiwgbGVuZ3RoKSk7CiAgICAgICAg IGN1cnJlbnRQb3NpdGlvbiArPSBsZW5ndGg7CiAgICAgfQogfQogCi1JbmxpbmVUZXh0SXRlbTo6 SW5saW5lVGV4dEl0ZW0oY29uc3QgQm94JiBpbmxpbmVCb3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNp Z25lZCBsZW5ndGgsIGJvb2wgaXNXaGl0ZXNwYWNlKQorc3RkOjp1bmlxdWVfcHRyPElubGluZVRl eHRJdGVtPiBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlV2hpdGVzcGFjZUl0ZW0oY29uc3QgQm94JiBp bmxpbmVCb3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgpCit7CisgICAgcmV0dXJu IG1ha2VVbmlxdWU8SW5saW5lVGV4dEl0ZW0+KGlubGluZUJveCwgc3RhcnQsIGxlbmd0aCwgVGV4 dEl0ZW1UeXBlOjpXaGl0ZXNwYWNlKTsKK30KKworc3RkOjp1bmlxdWVfcHRyPElubGluZVRleHRJ dGVtPiBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlTm9uV2hpdGVzcGFjZUl0ZW0oY29uc3QgQm94JiBp bmxpbmVCb3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgpCit7CisgICAgcmV0dXJu IG1ha2VVbmlxdWU8SW5saW5lVGV4dEl0ZW0+KGlubGluZUJveCwgc3RhcnQsIGxlbmd0aCwgVGV4 dEl0ZW1UeXBlOjpOb25XaGl0ZXNwYWNlKTsKK30KKworc3RkOjp1bmlxdWVfcHRyPElubGluZVRl eHRJdGVtPiBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlU2VnbWVudEJyZWFrSXRlbShjb25zdCBCb3gm IGlubGluZUJveCwgdW5zaWduZWQgcG9zaXRpb24pCit7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8 SW5saW5lVGV4dEl0ZW0+KGlubGluZUJveCwgcG9zaXRpb24sIDEsIFRleHRJdGVtVHlwZTo6U2Vn bWVudEJyZWFrKTsKK30KKworc3RkOjp1bmlxdWVfcHRyPElubGluZVRleHRJdGVtPiBJbmxpbmVU ZXh0SXRlbTo6Y3JlYXRlRW1wdHlJdGVtKGNvbnN0IEJveCYgaW5saW5lQm94KQoreworICAgIHJl dHVybiBtYWtlVW5pcXVlPElubGluZVRleHRJdGVtPihpbmxpbmVCb3gpOworfQorCitJbmxpbmVU ZXh0SXRlbTo6SW5saW5lVGV4dEl0ZW0oY29uc3QgQm94JiBpbmxpbmVCb3gsIHVuc2lnbmVkIHN0 YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIFRleHRJdGVtVHlwZSB0ZXh0SXRlbVR5cGUpCiAgICAgOiBJ bmxpbmVJdGVtKGlubGluZUJveCwgVHlwZTo6VGV4dCkKICAgICAsIG1fc3RhcnQoc3RhcnQpCiAg ICAgLCBtX2xlbmd0aChsZW5ndGgpCi0gICAgLCBtX2lzV2hpdGVzcGFjZShpc1doaXRlc3BhY2Up CisgICAgLCBtX3RleHRJdGVtVHlwZSh0ZXh0SXRlbVR5cGUpCit7Cit9CisKK0lubGluZVRleHRJ dGVtOjpJbmxpbmVUZXh0SXRlbShjb25zdCBCb3gmIGlubGluZUJveCkKKyAgICA6IElubGluZUl0 ZW0oaW5saW5lQm94LCBUeXBlOjpUZXh0KQogewogfQogCkBAIC0xMjcsNyArMTQ5LDE2IEBAIHN0 ZDo6dW5pcXVlX3B0cjxJbmxpbmVUZXh0SXRlbT4gSW5saW5lVGV4dEl0ZW06OnNwbGl0KHVuc2ln bmVkIHNwbGl0UG9zaXRpb24sIHVuCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoc3BsaXRQb3NpdGlv biA+PSB0aGlzLT5zdGFydCgpKTsKICAgICBSRUxFQVNFX0FTU0VSVChzcGxpdFBvc2l0aW9uICsg bGVuZ3RoIDw9IGVuZCgpKTsKLSAgICByZXR1cm4gbWFrZVVuaXF1ZTxJbmxpbmVUZXh0SXRlbT4o bGF5b3V0Qm94KCksIHNwbGl0UG9zaXRpb24sIGxlbmd0aCwgaXNXaGl0ZXNwYWNlKCkpOworICAg IEFTU0VSVCghaXNTZWdtZW50QnJlYWsoKSk7CisgICAgQVNTRVJUKG1fdGV4dEl0ZW1UeXBlICE9 IFRleHRJdGVtVHlwZTo6VW5kZWZpbmVkKTsKKyAgICByZXR1cm4gbWFrZVVuaXF1ZTxJbmxpbmVU ZXh0SXRlbT4obGF5b3V0Qm94KCksIHNwbGl0UG9zaXRpb24sIGxlbmd0aCwgbV90ZXh0SXRlbVR5 cGUpOworfQorCitib29sIElubGluZVRleHRJdGVtOjppc1doaXRlc3BhY2UoKSBjb25zdAorewor ICAgIGlmIChpc1NlZ21lbnRCcmVhaygpKQorICAgICAgICByZXR1cm4gIXN0eWxlKCkucHJlc2Vy dmVOZXdsaW5lKCk7CisgICAgcmV0dXJuIG1fdGV4dEl0ZW1UeXBlID09IFRleHRJdGVtVHlwZTo6 V2hpdGVzcGFjZTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmgKaW5kZXggNDVmYTZlMTQ4ZDdhOTBhOGM1 NDg2NDk0NmE5ZGFkYjBmNDJhMGY3Ny4uMGE5YzMwNTRmMTQxNmY5NzVhMDNlZWRhZDBmM2Y0ODE2 MTlmZDJlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lVGV4dEl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVUZXh0SXRlbS5oCkBAIC0zNywyMyArMzcsMzYgQEAgY2xhc3MgSW5saW5l VGV4dEl0ZW0gOiBwdWJsaWMgSW5saW5lSXRlbSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQg Y3JlYXRlQW5kQXBwZW5kVGV4dEl0ZW1zKElubGluZUl0ZW1zJiwgY29uc3QgQm94Jik7CiAKLSAg ICBJbmxpbmVUZXh0SXRlbShjb25zdCBCb3gmLCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgbGVu Z3RoLCBib29sIGlzV2hpdGVzcGFjZSk7CisgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxJbmxp bmVUZXh0SXRlbT4gY3JlYXRlV2hpdGVzcGFjZUl0ZW0oY29uc3QgQm94JiwgdW5zaWduZWQgc3Rh cnQsIHVuc2lnbmVkIGxlbmd0aCk7CisgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVU ZXh0SXRlbT4gY3JlYXRlTm9uV2hpdGVzcGFjZUl0ZW0oY29uc3QgQm94JiwgdW5zaWduZWQgc3Rh cnQsIHVuc2lnbmVkIGxlbmd0aCk7CisgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVU ZXh0SXRlbT4gY3JlYXRlU2VnbWVudEJyZWFrSXRlbShjb25zdCBCb3gmLCB1bnNpZ25lZCBwb3Np dGlvbik7CisgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVUZXh0SXRlbT4gY3JlYXRl RW1wdHlJdGVtKGNvbnN0IEJveCYpOwogCiAgICAgdW5zaWduZWQgc3RhcnQoKSBjb25zdCB7IHJl dHVybiBtX3N0YXJ0OyB9CiAgICAgdW5zaWduZWQgZW5kKCkgY29uc3QgeyByZXR1cm4gc3RhcnQo KSArIGxlbmd0aCgpOyB9CiAgICAgdW5zaWduZWQgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gbV9s ZW5ndGg7IH0KIAotICAgIGJvb2wgaXNXaGl0ZXNwYWNlKCkgY29uc3QgeyByZXR1cm4gbV9pc1do aXRlc3BhY2U7IH0KKyAgICBib29sIGlzV2hpdGVzcGFjZSgpIGNvbnN0OwogICAgIGJvb2wgaXND b2xsYXBzaWJsZSgpIGNvbnN0IHsgcmV0dXJuIGlzV2hpdGVzcGFjZSgpICYmIHN0eWxlKCkuY29s bGFwc2VXaGl0ZVNwYWNlKCk7IH0KKyAgICBib29sIGlzU2VnbWVudEJyZWFrKCkgY29uc3Q7CiAK ICAgICBzdGQ6OnVuaXF1ZV9wdHI8SW5saW5lVGV4dEl0ZW0+IHNwbGl0KHVuc2lnbmVkIHNwbGl0 UG9zaXRpb24sIHVuc2lnbmVkIGxlbmd0aCkgY29uc3Q7CiAKKyAgICBlbnVtIGNsYXNzIFRleHRJ dGVtVHlwZSB7IFVuZGVmaW5lZCwgV2hpdGVzcGFjZSwgTm9uV2hpdGVzcGFjZSwgU2VnbWVudEJy ZWFrIH07CisgICAgSW5saW5lVGV4dEl0ZW0oY29uc3QgQm94JiwgdW5zaWduZWQgc3RhcnQsIHVu c2lnbmVkIGxlbmd0aCwgVGV4dEl0ZW1UeXBlKTsKKyAgICBJbmxpbmVUZXh0SXRlbShjb25zdCBC b3gmKTsKKwogcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX3N0YXJ0IHsgMCB9OwogICAgIHVuc2ln bmVkIG1fbGVuZ3RoIHsgMCB9OwotICAgIGJvb2wgbV9pc1doaXRlc3BhY2UgeyBmYWxzZSB9Owor ICAgIFRleHRJdGVtVHlwZSBtX3RleHRJdGVtVHlwZSB7IFRleHRJdGVtVHlwZTo6VW5kZWZpbmVk IH07CiB9OwogCitpbmxpbmUgYm9vbCBJbmxpbmVUZXh0SXRlbTo6aXNTZWdtZW50QnJlYWsoKSBj b25zdAoreworICAgIHJldHVybiBtX3RleHRJdGVtVHlwZSA9PSBUZXh0SXRlbVR5cGU6OlNlZ21l bnRCcmVhazsKK30KKwogfQogfQogCg==