249551 2022-12-17 21:27:46 -0800 [IFC][hanging punctuation] InlineContentBreaker::ContinuousContent should support leading hanging content 2022-12-18 07:05:17 -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 1920316 0 zalan 2022-12-17 21:27:46 -0800 ssia 1920317 1 464093 zalan 2022-12-17 21:42:42 -0800 Created attachment 464093 Patch 1920318 2 464094 zalan 2022-12-17 22:00:20 -0800 Created attachment 464094 [fast-cq]Patch 1920353 3 ews-feeder 2022-12-18 07:04:50 -0800 Committed 258066@main (e6ff73fa8a9f): <https://commits.webkit.org/258066@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 464094. 1920354 4 webkit-bug-importer 2022-12-18 07:05:17 -0800 <rdar://problem/103495077> 464093 2022-12-17 21:42:42 -0800 2022-12-17 22:00:19 -0800 Patch bug-249551-20221217214241.patch text/plain 7253 zalan RnJvbSAxNzJiZjExNzk3ZTEzM2ZkNmMwMjUyNzJlYTYzNTNjMWFhMGQ3OWY5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTcgRGVjIDIwMjIgMjE6Mjc6NTggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVto YW5naW5nIHB1bmN0dWF0aW9uXQogSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250 ZW50IHNob3VsZCBzdXBwb3J0IGxlYWRpbmcgaGFuZ2luZwogY29udGVudCBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQ5NTUxCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgImhhbmdpbmctcHVu Y3R1YXRpb24iIHByb3BlcnR5LgpJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRl bnQgaXMgaW5wdXQgdG8gdGhlIGxpbmUgYnJlYWtpbmcgbG9naWMuCkFzIGxlYWRpbmcgaGFuZ2lu ZyBjb250ZW50IGlzIGNvbnNpZGVyZWQgYXMgIm5lZ2F0aXZlIGhvcml6b250YWwgbWFyZ2luIiwK aXQgc2hvdWxkIGJlIGV4Y2x1ZGVkIHdoZW4gbWVhc3VyaW5nIHRoZSBjYW5kaWRhdGUgY29udGVu dCBmb3IgZml0LgpObyBmdW5jdGlvbmFsaXR5IGNoYW5nZSB5ZXQuCgoqIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNw cDoKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250 ZW50OjphcHBlbmRUZXh0Q29udGVudCk6CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRC cmVha2VyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kVHJhaWxpbmdIYW5naW5nQ29udGVudCk6 CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVu dDo6YXBwZW5kTGVhZGluZ0hhbmdpbmdDb250ZW50KToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5l Q29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjpyZXNldCk6CiogU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIu aDoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lQnVpbGRlci5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVDYW5kaWRhdGU6OklubGlu ZUNvbnRlbnQ6OmFwcGVuZElubGluZUl0ZW0pOgotLS0KIC4uLi9pbmxpbmUvSW5saW5lQ29udGVu dEJyZWFrZXIuY3BwICAgICAgICAgICAgICAgfCAxNSArKysrKysrKysrKy0tLS0KIC4uLi9pbmxp bmUvSW5saW5lQ29udGVudEJyZWFrZXIuaCAgICAgICAgICAgICAgICAgfCAgNiArKysrLS0KIC4u Li9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwICAgICAgICAgICAgICAgICAgfCAgOCArKysr LS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKaW5kZXggZDY2 YjI5OGZiMjYzLi5lNDM4MTQyN2JlNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVD b250ZW50QnJlYWtlci5jcHAKQEAgLTc1MSw3ICs3NTEsNyBAQCB2b2lkIElubGluZUNvbnRlbnRC cmVha2VyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kKGNvbnN0IElubGluZUl0ZW0mIGlubGlu ZUl0ZQogICAgIH0KIH0KIAotdm9pZCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0Nv bnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIGNvbnN0 IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIHN0ZDo6 b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gdHJpbW1hYmxlV2lkdGgpCit2b2lkIElubGluZUNv bnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3Qg SW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUs IElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoLCBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91 dFVuaXQ+IHRyaW1tYWJsZVdpZHRoKQogewogICAgIGlmICghdHJpbW1hYmxlV2lkdGgpIHsKICAg ICAgICAgYXBwZW5kVG9SdW5MaXN0KGlubGluZVRleHRJdGVtLCBzdHlsZSwgbG9naWNhbFdpZHRo KTsKQEAgLTc3MCwxMSArNzcwLDE3IEBAIHZvaWQgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRp bnVvdXNDb250ZW50OjphcHBlbmQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluCiAgICAgbV90 cmFpbGluZ1RyaW1tYWJsZVdpZHRoID0gKnRyaW1tYWJsZVdpZHRoID09IGxvZ2ljYWxXaWR0aCA/ IG1fdHJhaWxpbmdUcmltbWFibGVXaWR0aC52YWx1ZV9vcigwLmYpICsgbG9naWNhbFdpZHRoIDog KnRyaW1tYWJsZVdpZHRoOwogfQogCi12b2lkIElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51 b3VzQ29udGVudDo6YXBwZW5kKGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwg Y29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0IGhhbmdpbmdXaWR0aCkK K3ZvaWQgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjphcHBlbmRUcmFp bGluZ0hhbmdpbmdDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwg Y29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0IGhhbmdpbmdXaWR0aCkK IHsKLSAgICBhcHBlbmRUb1J1bkxpc3QoaW5saW5lVGV4dEl0ZW0sIHN0eWxlLCBoYW5naW5nV2lk dGgpOworICAgIGFwcGVuZFRleHRDb250ZW50KGlubGluZVRleHRJdGVtLCBzdHlsZSwgaGFuZ2lu Z1dpZHRoLCB7IH0pOwogICAgIG1fdHJhaWxpbmdIYW5naW5nQ29udGVudFdpZHRoID0gaGFuZ2lu Z1dpZHRoOwotICAgIHJlc2V0VHJhaWxpbmdUcmltbWFibGVDb250ZW50KCk7Cit9CisKK3ZvaWQg SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjphcHBlbmRMZWFkaW5nSGFu Z2luZ0NvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBjb25zdCBS ZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgaGFuZ2luZ1dpZHRoKQoreworICAg IEFTU0VSVChydW5zKCkuaXNFbXB0eSgpKTsKKyAgICBhcHBlbmRUZXh0Q29udGVudChpbmxpbmVU ZXh0SXRlbSwgc3R5bGUsIGhhbmdpbmdXaWR0aCwgeyB9KTsKKyAgICBtX2xlYWRpbmdIYW5naW5n Q29udGVudFdpZHRoID0gaGFuZ2luZ1dpZHRoOwogfQogCiB2b2lkIElubGluZUNvbnRlbnRCcmVh a2VyOjpDb250aW51b3VzQ29udGVudDo6cmVzZXQoKQpAQCAtNzgzLDYgKzc4OSw3IEBAIHZvaWQg SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjpyZXNldCgpCiAgICAgbV9s ZWFkaW5nVHJpbW1hYmxlV2lkdGggPSB7IH07CiAgICAgbV90cmFpbGluZ1RyaW1tYWJsZVdpZHRo ID0geyB9OwogICAgIG1fdHJhaWxpbmdIYW5naW5nQ29udGVudFdpZHRoID0geyB9OworICAgIG1f bGVhZGluZ0hhbmdpbmdDb250ZW50V2lkdGggPSB7IH07CiAgICAgbV9ydW5zLmNsZWFyKCk7CiB9 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuaAppbmRleCAwMzQ0 NDIzYzNmYzEuLjY2YTU0ODFiOTQ3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250 ZW50QnJlYWtlci5oCkBAIC04OCw4ICs4OCw5IEBAIHB1YmxpYzoKICAgICAgICAgYm9vbCBpc0hh bmdpbmdDb250ZW50KCkgY29uc3QgeyByZXR1cm4gaGFzSGFuZ2luZ0NvbnRlbnQoKSAmJiBoYW5n aW5nQ29udGVudFdpZHRoKCkgPT0gbG9naWNhbFdpZHRoKCk7IH0KIAogICAgICAgICB2b2lkIGFw cGVuZChjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRV bml0IGxvZ2ljYWxXaWR0aCk7Ci0gICAgICAgIHZvaWQgYXBwZW5kKGNvbnN0IElubGluZVRleHRJ dGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwg c3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB0cmltbWFibGVXaWR0aCk7Ci0gICAgICAg IHZvaWQgYXBwZW5kKGNvbnN0IElubGluZVRleHRJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJ bmxpbmVMYXlvdXRVbml0IGhhbmdpbmdXaWR0aCk7CisgICAgICAgIHZvaWQgYXBwZW5kVGV4dENv bnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mLCBjb25zdCBSZW5kZXJTdHlsZSYsIElubGluZUxh eW91dFVuaXQgbG9naWNhbFdpZHRoLCBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHRy aW1tYWJsZVdpZHRoKTsKKyAgICAgICAgdm9pZCBhcHBlbmRUcmFpbGluZ0hhbmdpbmdDb250ZW50 KGNvbnN0IElubGluZVRleHRJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRV bml0IGhhbmdpbmdXaWR0aCk7CisgICAgICAgIHZvaWQgYXBwZW5kTGVhZGluZ0hhbmdpbmdDb250 ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlv dXRVbml0IGhhbmdpbmdXaWR0aCk7CiAgICAgICAgIHZvaWQgcmVzZXQoKTsKIAogICAgICAgICBz dHJ1Y3QgUnVuIHsKQEAgLTExMSw2ICsxMTIsNyBAQCBwdWJsaWM6CiAgICAgICAgIFJ1bkxpc3Qg bV9ydW5zOwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1fbG9naWNhbFdpZHRoIHsgMCB9Owog ICAgICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fbGVhZGluZ1RyaW1tYWJs ZVdpZHRoIHsgfTsKKyAgICAgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX2xl YWRpbmdIYW5naW5nQ29udGVudFdpZHRoIHsgfTsKICAgICAgICAgc3RkOjpvcHRpb25hbDxJbmxp bmVMYXlvdXRVbml0PiBtX3RyYWlsaW5nVHJpbW1hYmxlV2lkdGggeyB9OwogICAgICAgICBzdGQ6 Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxpbmdIYW5naW5nQ29udGVudFdpZHRo IHsgfTsKICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmlu ZGV4IDQ1ZGFlZGY5NWQyOC4uZTcyZWJkNDJjNjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0yNDUsOSArMjQ1LDkgQEAgaW5saW5lIHZvaWQgTGluZUNh bmRpZGF0ZTo6SW5saW5lQ29udGVudDo6YXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVt JiBpbmwKICAgICAgICAgYXV0byYgaW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0 SXRlbT4oaW5saW5lSXRlbSk7CiAgICAgICAgIGF1dG8gaXNXaGl0ZXNwYWNlID0gaW5saW5lVGV4 dEl0ZW0uaXNXaGl0ZXNwYWNlKCk7CiAKLSAgICAgICAgYXV0byBpc0hhbmdpbmdDb250ZW50ID0g aXNXaGl0ZXNwYWNlICYmIHN0eWxlLndoaXRlU3BhY2UoKSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFw OwotICAgICAgICBpZiAoaXNIYW5naW5nQ29udGVudCkKLSAgICAgICAgICAgIHJldHVybiBtX2Nv bnRpbnVvdXNDb250ZW50LmFwcGVuZChpbmxpbmVUZXh0SXRlbSwgc3R5bGUsIGxvZ2ljYWxXaWR0 aCk7CisgICAgICAgIGF1dG8gaXNUcmFpbGluZ0hhbmdpbmdDb250ZW50ID0gaXNXaGl0ZXNwYWNl ICYmIHN0eWxlLndoaXRlU3BhY2UoKSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFwOworICAgICAgICBp ZiAoaXNUcmFpbGluZ0hhbmdpbmdDb250ZW50KQorICAgICAgICAgICAgcmV0dXJuIG1fY29udGlu dW91c0NvbnRlbnQuYXBwZW5kVHJhaWxpbmdIYW5naW5nQ29udGVudChpbmxpbmVUZXh0SXRlbSwg c3R5bGUsIGxvZ2ljYWxXaWR0aCk7CiAKICAgICAgICAgYXV0byB0cmltbWFibGVXaWR0aCA9IFsm XSgpIC0+IHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gewogICAgICAgICAgICAgaWYg KGlubGluZVRleHRJdGVtLmlzRnVsbHlUcmltbWFibGUoKSB8fCBpbmxpbmVUZXh0SXRlbS5pc1F1 aXJrTm9uQnJlYWtpbmdTcGFjZSgpKSB7CkBAIC0yNjMsNyArMjYzLDcgQEAgaW5saW5lIHZvaWQg TGluZUNhbmRpZGF0ZTo6SW5saW5lQ29udGVudDo6YXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxp bmVJdGVtJiBpbmwKICAgICAgICAgICAgIEFTU0VSVChsb2dpY2FsV2lkdGggPiBsZXR0ZXJTcGFj aW5nKTsKICAgICAgICAgICAgIHJldHVybiBsZXR0ZXJTcGFjaW5nOwogICAgICAgICB9OwotICAg ICAgICBtX2NvbnRpbnVvdXNDb250ZW50LmFwcGVuZChpbmxpbmVUZXh0SXRlbSwgc3R5bGUsIGxv Z2ljYWxXaWR0aCwgdHJpbW1hYmxlV2lkdGgoKSk7CisgICAgICAgIG1fY29udGludW91c0NvbnRl bnQuYXBwZW5kVGV4dENvbnRlbnQoaW5saW5lVGV4dEl0ZW0sIHN0eWxlLCBsb2dpY2FsV2lkdGgs IHRyaW1tYWJsZVdpZHRoKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwo= 464094 2022-12-17 22:00:20 -0800 2022-12-18 07:04:51 -0800 [fast-cq]Patch bug-249551-20221217220020.patch text/plain 11557 zalan RnJvbSBiMDg0ODlhNTE2NDk5YWJhNDUwNTI0MzczMWNjY2I5MWVlMTBiZGZlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTcgRGVjIDIwMjIgMjE6Mjc6NTggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVto YW5naW5nIHB1bmN0dWF0aW9uXQogSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250 ZW50IHNob3VsZCBzdXBwb3J0IGxlYWRpbmcgaGFuZ2luZwogY29udGVudCBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQ5NTUxCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgImhhbmdpbmctcHVu Y3R1YXRpb24iIHByb3BlcnR5LgpJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRl bnQgaXMgaW5wdXQgdG8gdGhlIGxpbmUgYnJlYWtpbmcgbG9naWMuCkFzIGxlYWRpbmcgaGFuZ2lu ZyBjb250ZW50IGlzIGNvbnNpZGVyZWQgYXMgIm5lZ2F0aXZlIGhvcml6b250YWwgbWFyZ2luIiwK aXQgc2hvdWxkIGJlIGV4Y2x1ZGVkIHdoZW4gbWVhc3VyaW5nIHRoZSBjYW5kaWRhdGUgY29udGVu dCBmb3IgZml0LgpObyBmdW5jdGlvbmFsaXR5IGNoYW5nZSB5ZXQuCgooVGhpcyBwYXRjaCBhbHNv IHJlbW92ZXMgc29tZSBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGNvbXBsZXhpdHku KQoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUNvbnRlbnRCcmVha2VyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFr ZXI6OkNvbnRpbnVvdXNDb250ZW50OjphcHBlbmRUZXh0Q29udGVudCk6CihXZWJDb3JlOjpMYXlv dXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kVHJhaWxp bmdIYW5naW5nQ29udGVudCk6CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2Vy OjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kTGVhZGluZ0hhbmdpbmdDb250ZW50KToKKFdlYkNv cmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjpyZXNl dCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lQ29udGVudEJyZWFrZXIuaDoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6Okxp bmVDYW5kaWRhdGU6OklubGluZUNvbnRlbnQ6OmFwcGVuZElubGluZUl0ZW0pOgotLS0KIC4uLi9p bmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwICAgICAgICAgICB8IDI2ICsrKysrKysrKyst LS0tLS0KIC4uLi9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuaCAgICAgICAgICAgICB8IDMx ICsrKysrKysrKy0tLS0tLS0tLS0KIC4uLi9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwICAg ICAgICAgICAgICB8ICA4ICsrLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyks IDMxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVh a2VyLmNwcAppbmRleCBkNjZiMjk4ZmIyNjMuLmM2OWY2YzMwMDJlYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVu dEJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcApAQCAtMTYwLDkgKzE2MCw5IEBAIElu bGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgSW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NP dmVyZmxvd2luZ0NvbnRlbnQoY29uCiAgICAgICAgICAgICAgICAgLy8gaXQgc2hvdWxkIG5vdCBi ZSB3cmFwcGVkIHRvIHRoZSBuZXh0IGxpbmUgKGFzIGl0IGVpdGhlciBmaXRzL29yIGdldHMgZnVs bHkgdHJpbW1lZCkuCiAgICAgICAgICAgICAgICAgcmV0dXJuIElubGluZUNvbnRlbnRCcmVha2Vy OjpSZXN1bHQgeyBSZXN1bHQ6OkFjdGlvbjo6S2VlcCB9OwogICAgICAgICAgICAgfQotICAgICAg ICAgICAgYXV0byBzcGFjZVJlcXVpcmVkID0gY29udGludW91c0NvbnRlbnQubG9naWNhbFdpZHRo KCkgLSBjb250aW51b3VzQ29udGVudC50cmFpbGluZ1RyaW1tYWJsZVdpZHRoKCkudmFsdWVfb3Io MC5mKTsKKyAgICAgICAgICAgIGF1dG8gc3BhY2VSZXF1aXJlZCA9IGNvbnRpbnVvdXNDb250ZW50 LmxvZ2ljYWxXaWR0aCgpIC0gY29udGludW91c0NvbnRlbnQudHJhaWxpbmdUcmltbWFibGVXaWR0 aCgpOwogICAgICAgICAgICAgaWYgKGxpbmVTdGF0dXMuaGFzRnVsbHlUcmltbWFibGVUcmFpbGlu Z0NvbnRlbnQpCi0gICAgICAgICAgICAgICAgc3BhY2VSZXF1aXJlZCAtPSBjb250aW51b3VzQ29u dGVudC5sZWFkaW5nVHJpbW1hYmxlV2lkdGgoKS52YWx1ZV9vcigwLmYpOworICAgICAgICAgICAg ICAgIHNwYWNlUmVxdWlyZWQgLT0gY29udGludW91c0NvbnRlbnQubGVhZGluZ1RyaW1tYWJsZVdp ZHRoKCk7CiAgICAgICAgICAgICBpZiAoc3BhY2VSZXF1aXJlZCA8PSBsaW5lU3RhdHVzLmF2YWls YWJsZVdpZHRoKQogICAgICAgICAgICAgICAgIHJldHVybiBJbmxpbmVDb250ZW50QnJlYWtlcjo6 UmVzdWx0IHsgUmVzdWx0OjpBY3Rpb246OktlZXAgfTsKICAgICAgICAgfQpAQCAtMTcwLDggKzE3 MCw3IEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgSW5saW5lQ29udGVudEJyZWFrZXI6 OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uCiAgICAgICAgIGlmIChjb250aW51b3VzQ29u dGVudC5oYXNIYW5naW5nQ29udGVudCgpKSB7CiAgICAgICAgICAgICBpZiAoY29udGludW91c0Nv bnRlbnQuaXNIYW5naW5nQ29udGVudCgpKQogICAgICAgICAgICAgICAgIHJldHVybiBJbmxpbmVD b250ZW50QnJlYWtlcjo6UmVzdWx0IHsgUmVzdWx0OjpBY3Rpb246OktlZXAgfTsKLSAgICAgICAg ICAgIGF1dG8gaGFuZ2luZ1RyYWlsaW5nQ29udGVudFdpZHRoID0gKmNvbnRpbnVvdXNDb250ZW50 LmhhbmdpbmdDb250ZW50V2lkdGgoKTsKLSAgICAgICAgICAgIGF1dG8gc3BhY2VSZXF1aXJlZCA9 IGNvbnRpbnVvdXNDb250ZW50LmxvZ2ljYWxXaWR0aCgpIC0gaGFuZ2luZ1RyYWlsaW5nQ29udGVu dFdpZHRoOworICAgICAgICAgICAgYXV0byBzcGFjZVJlcXVpcmVkID0gY29udGludW91c0NvbnRl bnQubG9naWNhbFdpZHRoKCkgLSBjb250aW51b3VzQ29udGVudC5oYW5naW5nQ29udGVudFdpZHRo KCk7CiAgICAgICAgICAgICBpZiAoc3BhY2VSZXF1aXJlZCA8PSBsaW5lU3RhdHVzLmF2YWlsYWJs ZVdpZHRoKQogICAgICAgICAgICAgICAgIHJldHVybiBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVz dWx0IHsgUmVzdWx0OjpBY3Rpb246OktlZXAgfTsKICAgICAgICAgfQpAQCAtNzUxLDcgKzc1MCw3 IEBAIHZvaWQgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjphcHBlbmQo Y29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlCiAgICAgfQogfQogCi12b2lkIElubGluZUNvbnRl bnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kKGNvbnN0IElubGluZVRleHRJdGVt JiBpbmxpbmVUZXh0SXRlbSwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmVMYXlvdXRV bml0IGxvZ2ljYWxXaWR0aCwgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB0cmltbWFi bGVXaWR0aCkKK3ZvaWQgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50Ojph cHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIGNv bnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIHN0 ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gdHJpbW1hYmxlV2lkdGgpCiB7CiAgICAgaWYg KCF0cmltbWFibGVXaWR0aCkgewogICAgICAgICBhcHBlbmRUb1J1bkxpc3QoaW5saW5lVGV4dEl0 ZW0sIHN0eWxlLCBsb2dpY2FsV2lkdGgpOwpAQCAtNzY0LDE3ICs3NjMsMjMgQEAgdm9pZCBJbmxp bmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVU ZXh0SXRlbSYgaW5saW4KICAgICBhcHBlbmRUb1J1bkxpc3QoaW5saW5lVGV4dEl0ZW0sIHN0eWxl LCBsb2dpY2FsV2lkdGgpOwogICAgIGlmIChpc0xlYWRpbmdUcmltbWFibGUpIHsKICAgICAgICAg QVNTRVJUKCFtX3RyYWlsaW5nVHJpbW1hYmxlV2lkdGgpOwotICAgICAgICBtX2xlYWRpbmdUcmlt bWFibGVXaWR0aCA9IG1fbGVhZGluZ1RyaW1tYWJsZVdpZHRoLnZhbHVlX29yKDAuZikgKyAqdHJp bW1hYmxlV2lkdGg7CisgICAgICAgIG1fbGVhZGluZ1RyaW1tYWJsZVdpZHRoID0gbV9sZWFkaW5n VHJpbW1hYmxlV2lkdGggKyAqdHJpbW1hYmxlV2lkdGg7CiAgICAgICAgIHJldHVybjsKICAgICB9 Ci0gICAgbV90cmFpbGluZ1RyaW1tYWJsZVdpZHRoID0gKnRyaW1tYWJsZVdpZHRoID09IGxvZ2lj YWxXaWR0aCA/IG1fdHJhaWxpbmdUcmltbWFibGVXaWR0aC52YWx1ZV9vcigwLmYpICsgbG9naWNh bFdpZHRoIDogKnRyaW1tYWJsZVdpZHRoOworICAgIG1fdHJhaWxpbmdUcmltbWFibGVXaWR0aCA9 ICp0cmltbWFibGVXaWR0aCA9PSBsb2dpY2FsV2lkdGggPyBtX3RyYWlsaW5nVHJpbW1hYmxlV2lk dGggKyBsb2dpY2FsV2lkdGggOiAqdHJpbW1hYmxlV2lkdGg7CiB9CiAKLXZvaWQgSW5saW5lQ29u dGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjphcHBlbmQoY29uc3QgSW5saW5lVGV4dEl0 ZW0mIGlubGluZVRleHRJdGVtLCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91 dFVuaXQgaGFuZ2luZ1dpZHRoKQordm9pZCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91 c0NvbnRlbnQ6OmFwcGVuZFRyYWlsaW5nSGFuZ2luZ0NvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0 ZW0mIGlubGluZVRleHRJdGVtLCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91 dFVuaXQgaGFuZ2luZ1dpZHRoKQogewotICAgIGFwcGVuZFRvUnVuTGlzdChpbmxpbmVUZXh0SXRl bSwgc3R5bGUsIGhhbmdpbmdXaWR0aCk7CisgICAgYXBwZW5kVGV4dENvbnRlbnQoaW5saW5lVGV4 dEl0ZW0sIHN0eWxlLCBoYW5naW5nV2lkdGgsIHsgfSk7CiAgICAgbV90cmFpbGluZ0hhbmdpbmdD b250ZW50V2lkdGggPSBoYW5naW5nV2lkdGg7Ci0gICAgcmVzZXRUcmFpbGluZ1RyaW1tYWJsZUNv bnRlbnQoKTsKK30KKwordm9pZCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRl bnQ6OmFwcGVuZExlYWRpbmdIYW5naW5nQ29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5s aW5lVGV4dEl0ZW0sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lTGF5b3V0VW5pdCBo YW5naW5nV2lkdGgpCit7CisgICAgQVNTRVJUKHJ1bnMoKS5pc0VtcHR5KCkpOworICAgIGFwcGVu ZFRleHRDb250ZW50KGlubGluZVRleHRJdGVtLCBzdHlsZSwgaGFuZ2luZ1dpZHRoLCB7IH0pOwor ICAgIG1fbGVhZGluZ0hhbmdpbmdDb250ZW50V2lkdGggPSBoYW5naW5nV2lkdGg7CiB9CiAKIHZv aWQgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjpyZXNldCgpCkBAIC03 ODMsNiArNzg4LDcgQEAgdm9pZCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRl bnQ6OnJlc2V0KCkKICAgICBtX2xlYWRpbmdUcmltbWFibGVXaWR0aCA9IHsgfTsKICAgICBtX3Ry YWlsaW5nVHJpbW1hYmxlV2lkdGggPSB7IH07CiAgICAgbV90cmFpbGluZ0hhbmdpbmdDb250ZW50 V2lkdGggPSB7IH07CisgICAgbV9sZWFkaW5nSGFuZ2luZ0NvbnRlbnRXaWR0aCA9IHsgfTsKICAg ICBtX3J1bnMuY2xlYXIoKTsKIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50 QnJlYWtlci5oCmluZGV4IDAzNDQ0MjNjM2ZjMS4uYzQ2Mjc1NmQ2NDJlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250 ZW50QnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmgKQEAgLTc5LDE3ICs3OSwxOCBAQCBwdWJs aWM6CiAgICAgLy8gc2VlIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtdGV4dC0zLyNsaW5l LWJyZWFrLWRldGFpbHMKICAgICBzdHJ1Y3QgQ29udGludW91c0NvbnRlbnQgewogICAgICAgICBJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFdp ZHRoOyB9Ci0gICAgICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbGVhZGluZ1Ry aW1tYWJsZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9sZWFkaW5nVHJpbW1hYmxlV2lkdGg7IH0K LSAgICAgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB0cmFpbGluZ1RyaW1tYWJs ZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGluZ1RyaW1tYWJsZVdpZHRoOyB9Ci0gICAg ICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gaGFuZ2luZ0NvbnRlbnRXaWR0aCgp IGNvbnN0IHsgcmV0dXJuIG1fdHJhaWxpbmdIYW5naW5nQ29udGVudFdpZHRoOyB9CisgICAgICAg IElubGluZUxheW91dFVuaXQgbGVhZGluZ1RyaW1tYWJsZVdpZHRoKCkgY29uc3QgeyByZXR1cm4g bV9sZWFkaW5nVHJpbW1hYmxlV2lkdGg7IH0KKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCB0cmFp bGluZ1RyaW1tYWJsZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGluZ1RyaW1tYWJsZVdp ZHRoOyB9CisgICAgICAgIElubGluZUxheW91dFVuaXQgaGFuZ2luZ0NvbnRlbnRXaWR0aCgpIGNv bnN0IHsgcmV0dXJuIG1fdHJhaWxpbmdIYW5naW5nQ29udGVudFdpZHRoICsgbV9sZWFkaW5nSGFu Z2luZ0NvbnRlbnRXaWR0aDsgfQogICAgICAgICBib29sIGhhc1RyaW1tYWJsZUNvbnRlbnQoKSBj b25zdCB7IHJldHVybiB0cmFpbGluZ1RyaW1tYWJsZVdpZHRoKCkgfHwgbGVhZGluZ1RyaW1tYWJs ZVdpZHRoKCk7IH0KLSAgICAgICAgYm9vbCBoYXNIYW5naW5nQ29udGVudCgpIGNvbnN0IHsgcmV0 dXJuIGhhbmdpbmdDb250ZW50V2lkdGgoKS5oYXNfdmFsdWUoKTsgfQorICAgICAgICBib29sIGhh c0hhbmdpbmdDb250ZW50KCkgY29uc3QgeyByZXR1cm4gaGFuZ2luZ0NvbnRlbnRXaWR0aCgpOyB9 CiAgICAgICAgIGJvb2wgaXNGdWxseVRyaW1tYWJsZSgpIGNvbnN0OwotICAgICAgICBib29sIGlz SGFuZ2luZ0NvbnRlbnQoKSBjb25zdCB7IHJldHVybiBoYXNIYW5naW5nQ29udGVudCgpICYmIGhh bmdpbmdDb250ZW50V2lkdGgoKSA9PSBsb2dpY2FsV2lkdGgoKTsgfQorICAgICAgICBib29sIGlz SGFuZ2luZ0NvbnRlbnQoKSBjb25zdCB7IHJldHVybiBoYW5naW5nQ29udGVudFdpZHRoKCkgPT0g bG9naWNhbFdpZHRoKCk7IH0KIAogICAgICAgICB2b2lkIGFwcGVuZChjb25zdCBJbmxpbmVJdGVt JiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7Ci0g ICAgICAgIHZvaWQgYXBwZW5kKGNvbnN0IElubGluZVRleHRJdGVtJiwgY29uc3QgUmVuZGVyU3R5 bGUmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgc3RkOjpvcHRpb25hbDxJbmxpbmVM YXlvdXRVbml0PiB0cmltbWFibGVXaWR0aCk7Ci0gICAgICAgIHZvaWQgYXBwZW5kKGNvbnN0IElu bGluZVRleHRJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGhhbmdp bmdXaWR0aCk7CisgICAgICAgIHZvaWQgYXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4 dEl0ZW0mLCBjb25zdCBSZW5kZXJTdHlsZSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRo LCBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHRyaW1tYWJsZVdpZHRoKTsKKyAgICAg ICAgdm9pZCBhcHBlbmRUcmFpbGluZ0hhbmdpbmdDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVt JiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGhhbmdpbmdXaWR0aCk7Cisg ICAgICAgIHZvaWQgYXBwZW5kTGVhZGluZ0hhbmdpbmdDb250ZW50KGNvbnN0IElubGluZVRleHRJ dGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGhhbmdpbmdXaWR0aCk7 CiAgICAgICAgIHZvaWQgcmVzZXQoKTsKIAogICAgICAgICBzdHJ1Y3QgUnVuIHsKQEAgLTEwOSwx MCArMTEwLDExIEBAIHB1YmxpYzoKICAgICAgICAgdm9pZCByZXNldFRyYWlsaW5nVHJpbW1hYmxl Q29udGVudCgpOwogCiAgICAgICAgIFJ1bkxpc3QgbV9ydW5zOwotICAgICAgICBJbmxpbmVMYXlv dXRVbml0IG1fbG9naWNhbFdpZHRoIHsgMCB9OwotICAgICAgICBzdGQ6Om9wdGlvbmFsPElubGlu ZUxheW91dFVuaXQ+IG1fbGVhZGluZ1RyaW1tYWJsZVdpZHRoIHsgfTsKLSAgICAgICAgc3RkOjpv cHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX3RyYWlsaW5nVHJpbW1hYmxlV2lkdGggeyB9Owot ICAgICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxpbmdIYW5naW5n Q29udGVudFdpZHRoIHsgfTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2xvZ2ljYWxXaWR0 aCB7IDAuZiB9OworICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1fbGVhZGluZ1RyaW1tYWJsZVdp ZHRoIHsgMC5mIH07CisgICAgICAgIElubGluZUxheW91dFVuaXQgbV9sZWFkaW5nSGFuZ2luZ0Nv bnRlbnRXaWR0aCB7IDAuZiB9OworICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1fdHJhaWxpbmdU cmltbWFibGVXaWR0aCB7IDAuZiB9OworICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1fdHJhaWxp bmdIYW5naW5nQ29udGVudFdpZHRoIHsgMC5mIH07CiAgICAgfTsKIAogICAgIHN0cnVjdCBMaW5l U3RhdHVzIHsKQEAgLTE4MSwxMiArMTgzLDcgQEAgaW5saW5lIElubGluZUNvbnRlbnRCcmVha2Vy OjpDb250aW51b3VzQ29udGVudDo6UnVuOjpSdW4oY29uc3QgUnVuJiBvdGhlcikKIAogaW5saW5l IGJvb2wgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50Ojppc0Z1bGx5VHJp bW1hYmxlKCkgY29uc3QKIHsKLSAgICBhdXRvIHRyaW1tYWJsZVdpZHRoID0gc3RkOjpvcHRpb25h bDxJbmxpbmVMYXlvdXRVbml0PiB7IH07Ci0gICAgaWYgKG1fbGVhZGluZ1RyaW1tYWJsZVdpZHRo KQotICAgICAgICB0cmltbWFibGVXaWR0aCA9ICptX2xlYWRpbmdUcmltbWFibGVXaWR0aDsKLSAg ICBpZiAobV90cmFpbGluZ1RyaW1tYWJsZVdpZHRoKQotICAgICAgICB0cmltbWFibGVXaWR0aCA9 IHRyaW1tYWJsZVdpZHRoLnZhbHVlX29yKDAuZikgKyAqbV90cmFpbGluZ1RyaW1tYWJsZVdpZHRo OwotICAgIHJldHVybiB0cmltbWFibGVXaWR0aCAmJiAqdHJpbW1hYmxlV2lkdGggPT0gbG9naWNh bFdpZHRoKCk7CisgICAgcmV0dXJuIG1fbGVhZGluZ1RyaW1tYWJsZVdpZHRoICsgbV90cmFpbGlu Z1RyaW1tYWJsZVdpZHRoID09IGxvZ2ljYWxXaWR0aCgpOwogfQogCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggNDVkYWVkZjk1ZDI4Li5lNzJlYmQ0MmM2 NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTI0NSw5 ICsyNDUsOSBAQCBpbmxpbmUgdm9pZCBMaW5lQ2FuZGlkYXRlOjpJbmxpbmVDb250ZW50OjphcHBl bmRJbmxpbmVJdGVtKGNvbnN0IElubGluZUl0ZW0mIGlubAogICAgICAgICBhdXRvJiBpbmxpbmVU ZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKTsKICAgICAgICAg YXV0byBpc1doaXRlc3BhY2UgPSBpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKTsKIAotICAg ICAgICBhdXRvIGlzSGFuZ2luZ0NvbnRlbnQgPSBpc1doaXRlc3BhY2UgJiYgc3R5bGUud2hpdGVT cGFjZSgpID09IFdoaXRlU3BhY2U6OlByZVdyYXA7Ci0gICAgICAgIGlmIChpc0hhbmdpbmdDb250 ZW50KQotICAgICAgICAgICAgcmV0dXJuIG1fY29udGludW91c0NvbnRlbnQuYXBwZW5kKGlubGlu ZVRleHRJdGVtLCBzdHlsZSwgbG9naWNhbFdpZHRoKTsKKyAgICAgICAgYXV0byBpc1RyYWlsaW5n SGFuZ2luZ0NvbnRlbnQgPSBpc1doaXRlc3BhY2UgJiYgc3R5bGUud2hpdGVTcGFjZSgpID09IFdo aXRlU3BhY2U6OlByZVdyYXA7CisgICAgICAgIGlmIChpc1RyYWlsaW5nSGFuZ2luZ0NvbnRlbnQp CisgICAgICAgICAgICByZXR1cm4gbV9jb250aW51b3VzQ29udGVudC5hcHBlbmRUcmFpbGluZ0hh bmdpbmdDb250ZW50KGlubGluZVRleHRJdGVtLCBzdHlsZSwgbG9naWNhbFdpZHRoKTsKIAogICAg ICAgICBhdXRvIHRyaW1tYWJsZVdpZHRoID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxJbmxpbmVM YXlvdXRVbml0PiB7CiAgICAgICAgICAgICBpZiAoaW5saW5lVGV4dEl0ZW0uaXNGdWxseVRyaW1t YWJsZSgpIHx8IGlubGluZVRleHRJdGVtLmlzUXVpcmtOb25CcmVha2luZ1NwYWNlKCkpIHsKQEAg LTI2Myw3ICsyNjMsNyBAQCBpbmxpbmUgdm9pZCBMaW5lQ2FuZGlkYXRlOjpJbmxpbmVDb250ZW50 OjphcHBlbmRJbmxpbmVJdGVtKGNvbnN0IElubGluZUl0ZW0mIGlubAogICAgICAgICAgICAgQVNT RVJUKGxvZ2ljYWxXaWR0aCA+IGxldHRlclNwYWNpbmcpOwogICAgICAgICAgICAgcmV0dXJuIGxl dHRlclNwYWNpbmc7CiAgICAgICAgIH07Ci0gICAgICAgIG1fY29udGludW91c0NvbnRlbnQuYXBw ZW5kKGlubGluZVRleHRJdGVtLCBzdHlsZSwgbG9naWNhbFdpZHRoLCB0cmltbWFibGVXaWR0aCgp KTsKKyAgICAgICAgbV9jb250aW51b3VzQ29udGVudC5hcHBlbmRUZXh0Q29udGVudChpbmxpbmVU ZXh0SXRlbSwgc3R5bGUsIGxvZ2ljYWxXaWR0aCwgdHJpbW1hYmxlV2lkdGgoKSk7CiAgICAgICAg IHJldHVybjsKICAgICB9CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cg==