249698 2022-12-20 21:09:44 -0800 [IFC][hanging punctuation] LineBuilder::candidateContentForLine should take "StopOrComma" into account when searching for trailing hanging content 2022-12-23 00:37:16 -0800 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 1920995 0 zalan 2022-12-20 21:09:44 -0800 ssia 1920996 1 464136 zalan 2022-12-20 21:18:40 -0800 Created attachment 464136 Patch 1921000 2 464139 zalan 2022-12-20 21:34:22 -0800 Created attachment 464139 Patch 1921637 3 ews-feeder 2022-12-23 00:36:12 -0800 Committed 258288@main (b673ad130ad2): <https://commits.webkit.org/258288@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 464139. 1921638 4 webkit-bug-importer 2022-12-23 00:37:16 -0800 <rdar://problem/103663839> 464136 2022-12-20 21:18:40 -0800 2022-12-20 21:34:18 -0800 Patch bug-249698-20221220211839.patch text/plain 7012 zalan RnJvbSA5NmFhZTA3Y2FhODg1NTRmYThhOTM4ZjgwNzI4NzJkMjU1MDQzZDIzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFR1ZSwgMjAgRGVjIDIwMjIgMjE6MDk6NTMgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVto YW5naW5nIHB1bmN0dWF0aW9uXQogTGluZUJ1aWxkZXI6OmNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5l IHNob3VsZCB0YWtlICJTdG9wT3JDb21hIiBpbnRvIGFjY291bnQKIHdoZW4gc2VhcmNoaW5nIGZv ciB0cmFpbGluZyBoYW5naW5nIGNvbnRlbnQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yNDk2OTgKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBpcyBw cmVwYXJhdGlvbiBmb3Igc3VwcG9ydGluZyAiaGFuZ2luZy1wdW5jdHVhdGlvbjogYWxsb3ctZW5k Ii4KKExldCdzIHNlYXJjaCBmb3IgIlN0b3BPckNvbWEiIGluIHRoZSBjYW5kaWRhdGUgY29udGVu dCBzbyB0aGF0IGxpbmUgYnJlYWtpbmcgY2FuIHVzZSB0aGlzIGluZm8gdG8gY2Fycnkgb3V0IGxp bmUgZml0dGluZyBwcm9wZXJseS4pCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6 TGluZUJ1aWxkZXI6OnRyYWlsaW5nUHVuY3R1YXRpb25PclN0b3BPckNvbWVXaWR0aEZvckxpbmVD YW5kaWF0ZSBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpjYW5kaWRhdGVD b250ZW50Rm9yTGluZSk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjp0cmFpbGluZ1B1 bmN0dWF0aW9uV2lkdGhGb3JMaW5lQ2FuZGlhdGUgY29uc3QpOiBEZWxldGVkLgoqIFNvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVy Lmg6Ci0tLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgICAgICAgICAgICAgIHwg NDcgKysrKysrKysrKysrLS0tLS0tLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oICAg ICAgICAgICAgICAgIHwgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwg MTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3Bw CmluZGV4IDA5NzU4NGI0NzBmZS4uNTYwYjVmYjQ0ZjQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC02NjcsMjkgKzY2Nyw0NCBAQCBJbmxpbmVMYXlvdXRV bml0IExpbmVCdWlsZGVyOjpsZWFkaW5nUHVuY3R1YXRpb25XaWR0aEZvckxpbmVDYW5kaWF0ZShz aXplX3QgZmlycwogICAgIHJldHVybiBUZXh0VXRpbDo6aGFuZ2FibGVQdW5jdHVhdGlvblN0YXJ0 V2lkdGgoaW5saW5lVGV4dEl0ZW0sIHN0eWxlKTsKIH0KIAotSW5saW5lTGF5b3V0VW5pdCBMaW5l QnVpbGRlcjo6dHJhaWxpbmdQdW5jdHVhdGlvbldpZHRoRm9yTGluZUNhbmRpYXRlKHNpemVfdCBs YXN0SW5saW5lVGV4dEl0ZW1JbmRleCwgc2l6ZV90IGxheW91dFJhbmdlRW5kKSBjb25zdAorSW5s aW5lTGF5b3V0VW5pdCBMaW5lQnVpbGRlcjo6dHJhaWxpbmdQdW5jdHVhdGlvbk9yU3RvcE9yQ29t ZVdpZHRoRm9yTGluZUNhbmRpYXRlKHNpemVfdCBsYXN0SW5saW5lVGV4dEl0ZW1JbmRleCwgc2l6 ZV90IGNhbmRpZGF0ZUNvbnRlbnRFbmQsIHNpemVfdCBsYXlvdXRSYW5nZUVuZCkgY29uc3QKIHsK KyAgICBBU1NFUlQoY2FuZGlkYXRlQ29udGVudEVuZCA8PSBsYXlvdXRSYW5nZUVuZCk7CiAgICAg YXV0byYgaW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4obV9pbmxpbmVJ dGVtc1tsYXN0SW5saW5lVGV4dEl0ZW1JbmRleF0pOwogICAgIGF1dG8mIHN0eWxlID0gaXNGaXJz dEZvcm1hdHRlZExpbmUoKSA/IGlubGluZVRleHRJdGVtLmZpcnN0TGluZVN0eWxlKCkgOiBpbmxp bmVUZXh0SXRlbS5zdHlsZSgpOwotICAgIGlmICghVGV4dFV0aWw6Omhhc0hhbmdhYmxlUHVuY3R1 YXRpb25FbmQoaW5saW5lVGV4dEl0ZW0sIHN0eWxlKSkKLSAgICAgICAgcmV0dXJuIHsgfTsKIAot ICAgIC8vIEZJWE1FOiBJZiB0aGlzIHR1cm5zIG91dCB0byBiZSBwcm9ibGVtYXRpYyAoZmluZGlu ZyBvdXQgaWYgdGhpcyBpcyB0aGUgbGFzdCBmb3JtYXR0ZWQgbGluZSB0aGF0IGlzKSwgd2UKLSAg ICAvLyBtYXkgaGF2ZSB0byBmYWxsYmFjayB0byBhIHBvc3QtcHJvY2VzcyBzZXR1cCwgd2hlcmUg YWZ0ZXIgZmluaXNoaW5nIGxheWluZyBvdXQgdGhlIGNvbnRlbnQsIHdlIGdvIGJhY2sgYW5kIHJl LWxheW91dAotICAgIC8vIHRoZSBsYXN0ICgyPykgbGluZShzKSB3aGVuIHRoZXJlJ3MgdHJhaWxp bmcgaGFuZ2luZyBwdW5jdHVhdGlvbi4KLSAgICAvLyBGb3Igbm93IGxldCdzIHByb2JlIHRoZSBj b250ZW50IGFsbCB0aGUgd2F5IHRvIGxheW91dFJhbmdlRW5kLgotICAgIGZvciAoYXV0byBpbmRl eCA9IGxhc3RJbmxpbmVUZXh0SXRlbUluZGV4ICsgMTsgaW5kZXggPCBsYXlvdXRSYW5nZUVuZDsg KytpbmRleCkgewotICAgICAgICBhdXRvJiBpbmxpbmVJdGVtID0gbV9pbmxpbmVJdGVtc1tpbmRl eF07CisgICAgYXV0byBpc0NvbnRlbnRmdWxJbmxpbmVJdGVtID0gWyZdKGF1dG8mIGlubGluZUl0 ZW0pIHsKICAgICAgICAgaWYgKGlubGluZUl0ZW0uaXNGbG9hdCgpKQotICAgICAgICAgICAgY29u dGludWU7Ci0gICAgICAgIGF1dG8gaXNDb250ZW50ZnVsID0gaW5saW5lSXRlbS5pc0JveCgpIHx8 IGlubGluZUl0ZW0uaXNUZXh0KCkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg cmV0dXJuIGlubGluZUl0ZW0uaXNCb3goKSAKKyAgICAgICAgICAgIHx8IGlubGluZUl0ZW0uaXNU ZXh0KCkKICAgICAgICAgICAgIHx8IChpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSAmJiBm b3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGluZUl0ZW0ubGF5b3V0Qm94KCkp Lm1hcmdpbkJvcmRlckFuZFBhZGRpbmdTdGFydCgpKQogICAgICAgICAgICAgfHwgKGlubGluZUl0 ZW0uaXNJbmxpbmVCb3hFbmQoKSAmJiBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94 KGlubGluZUl0ZW0ubGF5b3V0Qm94KCkpLm1hcmdpbkJvcmRlckFuZFBhZGRpbmdFbmQoKSk7Ci0g ICAgICAgIGlmIChpc0NvbnRlbnRmdWwpCi0gICAgICAgICAgICByZXR1cm4geyB9OworICAgIH07 CisKKyAgICBhdXRvIGluZGV4ID0gbGFzdElubGluZVRleHRJdGVtSW5kZXggKyAxOworICAgIGlm IChUZXh0VXRpbDo6aGFzSGFuZ2FibGVTdG9wT3JDb21tYUVuZChpbmxpbmVUZXh0SXRlbSwgc3R5 bGUpKSB7CisgICAgICAgIC8vIFN0b3Agb3IgY29tYSBkb2VzIGFwcGx5IHRvIGFsbCBsaW5lcyBu b3QganVzdCB0aGUgbGFzdCBmb3JtYXR0ZWQgb25lLiAKKyAgICAgICAgZm9yICg7IGluZGV4IDwg Y2FuZGlkYXRlQ29udGVudEVuZDsgKytpbmRleCkgeworICAgICAgICAgICAgaWYgKGlzQ29udGVu dGZ1bElubGluZUl0ZW0obV9pbmxpbmVJdGVtc1tpbmRleF0pKQorICAgICAgICAgICAgICAgIHJl dHVybiB7IH07CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIFRleHRVdGlsOjpoYW5nYWJsZVN0 b3BPckNvbW1hRW5kV2lkdGgoaW5saW5lVGV4dEl0ZW0sIHN0eWxlKTsKICAgICB9Ci0gICAgLy8g VGhpcyBjYW5kaWRhdGUgbGVhZGluZyBjb250ZW50IG1heSBoYXZlIGhhbmdpbmcgcHVuY3R1YXRp b24gc3RhcnQuCi0gICAgcmV0dXJuIFRleHRVdGlsOjpoYW5nYWJsZVB1bmN0dWF0aW9uRW5kV2lk dGgoaW5saW5lVGV4dEl0ZW0sIHN0eWxlKTsKKworICAgIGlmIChUZXh0VXRpbDo6aGFzSGFuZ2Fi bGVQdW5jdHVhdGlvbkVuZChpbmxpbmVUZXh0SXRlbSwgc3R5bGUpKSB7CisgICAgICAgIC8vIEZJ WE1FOiBJZiB0aGlzIHR1cm5zIG91dCB0byBiZSBwcm9ibGVtYXRpYyAoZmluZGluZyBvdXQgaWYg dGhpcyBpcyB0aGUgbGFzdCBmb3JtYXR0ZWQgbGluZSB0aGF0IGlzKSwgd2UKKyAgICAgICAgLy8g bWF5IGhhdmUgdG8gZmFsbGJhY2sgdG8gYSBwb3N0LXByb2Nlc3Mgc2V0dXAsIHdoZXJlIGFmdGVy IGZpbmlzaGluZyBsYXlpbmcgb3V0IHRoZSBjb250ZW50LCB3ZSBnbyBiYWNrIGFuZCByZS1sYXlv dXQKKyAgICAgICAgLy8gdGhlIGxhc3QgKDI/KSBsaW5lKHMpIHdoZW4gdGhlcmUncyB0cmFpbGlu ZyBoYW5naW5nIHB1bmN0dWF0aW9uLgorICAgICAgICAvLyBGb3Igbm93IGxldCdzIHByb2JlIHRo ZSBjb250ZW50IGFsbCB0aGUgd2F5IHRvIGxheW91dFJhbmdlRW5kLgorICAgICAgICBmb3IgKDsg aW5kZXggPCBsYXlvdXRSYW5nZUVuZDsgKytpbmRleCkgeworICAgICAgICAgICAgaWYgKGlzQ29u dGVudGZ1bElubGluZUl0ZW0obV9pbmxpbmVJdGVtc1tpbmRleF0pKQorICAgICAgICAgICAgICAg IHJldHVybiB7IH07CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIFRleHRVdGlsOjpoYW5nYWJs ZVB1bmN0dWF0aW9uRW5kV2lkdGgoaW5saW5lVGV4dEl0ZW0sIHN0eWxlKTsKKyAgICB9CisKKyAg ICByZXR1cm4geyB9OwogfQogCiB2b2lkIExpbmVCdWlsZGVyOjpjYW5kaWRhdGVDb250ZW50Rm9y TGluZShMaW5lQ2FuZGlkYXRlJiBsaW5lQ2FuZGlkYXRlLCBzaXplX3QgY3VycmVudElubGluZUl0 ZW1JbmRleCwgY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSwgSW5saW5lTGF5b3V0 VW5pdCBjdXJyZW50TG9naWNhbFJpZ2h0KQpAQCAtNzU5LDcgKzc3NCw3IEBAIHZvaWQgTGluZUJ1 aWxkZXI6OmNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lKExpbmVDYW5kaWRhdGUmIGxpbmVDYW5kaWRh dGUsIHNpemVfdCBjCiAgICAgICAgIGF1dG8gaGFuZ2luZ0NvbnRlbnRXaWR0aCA9IGxpbmVDYW5k aWRhdGUuaW5saW5lQ29udGVudC5jb250aW51b3VzQ29udGVudCgpLmhhbmdpbmdDb250ZW50V2lk dGgoKTsKICAgICAgICAgLy8gRG8gbm90IGV2ZW4gdHJ5IHRvIGNoZWNrIGZvciB0cmFpbGluZyBw dW5jdHVhdGlvbiB3aGVuIHRoZSBjYW5kaWRhdGUgY29udGVudCBhbHJlYWR5IGhhcyB3aGl0ZXNw YWNlIHR5cGUgb2YgaGFuZ2luZyBjb250ZW50LgogICAgICAgICBpZiAoIWhhbmdpbmdDb250ZW50 V2lkdGggJiYgbGFzdElubGluZVRleHRJdGVtSW5kZXgpCi0gICAgICAgICAgICBoYW5naW5nQ29u dGVudFdpZHRoICs9IHRyYWlsaW5nUHVuY3R1YXRpb25XaWR0aEZvckxpbmVDYW5kaWF0ZSgqbGFz dElubGluZVRleHRJdGVtSW5kZXgsIGxheW91dFJhbmdlLmVuZCk7CisgICAgICAgICAgICBoYW5n aW5nQ29udGVudFdpZHRoICs9IHRyYWlsaW5nUHVuY3R1YXRpb25PclN0b3BPckNvbWVXaWR0aEZv ckxpbmVDYW5kaWF0ZSgqbGFzdElubGluZVRleHRJdGVtSW5kZXgsIHNvZnRXcmFwT3Bwb3J0dW5p dHlJbmRleCwgbGF5b3V0UmFuZ2UuZW5kKTsKICAgICAgICAgaWYgKGZpcnN0SW5saW5lVGV4dEl0 ZW1JbmRleCkKICAgICAgICAgICAgIGhhbmdpbmdDb250ZW50V2lkdGggKz0gbGVhZGluZ1B1bmN0 dWF0aW9uV2lkdGhGb3JMaW5lQ2FuZGlhdGUoKmZpcnN0SW5saW5lVGV4dEl0ZW1JbmRleCwgY3Vy cmVudElubGluZUl0ZW1JbmRleCk7CiAgICAgICAgIGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVu dC5zZXRIYW5naW5nQ29udGVudFdpZHRoKGhhbmdpbmdDb250ZW50V2lkdGgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggYzQxZjkzZjBlZWY2Li45OGRiYmQ2MDQx ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaApAQCAtMTE0LDcgKzEx NCw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgdm9pZCBjYW5kaWRhdGVDb250ZW50Rm9yTGlu ZShMaW5lQ2FuZGlkYXRlJiwgc2l6ZV90IGlubGluZUl0ZW1JbmRleCwgY29uc3QgSW5saW5lSXRl bVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBJbmxpbmVMYXlvdXRVbml0IGN1cnJlbnRMb2dpY2Fs UmlnaHQpOwogICAgIElubGluZUxheW91dFVuaXQgbGVhZGluZ1B1bmN0dWF0aW9uV2lkdGhGb3JM aW5lQ2FuZGlhdGUoc2l6ZV90IGZpcnN0SW5saW5lVGV4dEl0ZW1JbmRleCwgc2l6ZV90IGNhbmRp ZGF0ZUNvbnRlbnRTdGFydEluZGV4KSBjb25zdDsKLSAgICBJbmxpbmVMYXlvdXRVbml0IHRyYWls aW5nUHVuY3R1YXRpb25XaWR0aEZvckxpbmVDYW5kaWF0ZShzaXplX3QgbGFzdElubGluZVRleHRJ dGVtSW5kZXgsIHNpemVfdCBsYXlvdXRSYW5nZUVuZCkgY29uc3Q7CisgICAgSW5saW5lTGF5b3V0 VW5pdCB0cmFpbGluZ1B1bmN0dWF0aW9uT3JTdG9wT3JDb21lV2lkdGhGb3JMaW5lQ2FuZGlhdGUo c2l6ZV90IGxhc3RJbmxpbmVUZXh0SXRlbUluZGV4LCBzaXplX3QgY2FuZGlkYXRlQ29udGVudEVu ZCwgc2l6ZV90IGxheW91dFJhbmdlRW5kKSBjb25zdDsKICAgICBzaXplX3QgbmV4dFdyYXBPcHBv cnR1bml0eShzaXplX3Qgc3RhcnRJbmRleCwgY29uc3QgTGluZUJ1aWxkZXI6OklubGluZUl0ZW1S YW5nZSYgbGF5b3V0UmFuZ2UpIGNvbnN0OwogCiAgICAgc3RydWN0IFVzZWRDb25zdHJhaW50cyB7 Cg== 464139 2022-12-20 21:34:22 -0800 2022-12-23 00:36:13 -0800 Patch bug-249698-20221220213421.patch text/plain 7017 zalan RnJvbSA2ZmYzMTcwNDU5Mjk0YjlmZTQ1ODk4MDMyYmFiYzUzNGMxZTU4YzRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFR1ZSwgMjAgRGVjIDIwMjIgMjE6Mjk6NDggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVto YW5naW5nIHB1bmN0dWF0aW9uXQogTGluZUJ1aWxkZXI6OmNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5l IHNob3VsZCB0YWtlICJTdG9wT3JDb21tYSIgaW50byBhY2NvdW50CiB3aGVuIHNlYXJjaGluZyBm b3IgdHJhaWxpbmcgaGFuZ2luZyBjb250ZW50CiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjQ5Njk4CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoaXMgaXMg cHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgImhhbmdpbmctcHVuY3R1YXRpb246IGFsbG93LWVu ZCIuCihMZXQncyBzZWFyY2ggZm9yICJTdG9wT3JDb21tYSIgaW4gdGhlIGNhbmRpZGF0ZSBjb250 ZW50IHNvIHRoYXQgbGluZSBicmVha2luZyBjYW4gdXNlIHRoaXMgaW5mbyB0byBjYXJyeSBvdXQg bGluZSBmaXR0aW5nIHByb3Blcmx5LikKCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0 OjpMaW5lQnVpbGRlcjo6dHJhaWxpbmdQdW5jdHVhdGlvbk9yU3RvcE9yQ29tbWFXaWR0aEZvckxp bmVDYW5kaWF0ZSBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpjYW5kaWRh dGVDb250ZW50Rm9yTGluZSk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjp0cmFpbGlu Z1B1bmN0dWF0aW9uV2lkdGhGb3JMaW5lQ2FuZGlhdGUgY29uc3QpOiBEZWxldGVkLgoqIFNvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWls ZGVyLmg6Ci0tLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgICAgICAgICAgICAg IHwgNDcgKysrKysrKysrKysrLS0tLS0tLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5o ICAgICAgICAgICAgICAgIHwgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygr KSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCmluZGV4IDA5NzU4NGI0NzBmZS4uOWE5OWUzNjAxMjFkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC02NjcsMjkgKzY2Nyw0NCBAQCBJbmxpbmVMYXlv dXRVbml0IExpbmVCdWlsZGVyOjpsZWFkaW5nUHVuY3R1YXRpb25XaWR0aEZvckxpbmVDYW5kaWF0 ZShzaXplX3QgZmlycwogICAgIHJldHVybiBUZXh0VXRpbDo6aGFuZ2FibGVQdW5jdHVhdGlvblN0 YXJ0V2lkdGgoaW5saW5lVGV4dEl0ZW0sIHN0eWxlKTsKIH0KIAotSW5saW5lTGF5b3V0VW5pdCBM aW5lQnVpbGRlcjo6dHJhaWxpbmdQdW5jdHVhdGlvbldpZHRoRm9yTGluZUNhbmRpYXRlKHNpemVf dCBsYXN0SW5saW5lVGV4dEl0ZW1JbmRleCwgc2l6ZV90IGxheW91dFJhbmdlRW5kKSBjb25zdAor SW5saW5lTGF5b3V0VW5pdCBMaW5lQnVpbGRlcjo6dHJhaWxpbmdQdW5jdHVhdGlvbk9yU3RvcE9y Q29tbWFXaWR0aEZvckxpbmVDYW5kaWF0ZShzaXplX3QgbGFzdElubGluZVRleHRJdGVtSW5kZXgs IHNpemVfdCBjYW5kaWRhdGVDb250ZW50RW5kLCBzaXplX3QgbGF5b3V0UmFuZ2VFbmQpIGNvbnN0 CiB7CisgICAgQVNTRVJUKGNhbmRpZGF0ZUNvbnRlbnRFbmQgPD0gbGF5b3V0UmFuZ2VFbmQpOwog ICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KG1faW5s aW5lSXRlbXNbbGFzdElubGluZVRleHRJdGVtSW5kZXhdKTsKICAgICBhdXRvJiBzdHlsZSA9IGlz Rmlyc3RGb3JtYXR0ZWRMaW5lKCkgPyBpbmxpbmVUZXh0SXRlbS5maXJzdExpbmVTdHlsZSgpIDog aW5saW5lVGV4dEl0ZW0uc3R5bGUoKTsKLSAgICBpZiAoIVRleHRVdGlsOjpoYXNIYW5nYWJsZVB1 bmN0dWF0aW9uRW5kKGlubGluZVRleHRJdGVtLCBzdHlsZSkpCi0gICAgICAgIHJldHVybiB7IH07 CiAKLSAgICAvLyBGSVhNRTogSWYgdGhpcyB0dXJucyBvdXQgdG8gYmUgcHJvYmxlbWF0aWMgKGZp bmRpbmcgb3V0IGlmIHRoaXMgaXMgdGhlIGxhc3QgZm9ybWF0dGVkIGxpbmUgdGhhdCBpcyksIHdl Ci0gICAgLy8gbWF5IGhhdmUgdG8gZmFsbGJhY2sgdG8gYSBwb3N0LXByb2Nlc3Mgc2V0dXAsIHdo ZXJlIGFmdGVyIGZpbmlzaGluZyBsYXlpbmcgb3V0IHRoZSBjb250ZW50LCB3ZSBnbyBiYWNrIGFu ZCByZS1sYXlvdXQKLSAgICAvLyB0aGUgbGFzdCAoMj8pIGxpbmUocykgd2hlbiB0aGVyZSdzIHRy YWlsaW5nIGhhbmdpbmcgcHVuY3R1YXRpb24uCi0gICAgLy8gRm9yIG5vdyBsZXQncyBwcm9iZSB0 aGUgY29udGVudCBhbGwgdGhlIHdheSB0byBsYXlvdXRSYW5nZUVuZC4KLSAgICBmb3IgKGF1dG8g aW5kZXggPSBsYXN0SW5saW5lVGV4dEl0ZW1JbmRleCArIDE7IGluZGV4IDwgbGF5b3V0UmFuZ2VF bmQ7ICsraW5kZXgpIHsKLSAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IG1faW5saW5lSXRlbXNb aW5kZXhdOworICAgIGF1dG8gaXNDb250ZW50ZnVsSW5saW5lSXRlbSA9IFsmXShhdXRvJiBpbmxp bmVJdGVtKSB7CiAgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzRmxvYXQoKSkKLSAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICBhdXRvIGlzQ29udGVudGZ1bCA9IGlubGluZUl0ZW0uaXNCb3go KSB8fCBpbmxpbmVJdGVtLmlzVGV4dCgpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIHJldHVybiBpbmxpbmVJdGVtLmlzQm94KCkKKyAgICAgICAgICAgIHx8IGlubGluZUl0ZW0u aXNUZXh0KCkKICAgICAgICAgICAgIHx8IChpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSAm JiBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGluZUl0ZW0ubGF5b3V0Qm94 KCkpLm1hcmdpbkJvcmRlckFuZFBhZGRpbmdTdGFydCgpKQogICAgICAgICAgICAgfHwgKGlubGlu ZUl0ZW0uaXNJbmxpbmVCb3hFbmQoKSAmJiBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9y Qm94KGlubGluZUl0ZW0ubGF5b3V0Qm94KCkpLm1hcmdpbkJvcmRlckFuZFBhZGRpbmdFbmQoKSk7 Ci0gICAgICAgIGlmIChpc0NvbnRlbnRmdWwpCi0gICAgICAgICAgICByZXR1cm4geyB9OworICAg IH07CisKKyAgICBhdXRvIGluZGV4ID0gbGFzdElubGluZVRleHRJdGVtSW5kZXggKyAxOworICAg IGlmIChUZXh0VXRpbDo6aGFzSGFuZ2FibGVTdG9wT3JDb21tYUVuZChpbmxpbmVUZXh0SXRlbSwg c3R5bGUpKSB7CisgICAgICAgIC8vIFN0b3Agb3IgY29tbWEgZG9lcyBhcHBseSB0byBhbGwgbGlu ZXMgbm90IGp1c3QgdGhlIGxhc3QgZm9ybWF0dGVkIG9uZS4KKyAgICAgICAgZm9yICg7IGluZGV4 IDwgY2FuZGlkYXRlQ29udGVudEVuZDsgKytpbmRleCkgeworICAgICAgICAgICAgaWYgKGlzQ29u dGVudGZ1bElubGluZUl0ZW0obV9pbmxpbmVJdGVtc1tpbmRleF0pKQorICAgICAgICAgICAgICAg IHJldHVybiB7IH07CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIFRleHRVdGlsOjpoYW5nYWJs ZVN0b3BPckNvbW1hRW5kV2lkdGgoaW5saW5lVGV4dEl0ZW0sIHN0eWxlKTsKICAgICB9Ci0gICAg Ly8gVGhpcyBjYW5kaWRhdGUgbGVhZGluZyBjb250ZW50IG1heSBoYXZlIGhhbmdpbmcgcHVuY3R1 YXRpb24gc3RhcnQuCi0gICAgcmV0dXJuIFRleHRVdGlsOjpoYW5nYWJsZVB1bmN0dWF0aW9uRW5k V2lkdGgoaW5saW5lVGV4dEl0ZW0sIHN0eWxlKTsKKworICAgIGlmIChUZXh0VXRpbDo6aGFzSGFu Z2FibGVQdW5jdHVhdGlvbkVuZChpbmxpbmVUZXh0SXRlbSwgc3R5bGUpKSB7CisgICAgICAgIC8v IEZJWE1FOiBJZiB0aGlzIHR1cm5zIG91dCB0byBiZSBwcm9ibGVtYXRpYyAoZmluZGluZyBvdXQg aWYgdGhpcyBpcyB0aGUgbGFzdCBmb3JtYXR0ZWQgbGluZSB0aGF0IGlzKSwgd2UKKyAgICAgICAg Ly8gbWF5IGhhdmUgdG8gZmFsbGJhY2sgdG8gYSBwb3N0LXByb2Nlc3Mgc2V0dXAsIHdoZXJlIGFm dGVyIGZpbmlzaGluZyBsYXlpbmcgb3V0IHRoZSBjb250ZW50LCB3ZSBnbyBiYWNrIGFuZCByZS1s YXlvdXQKKyAgICAgICAgLy8gdGhlIGxhc3QgKDI/KSBsaW5lKHMpIHdoZW4gdGhlcmUncyB0cmFp bGluZyBoYW5naW5nIHB1bmN0dWF0aW9uLgorICAgICAgICAvLyBGb3Igbm93IGxldCdzIHByb2Jl IHRoZSBjb250ZW50IGFsbCB0aGUgd2F5IHRvIGxheW91dFJhbmdlRW5kLgorICAgICAgICBmb3Ig KDsgaW5kZXggPCBsYXlvdXRSYW5nZUVuZDsgKytpbmRleCkgeworICAgICAgICAgICAgaWYgKGlz Q29udGVudGZ1bElubGluZUl0ZW0obV9pbmxpbmVJdGVtc1tpbmRleF0pKQorICAgICAgICAgICAg ICAgIHJldHVybiB7IH07CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIFRleHRVdGlsOjpoYW5n YWJsZVB1bmN0dWF0aW9uRW5kV2lkdGgoaW5saW5lVGV4dEl0ZW0sIHN0eWxlKTsKKyAgICB9CisK KyAgICByZXR1cm4geyB9OwogfQogCiB2b2lkIExpbmVCdWlsZGVyOjpjYW5kaWRhdGVDb250ZW50 Rm9yTGluZShMaW5lQ2FuZGlkYXRlJiBsaW5lQ2FuZGlkYXRlLCBzaXplX3QgY3VycmVudElubGlu ZUl0ZW1JbmRleCwgY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSwgSW5saW5lTGF5 b3V0VW5pdCBjdXJyZW50TG9naWNhbFJpZ2h0KQpAQCAtNzU5LDcgKzc3NCw3IEBAIHZvaWQgTGlu ZUJ1aWxkZXI6OmNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lKExpbmVDYW5kaWRhdGUmIGxpbmVDYW5k aWRhdGUsIHNpemVfdCBjCiAgICAgICAgIGF1dG8gaGFuZ2luZ0NvbnRlbnRXaWR0aCA9IGxpbmVD YW5kaWRhdGUuaW5saW5lQ29udGVudC5jb250aW51b3VzQ29udGVudCgpLmhhbmdpbmdDb250ZW50 V2lkdGgoKTsKICAgICAgICAgLy8gRG8gbm90IGV2ZW4gdHJ5IHRvIGNoZWNrIGZvciB0cmFpbGlu ZyBwdW5jdHVhdGlvbiB3aGVuIHRoZSBjYW5kaWRhdGUgY29udGVudCBhbHJlYWR5IGhhcyB3aGl0 ZXNwYWNlIHR5cGUgb2YgaGFuZ2luZyBjb250ZW50LgogICAgICAgICBpZiAoIWhhbmdpbmdDb250 ZW50V2lkdGggJiYgbGFzdElubGluZVRleHRJdGVtSW5kZXgpCi0gICAgICAgICAgICBoYW5naW5n Q29udGVudFdpZHRoICs9IHRyYWlsaW5nUHVuY3R1YXRpb25XaWR0aEZvckxpbmVDYW5kaWF0ZSgq bGFzdElubGluZVRleHRJdGVtSW5kZXgsIGxheW91dFJhbmdlLmVuZCk7CisgICAgICAgICAgICBo YW5naW5nQ29udGVudFdpZHRoICs9IHRyYWlsaW5nUHVuY3R1YXRpb25PclN0b3BPckNvbW1hV2lk dGhGb3JMaW5lQ2FuZGlhdGUoKmxhc3RJbmxpbmVUZXh0SXRlbUluZGV4LCBzb2Z0V3JhcE9wcG9y dHVuaXR5SW5kZXgsIGxheW91dFJhbmdlLmVuZCk7CiAgICAgICAgIGlmIChmaXJzdElubGluZVRl eHRJdGVtSW5kZXgpCiAgICAgICAgICAgICBoYW5naW5nQ29udGVudFdpZHRoICs9IGxlYWRpbmdQ dW5jdHVhdGlvbldpZHRoRm9yTGluZUNhbmRpYXRlKCpmaXJzdElubGluZVRleHRJdGVtSW5kZXgs IGN1cnJlbnRJbmxpbmVJdGVtSW5kZXgpOwogICAgICAgICBsaW5lQ2FuZGlkYXRlLmlubGluZUNv bnRlbnQuc2V0SGFuZ2luZ0NvbnRlbnRXaWR0aChoYW5naW5nQ29udGVudFdpZHRoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IGM0MWY5M2YwZWVmNi4uZGNkODAz YzQ3YmMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKQEAgLTExNCw3 ICsxMTQsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZvaWQgY2FuZGlkYXRlQ29udGVudEZv ckxpbmUoTGluZUNhbmRpZGF0ZSYsIHNpemVfdCBpbmxpbmVJdGVtSW5kZXgsIGNvbnN0IElubGlu ZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRSYW5nZSwgSW5saW5lTGF5b3V0VW5pdCBjdXJyZW50TG9n aWNhbFJpZ2h0KTsKICAgICBJbmxpbmVMYXlvdXRVbml0IGxlYWRpbmdQdW5jdHVhdGlvbldpZHRo Rm9yTGluZUNhbmRpYXRlKHNpemVfdCBmaXJzdElubGluZVRleHRJdGVtSW5kZXgsIHNpemVfdCBj YW5kaWRhdGVDb250ZW50U3RhcnRJbmRleCkgY29uc3Q7Ci0gICAgSW5saW5lTGF5b3V0VW5pdCB0 cmFpbGluZ1B1bmN0dWF0aW9uV2lkdGhGb3JMaW5lQ2FuZGlhdGUoc2l6ZV90IGxhc3RJbmxpbmVU ZXh0SXRlbUluZGV4LCBzaXplX3QgbGF5b3V0UmFuZ2VFbmQpIGNvbnN0OworICAgIElubGluZUxh eW91dFVuaXQgdHJhaWxpbmdQdW5jdHVhdGlvbk9yU3RvcE9yQ29tbWFXaWR0aEZvckxpbmVDYW5k aWF0ZShzaXplX3QgbGFzdElubGluZVRleHRJdGVtSW5kZXgsIHNpemVfdCBjYW5kaWRhdGVDb250 ZW50RW5kLCBzaXplX3QgbGF5b3V0UmFuZ2VFbmQpIGNvbnN0OwogICAgIHNpemVfdCBuZXh0V3Jh cE9wcG9ydHVuaXR5KHNpemVfdCBzdGFydEluZGV4LCBjb25zdCBMaW5lQnVpbGRlcjo6SW5saW5l SXRlbVJhbmdlJiBsYXlvdXRSYW5nZSkgY29uc3Q7CiAKICAgICBzdHJ1Y3QgVXNlZENvbnN0cmFp bnRzIHsK