223016 2021-03-09 22:28:33 -0800 Release assertion failures under Editor::scanSelectionForTelephoneNumbers 2021-03-10 09:51:40 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bdakin darin ews-watchlist megan_gardner mifenton rniwa webkit-bug-importer wenson_hsieh oldest_to_newest 1737946 0 thorton 2021-03-09 22:28:33 -0800 Release assertion failures under Editor::scanSelectionForTelephoneNumbers 1737947 1 422802 thorton 2021-03-09 22:28:48 -0800 Created attachment 422802 Patch 1737948 2 thorton 2021-03-09 22:28:50 -0800 <rdar://problem/73159921> 1737949 3 422802 rniwa 2021-03-09 22:33:59 -0800 Comment on attachment 422802 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422802&action=review > Source/WebCore/editing/Editor.cpp:3705 > + if (selectedRange) { Why not put selectedRange inside here? > Source/WebCore/editing/Editor.cpp:3710 > + extendedRange = extendSelection(*selectedRange, charactersToExtend); > + } > + > + if (extendedRange) { Can't we just nest these if's? 1737958 4 422802 thorton 2021-03-09 22:50:12 -0800 Comment on attachment 422802 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422802&action=review >> Source/WebCore/editing/Editor.cpp:3705 >> + if (selectedRange) { > > Why not put selectedRange inside here? Good point. >> Source/WebCore/editing/Editor.cpp:3710 >> + if (extendedRange) { > > Can't we just nest these if's? Sure, we certainly can! 1737959 5 422804 thorton 2021-03-09 22:55:44 -0800 Created attachment 422804 Patch 1737976 6 ews-feeder 2021-03-10 00:19:13 -0800 Committed r274203: <https://commits.webkit.org/r274203> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422804. 1738097 7 darin 2021-03-10 09:51:40 -0800 Better. One other thought. To my taste, the real problem here is calling two separate functions, isRange and firstRange, to get the same information. A better design would be to call firstRange and then check if it’s missing or *collapsed* instead of relying on a separate function call to preflight that information. 422802 2021-03-09 22:28:48 -0800 2021-03-09 22:55:42 -0800 Patch bug-223016-20210309222847.patch text/plain 4516 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjUyYjg5YjMyNGQxZTE0 N2E5ZjAyZGI3MTEyMDE2MDMxZDBhZjk5Zi4uYjMwZTZmZDI5MTE2MzVlNWYwNDgxZGI3MGYyMjIz ZWY4NWFhZjQwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTAzLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFJlbGVhc2UgYXNz ZXJ0aW9uIGZhaWx1cmVzIHVuZGVyIEVkaXRvcjo6c2NhblNlbGVjdGlvbkZvclRlbGVwaG9uZU51 bWJlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MzAxNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzMxNTk5MjE+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzOyBzcGVjdWxhdGl2 ZSBmaXggZm9yIGEgbm9uLXJlcHJvZHVjaWJsZSBjcmFzaCwgd2hpY2ggdGhlb3JldGljYWxseQor ICAgICAgICBoYXMgYmVlbiBhdm9pZGVkIGluIGEgc2Vjb25kIHdheSBvbiB0cnVuay4KKworICAg ICAgICAqIGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmV4dGVuZFNlbGVj dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhv bmVOdW1iZXJzKToKKyAgICAgICAgSW4gcjI3Mjc3NywgUnlvc3VrZSBkaXNjb3ZlcmVkIGEgY2Fz ZSB3aGVyZSBGcmFtZVNlbGVjdGlvbjo6aXNSYW5nZSgpCisgICAgICAgIGNhbiBiZSB0cnVlLCBi dXQgZmlyc3RSYW5nZSgpIGlzIGFuIGludmFsaWQgcmFuZ2U7IGluIHRlc3RpbmcsIGZvcmNpbmcK KyAgICAgICAgdGhpcyB0byBiZSB0aGUgY2FzZSByZXByb2R1Y2VzIHRoZSBjcmFzaCBhcyByZXBv cnRlZC4KKworICAgICAgICBXaGlsZSB0aGF0IGNoYW5nZSBtYXkgaGF2ZSBmaXhlZCB0aGUgcm9v dCBjYXVzZSBvZiB0aGlzIGNyYXNoLCB3ZSBkb24ndAorICAgICAgICBrbm93IHRoYXQgd2UndmUg Zm91bmQgYWxsIG9mIHRoZSB3YXlzIHRoYXQgb25lIGNhbiBnZXQgYSBvcnBoYW5lZAorICAgICAg ICBzZWxlY3Rpb24gKmludG8qIEZyYW1lU2VsZWN0aW9uLCBhbmQgd2FudCBhIGxlc3Mgcmlza3kg d29ya2Fyb3VuZCBmb3IKKyAgICAgICAgdGhpcyBjcmFzaCwgc28gd2UnbGwgYWxzbyBmaXggaXQg aW4gc2NhblNlbGVjdGlvbkZvclRlbGVwaG9uZU51bWJlcnMsCisgICAgICAgIGJ5IG51bGwtY2hl Y2tpbmcgdGhlIHJlc3VsdCBvZiBGcmFtZVNlbGVjdGlvbjo6Zmlyc3RSYW5nZSgpLgorCisgICAg ICAgIEFsc28gbnVsbC1jaGVjayB0aGUgcmVzdWx0IG9mIGV4dGVuZFNlbGVjdGlvbigpLCBzaW5j ZSBJIGNhbm5vdCBwcm92ZSBmb3Igc3VyZQorICAgICAgICB0aGF0IGEgdmFsaWQgcmFuZ2UgY2Fu bm90IGJlY29tZSBpbnZhbGlkIGluIHRoaXMgbWV0aG9kLgorCiAyMDIxLTAzLTA2ICBaYWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVyXSBJ bnZhbGlkYXRlIGJlZm9yZUNoaWxkIHdoZW4gcGFyZW50IGNoYW5nZXMgdG8gUnVieUJhc2UKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRWRpdG9yLmNwcAppbmRleCA5ZjRlM2YwOGIyYTZmZDdlMDU3NDIwOTE4NWRl Y2Y4YTgzZDc1YmQ1Li4xMWU5ZjQyZTA1OTFmNjA5YzEyYWE5ZDM1MTVhNWU1YmEwY2EyZjBiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCkBAIC0zNjc3LDcgKzM2NzcsNyBAQCBzdGF0aWMg VmVjdG9yPFNpbXBsZVJhbmdlPiBzY2FuRm9yVGVsZXBob25lTnVtYmVycyhjb25zdCBTaW1wbGVS YW5nZSYgcmFuZ2UpCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAotc3RhdGljIFNpbXBsZVJhbmdl IGV4dGVuZFNlbGVjdGlvbihjb25zdCBTaW1wbGVSYW5nZSYgcmFuZ2UsIHVuc2lnbmVkIGNoYXJh Y3RlcnNUb0V4dGVuZCkKK3N0YXRpYyBPcHRpb25hbDxTaW1wbGVSYW5nZT4gZXh0ZW5kU2VsZWN0 aW9uKGNvbnN0IFNpbXBsZVJhbmdlJiByYW5nZSwgdW5zaWduZWQgY2hhcmFjdGVyc1RvRXh0ZW5k KQogewogICAgIGF1dG8gc3RhcnQgPSBtYWtlRGVwcmVjYXRlZExlZ2FjeVBvc2l0aW9uKHJhbmdl LnN0YXJ0KTsKICAgICBhdXRvIGVuZCA9IG1ha2VEZXByZWNhdGVkTGVnYWN5UG9zaXRpb24ocmFu Z2UuZW5kKTsKQEAgLTM2ODUsNyArMzY4NSw3IEBAIHN0YXRpYyBTaW1wbGVSYW5nZSBleHRlbmRT ZWxlY3Rpb24oY29uc3QgU2ltcGxlUmFuZ2UmIHJhbmdlLCB1bnNpZ25lZCBjaGFyYWN0ZXJzCiAg ICAgICAgIHN0YXJ0ID0gc3RhcnQucHJldmlvdXMoQ2hhcmFjdGVyKTsKICAgICAgICAgZW5kID0g ZW5kLm5leHQoQ2hhcmFjdGVyKTsKICAgICB9Ci0gICAgcmV0dXJuICptYWtlU2ltcGxlUmFuZ2Uo c3RhcnQsIGVuZCk7CisgICAgcmV0dXJuIG1ha2VTaW1wbGVSYW5nZShzdGFydCwgZW5kKTsKIH0K IAogdm9pZCBFZGl0b3I6OnNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhvbmVOdW1iZXJzKCkKQEAgLTM2 OTgsMTYgKzM2OTgsMjQgQEAgdm9pZCBFZGl0b3I6OnNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhvbmVO dW1iZXJzKCkKIAogICAgIGF1dG8mIHNlbGVjdGlvbiA9IG1fZG9jdW1lbnQuc2VsZWN0aW9uKCk7 CiAgICAgaWYgKHNlbGVjdGlvbi5pc1JhbmdlKCkpIHsKLSAgICAgICAgYXV0byBzZWxlY3RlZFJh bmdlID0gKnNlbGVjdGlvbi5zZWxlY3Rpb24oKS5maXJzdFJhbmdlKCk7CisgICAgICAgIGF1dG8g c2VsZWN0ZWRSYW5nZSA9IHNlbGVjdGlvbi5zZWxlY3Rpb24oKS5maXJzdFJhbmdlKCk7CisgICAg ICAgIAogICAgICAgICAvLyBFeHRlbmQgdGhlIHJhbmdlIGEgZmV3IGNoYXJhY3RlcnMgaW4gZWFj aCBkaXJlY3Rpb24gdG8gZGV0ZWN0IGluY29tcGxldGVseSBzZWxlY3RlZCBwaG9uZSBudW1iZXJz LgotICAgICAgICBjb25zdGV4cHIgdW5zaWduZWQgY2hhcmFjdGVyc1RvRXh0ZW5kID0gMTU7Ci0g ICAgICAgIGZvciAoYXV0byYgcmFuZ2UgOiBzY2FuRm9yVGVsZXBob25lTnVtYmVycyhleHRlbmRT ZWxlY3Rpb24oc2VsZWN0ZWRSYW5nZSwgY2hhcmFjdGVyc1RvRXh0ZW5kKSkpIHsKLSAgICAgICAg ICAgIC8vIEZJWE1FOiBXaHkgZG8gd2UgZG8gdGhpcyB1bmNvbmRpdGlvbmFsbHkgaW5zdGVhZCBv ZiB3aGVuIG9ubHkgd2hlbiBpdCBvdmVybGFwcyB0aGUgc2VsZWN0aW9uPwotICAgICAgICAgICAg YWRkTWFya2VyKHJhbmdlLCBEb2N1bWVudE1hcmtlcjo6VGVsZXBob25lTnVtYmVyKTsKLQotICAg ICAgICAgICAgLy8gT25seSBjb25zaWRlciByYW5nZXMgd2l0aCBhIGRldGVjdGVkIHRlbGVwaG9u ZSBudW1iZXIgaWYgdGhleSBvdmVybGFwIHdpdGggdGhlIHNlbGVjdGlvbi4KLSAgICAgICAgICAg IGlmIChpbnRlcnNlY3RzPENvbXBvc2VkVHJlZT4ocmFuZ2UsIHNlbGVjdGVkUmFuZ2UpKQotICAg ICAgICAgICAgICAgIG1fZGV0ZWN0ZWRUZWxlcGhvbmVOdW1iZXJSYW5nZXMuYXBwZW5kKHJhbmdl KTsKKyAgICAgICAgT3B0aW9uYWw8U2ltcGxlUmFuZ2U+IGV4dGVuZGVkUmFuZ2U7CisgICAgICAg IGlmIChzZWxlY3RlZFJhbmdlKSB7CisgICAgICAgICAgICBjb25zdGV4cHIgdW5zaWduZWQgY2hh cmFjdGVyc1RvRXh0ZW5kID0gMTU7CisgICAgICAgICAgICBleHRlbmRlZFJhbmdlID0gZXh0ZW5k U2VsZWN0aW9uKCpzZWxlY3RlZFJhbmdlLCBjaGFyYWN0ZXJzVG9FeHRlbmQpOworICAgICAgICB9 CisgICAgICAgIAorICAgICAgICBpZiAoZXh0ZW5kZWRSYW5nZSkgeworICAgICAgICAgICAgZm9y IChhdXRvJiByYW5nZSA6IHNjYW5Gb3JUZWxlcGhvbmVOdW1iZXJzKCpleHRlbmRlZFJhbmdlKSkg eworICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBXaHkgZG8gd2UgZG8gdGhpcyB1bmNvbmRpdGlv bmFsbHkgaW5zdGVhZCBvZiB3aGVuIG9ubHkgd2hlbiBpdCBvdmVybGFwcyB0aGUgc2VsZWN0aW9u PworICAgICAgICAgICAgICAgIGFkZE1hcmtlcihyYW5nZSwgRG9jdW1lbnRNYXJrZXI6OlRlbGVw aG9uZU51bWJlcik7CisKKyAgICAgICAgICAgICAgICAvLyBPbmx5IGNvbnNpZGVyIHJhbmdlcyB3 aXRoIGEgZGV0ZWN0ZWQgdGVsZXBob25lIG51bWJlciBpZiB0aGV5IG92ZXJsYXAgd2l0aCB0aGUg c2VsZWN0aW9uLgorICAgICAgICAgICAgICAgIGlmIChpbnRlcnNlY3RzPENvbXBvc2VkVHJlZT4o cmFuZ2UsICpzZWxlY3RlZFJhbmdlKSkKKyAgICAgICAgICAgICAgICAgICAgbV9kZXRlY3RlZFRl bGVwaG9uZU51bWJlclJhbmdlcy5hcHBlbmQocmFuZ2UpOworICAgICAgICAgICAgfQogICAgICAg ICB9CiAgICAgfQogCg== 422804 2021-03-09 22:55:44 -0800 2021-03-10 00:19:14 -0800 Patch bug-223016-20210309225543.patch text/plain 4552 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjUyYjg5YjMyNGQxZTE0 N2E5ZjAyZGI3MTEyMDE2MDMxZDBhZjk5Zi4uOWNjMzFjZGVjMGVkYTAzNjAzNTZiYjQ1ZGU5Y2Fi OGIwODNiM2NhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTAzLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFJlbGVhc2UgYXNz ZXJ0aW9uIGZhaWx1cmVzIHVuZGVyIEVkaXRvcjo6c2NhblNlbGVjdGlvbkZvclRlbGVwaG9uZU51 bWJlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MzAxNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzMxNTk5MjE+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAgIE5vIG5ldyB0ZXN0czsgc3BlY3VsYXRpdmUg Zml4IGZvciBhIG5vbi1yZXByb2R1Y2libGUgY3Jhc2gsIHdoaWNoIHRoZW9yZXRpY2FsbHkKKyAg ICAgICAgaGFzIGJlZW4gYXZvaWRlZCBpbiBhIHNlY29uZCB3YXkgb24gdHJ1bmsuCisKKyAgICAg ICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpleHRlbmRTZWxlY3Rp b24pOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpzY2FuU2VsZWN0aW9uRm9yVGVsZXBob25l TnVtYmVycyk6CisgICAgICAgIEluIHIyNzI3NzcsIFJ5b3N1a2UgZGlzY292ZXJlZCBhIGNhc2Ug d2hlcmUgRnJhbWVTZWxlY3Rpb246OmlzUmFuZ2UoKQorICAgICAgICBjYW4gYmUgdHJ1ZSwgYnV0 IGZpcnN0UmFuZ2UoKSBpcyBhbiBpbnZhbGlkIHJhbmdlOyBpbiB0ZXN0aW5nLCBmb3JjaW5nCisg ICAgICAgIHRoaXMgdG8gYmUgdGhlIGNhc2UgcmVwcm9kdWNlcyB0aGUgY3Jhc2ggYXMgcmVwb3J0 ZWQuCisKKyAgICAgICAgV2hpbGUgdGhhdCBjaGFuZ2UgbWF5IGhhdmUgZml4ZWQgdGhlIHJvb3Qg Y2F1c2Ugb2YgdGhpcyBjcmFzaCwgd2UgZG9uJ3QKKyAgICAgICAga25vdyB0aGF0IHdlJ3ZlIGZv dW5kIGFsbCBvZiB0aGUgd2F5cyB0aGF0IG9uZSBjYW4gZ2V0IGEgb3JwaGFuZWQKKyAgICAgICAg c2VsZWN0aW9uICppbnRvKiBGcmFtZVNlbGVjdGlvbiwgYW5kIHdhbnQgYSBsZXNzIHJpc2t5IHdv cmthcm91bmQgZm9yCisgICAgICAgIHRoaXMgY3Jhc2gsIHNvIHdlJ2xsIGFsc28gZml4IGl0IGlu IHNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhvbmVOdW1iZXJzLAorICAgICAgICBieSBudWxsLWNoZWNr aW5nIHRoZSByZXN1bHQgb2YgRnJhbWVTZWxlY3Rpb246OmZpcnN0UmFuZ2UoKS4KKworICAgICAg ICBBbHNvIG51bGwtY2hlY2sgdGhlIHJlc3VsdCBvZiBleHRlbmRTZWxlY3Rpb24oKSwgc2luY2Ug SSBjYW5ub3QgcHJvdmUgZm9yIHN1cmUKKyAgICAgICAgdGhhdCBhIHZhbGlkIHJhbmdlIGNhbm5v dCBiZWNvbWUgaW52YWxpZCBpbiB0aGlzIG1ldGhvZC4KKwogMjAyMS0wMy0wNiAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtSZW5kZXJUcmVlQnVpbGRlcl0gSW52 YWxpZGF0ZSBiZWZvcmVDaGlsZCB3aGVuIHBhcmVudCBjaGFuZ2VzIHRvIFJ1YnlCYXNlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL0VkaXRvci5jcHAKaW5kZXggOWY0ZTNmMDhiMmE2ZmQ3ZTA1NzQyMDkxODVkZWNm OGE4M2Q3NWJkNS4uNjI0MjZlZmU4MjcwNDYzYzcyMzZjOWQ5Y2EzNjUyZDlmZmFmYzU4ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcApAQCAtMzY3Nyw3ICszNjc3LDcgQEAgc3RhdGljIFZl Y3RvcjxTaW1wbGVSYW5nZT4gc2NhbkZvclRlbGVwaG9uZU51bWJlcnMoY29uc3QgU2ltcGxlUmFu Z2UmIHJhbmdlKQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLXN0YXRpYyBTaW1wbGVSYW5nZSBl eHRlbmRTZWxlY3Rpb24oY29uc3QgU2ltcGxlUmFuZ2UmIHJhbmdlLCB1bnNpZ25lZCBjaGFyYWN0 ZXJzVG9FeHRlbmQpCitzdGF0aWMgT3B0aW9uYWw8U2ltcGxlUmFuZ2U+IGV4dGVuZFNlbGVjdGlv bihjb25zdCBTaW1wbGVSYW5nZSYgcmFuZ2UsIHVuc2lnbmVkIGNoYXJhY3RlcnNUb0V4dGVuZCkK IHsKICAgICBhdXRvIHN0YXJ0ID0gbWFrZURlcHJlY2F0ZWRMZWdhY3lQb3NpdGlvbihyYW5nZS5z dGFydCk7CiAgICAgYXV0byBlbmQgPSBtYWtlRGVwcmVjYXRlZExlZ2FjeVBvc2l0aW9uKHJhbmdl LmVuZCk7CkBAIC0zNjg1LDcgKzM2ODUsNyBAQCBzdGF0aWMgU2ltcGxlUmFuZ2UgZXh0ZW5kU2Vs ZWN0aW9uKGNvbnN0IFNpbXBsZVJhbmdlJiByYW5nZSwgdW5zaWduZWQgY2hhcmFjdGVycwogICAg ICAgICBzdGFydCA9IHN0YXJ0LnByZXZpb3VzKENoYXJhY3Rlcik7CiAgICAgICAgIGVuZCA9IGVu ZC5uZXh0KENoYXJhY3Rlcik7CiAgICAgfQotICAgIHJldHVybiAqbWFrZVNpbXBsZVJhbmdlKHN0 YXJ0LCBlbmQpOworICAgIHJldHVybiBtYWtlU2ltcGxlUmFuZ2Uoc3RhcnQsIGVuZCk7CiB9CiAK IHZvaWQgRWRpdG9yOjpzY2FuU2VsZWN0aW9uRm9yVGVsZXBob25lTnVtYmVycygpCkBAIC0zNjk4 LDE2ICszNjk4LDE5IEBAIHZvaWQgRWRpdG9yOjpzY2FuU2VsZWN0aW9uRm9yVGVsZXBob25lTnVt YmVycygpCiAKICAgICBhdXRvJiBzZWxlY3Rpb24gPSBtX2RvY3VtZW50LnNlbGVjdGlvbigpOwog ICAgIGlmIChzZWxlY3Rpb24uaXNSYW5nZSgpKSB7Ci0gICAgICAgIGF1dG8gc2VsZWN0ZWRSYW5n ZSA9ICpzZWxlY3Rpb24uc2VsZWN0aW9uKCkuZmlyc3RSYW5nZSgpOwotICAgICAgICAvLyBFeHRl bmQgdGhlIHJhbmdlIGEgZmV3IGNoYXJhY3RlcnMgaW4gZWFjaCBkaXJlY3Rpb24gdG8gZGV0ZWN0 IGluY29tcGxldGVseSBzZWxlY3RlZCBwaG9uZSBudW1iZXJzLgotICAgICAgICBjb25zdGV4cHIg dW5zaWduZWQgY2hhcmFjdGVyc1RvRXh0ZW5kID0gMTU7Ci0gICAgICAgIGZvciAoYXV0byYgcmFu Z2UgOiBzY2FuRm9yVGVsZXBob25lTnVtYmVycyhleHRlbmRTZWxlY3Rpb24oc2VsZWN0ZWRSYW5n ZSwgY2hhcmFjdGVyc1RvRXh0ZW5kKSkpIHsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBXaHkgZG8g d2UgZG8gdGhpcyB1bmNvbmRpdGlvbmFsbHkgaW5zdGVhZCBvZiB3aGVuIG9ubHkgd2hlbiBpdCBv dmVybGFwcyB0aGUgc2VsZWN0aW9uPwotICAgICAgICAgICAgYWRkTWFya2VyKHJhbmdlLCBEb2N1 bWVudE1hcmtlcjo6VGVsZXBob25lTnVtYmVyKTsKLQotICAgICAgICAgICAgLy8gT25seSBjb25z aWRlciByYW5nZXMgd2l0aCBhIGRldGVjdGVkIHRlbGVwaG9uZSBudW1iZXIgaWYgdGhleSBvdmVy bGFwIHdpdGggdGhlIHNlbGVjdGlvbi4KLSAgICAgICAgICAgIGlmIChpbnRlcnNlY3RzPENvbXBv c2VkVHJlZT4ocmFuZ2UsIHNlbGVjdGVkUmFuZ2UpKQotICAgICAgICAgICAgICAgIG1fZGV0ZWN0 ZWRUZWxlcGhvbmVOdW1iZXJSYW5nZXMuYXBwZW5kKHJhbmdlKTsKKyAgICAgICAgaWYgKGF1dG8g c2VsZWN0ZWRSYW5nZSA9IHNlbGVjdGlvbi5zZWxlY3Rpb24oKS5maXJzdFJhbmdlKCkpIHsKKyAg ICAgICAgICAgIC8vIEV4dGVuZCB0aGUgcmFuZ2UgYSBmZXcgY2hhcmFjdGVycyBpbiBlYWNoIGRp cmVjdGlvbiB0byBkZXRlY3QgaW5jb21wbGV0ZWx5IHNlbGVjdGVkIHBob25lIG51bWJlcnMuCisg ICAgICAgICAgICBjb25zdGV4cHIgdW5zaWduZWQgY2hhcmFjdGVyc1RvRXh0ZW5kID0gMTU7Cisg ICAgICAgICAgICBpZiAoYXV0byBleHRlbmRlZFJhbmdlID0gZXh0ZW5kU2VsZWN0aW9uKCpzZWxl Y3RlZFJhbmdlLCBjaGFyYWN0ZXJzVG9FeHRlbmQpKSB7CisgICAgICAgICAgICAgICAgZm9yIChh dXRvJiByYW5nZSA6IHNjYW5Gb3JUZWxlcGhvbmVOdW1iZXJzKCpleHRlbmRlZFJhbmdlKSkgewor ICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTogV2h5IGRvIHdlIGRvIHRoaXMgdW5jb25kaXRp b25hbGx5IGluc3RlYWQgb2Ygd2hlbiBvbmx5IHdoZW4gaXQgb3ZlcmxhcHMgdGhlIHNlbGVjdGlv bj8KKyAgICAgICAgICAgICAgICAgICAgYWRkTWFya2VyKHJhbmdlLCBEb2N1bWVudE1hcmtlcjo6 VGVsZXBob25lTnVtYmVyKTsKKworICAgICAgICAgICAgICAgICAgICAvLyBPbmx5IGNvbnNpZGVy IHJhbmdlcyB3aXRoIGEgZGV0ZWN0ZWQgdGVsZXBob25lIG51bWJlciBpZiB0aGV5IG92ZXJsYXAg d2l0aCB0aGUgc2VsZWN0aW9uLgorICAgICAgICAgICAgICAgICAgICBpZiAoaW50ZXJzZWN0czxD b21wb3NlZFRyZWU+KHJhbmdlLCAqc2VsZWN0ZWRSYW5nZSkpCisgICAgICAgICAgICAgICAgICAg ICAgICBtX2RldGVjdGVkVGVsZXBob25lTnVtYmVyUmFuZ2VzLmFwcGVuZChyYW5nZSk7CisgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQogCg==