220884 2021-01-22 16:08:42 -0800 [LFC][RenderTreeDump] Expand RenderInline 0 height quirk logic to prev/next siblings 2021-01-22 19:56:15 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1721765 0 zalan 2021-01-22 16:08:42 -0800 This is in preparation for enabling inline box content for LFC 1721769 1 418193 zalan 2021-01-22 16:18:17 -0800 Created attachment 418193 Patch 1721784 2 418193 simon.fraser 2021-01-22 16:33:36 -0800 Comment on attachment 418193 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418193&action=review > Source/WebCore/ChangeLog:8 > + Check the previous/next siblings to see we should apply the zero-height quirk on the current RenderInline. whether we should apply? 1721807 3 418207 zalan 2021-01-22 19:22:14 -0800 Created attachment 418207 Patch 1721810 4 ews-feeder 2021-01-22 19:55:21 -0800 Committed r271773: <https://trac.webkit.org/changeset/271773> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418207. 1721812 5 webkit-bug-importer 2021-01-22 19:56:15 -0800 <rdar://problem/73525435> 418193 2021-01-22 16:18:17 -0800 2021-01-22 19:22:11 -0800 Patch bug-220884-20210122161816.patch text/plain 8728 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTM4NTY4NWEzZjU1YWQz NGRhODZmNTE3NDkwMmExODg2YjBkZWUxYi4uMDk1ZjJhZDU2OTQ5YjdmOTBiYmE4NGY1Yzc5YWI1 NTRmNGNkMDg2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bUmVuZGVyVHJlZUR1 bXBdIEV4cGFuZCBSZW5kZXJJbmxpbmUgMCBoZWlnaHQgcXVpcmsgbG9naWMgdG8gcHJldmlvdXMv bmV4dCBzaWJsaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjIwODg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQ2hlY2sgdGhlIHByZXZpb3VzL25leHQgc2libGluZ3MgdG8gc2VlIHdlIHNob3VsZCBh cHBseSB0aGUgemVyby1oZWlnaHQgcXVpcmsgb24gdGhlIGN1cnJlbnQgUmVuZGVySW5saW5lLgor ICAgICAgICBOb3RlIHRoYXQgdGhpcyBkb2VzIG5vdCBjaGFuZ2UgdGhlIFJlbmRlcklubGluZXMn IHJlcG9ydGVkIGhlaWdodCB2YWx1ZXMgb24gdHJ1bmsuCisgICAgICAgIEhvd2V2ZXIgaXQgZ3Jl YXRseSBoZWxwcyB0byByZWR1Y2UgdGhlIHJlcXVpcmVkIHJlYmFzZWxpbmUgd2hlbiBMRkMncyBp bmxpbmUgYm94IHN1cHBvcnQgaXMgZW5hYmxlZCAoc2VlIHdlYmtpdC5vcmcvYi8yMjAxNDgpLiAK KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVySW5saW5lOjpzaG91bGRDcmVhdGVMaW5lQm94ZXMgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVySW5saW5lOjp1cGRhdGVBbHdheXNDcmVhdGVMaW5lQm94ZXMpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyVHJlZUFzVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc1JlbmRlcklubGluZUVtcHR5 KToKKyAgICAgICAgKFdlYkNvcmU6Omhhc05vbkVtcHR5U2libGluZyk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUcmVlQXNUZXh0Ojp3cml0ZVJlbmRlck9iamVjdCk6CisKIDIwMjEtMDEtMjAg IEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgU2Fm YXJpIHNheXMgIkJsb2NrZWQgUGx1Zy1pbiIgaW5zdGVhZCBzaG93aW5nIGEgUERGCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCmluZGV4IGQyMjNlYjJkODQ0ZTNkMDBm YzAxZjQwZGI3NWZhZTZkNGQzNTFiMWUuLjcwMWQxMzAxMGIwZGVmOTgyZDI1MDExN2I4MTg2MjMy ZGE5OTY4MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxp bmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCkBA IC0yMDMsMTggKzIwMywxNCBAQCB2b2lkIFJlbmRlcklubGluZTo6c3R5bGVEaWRDaGFuZ2UoU3R5 bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdAogI2VuZGlmCiB9CiAK LXZvaWQgUmVuZGVySW5saW5lOjp1cGRhdGVBbHdheXNDcmVhdGVMaW5lQm94ZXMoYm9vbCBmdWxs TGF5b3V0KQorYm9vbCBSZW5kZXJJbmxpbmU6OnNob3VsZENyZWF0ZUxpbmVCb3hlcygpIGNvbnN0 CiB7Ci0gICAgLy8gT25jZSB3ZSBoYXZlIGJlZW4gdGFpbnRlZCBvbmNlLCBqdXN0IGFzc3VtZSBp dCB3aWxsIGhhcHBlbiBhZ2Fpbi4gVGhpcyB3YXkgZWZmZWN0cyBsaWtlIGhvdmVyIGhpZ2hsaWdo dGluZyB0aGF0IGNoYW5nZSB0aGUKLSAgICAvLyBiYWNrZ3JvdW5kIGNvbG9yIHdpbGwgb25seSBj YXVzZSBhIGxheW91dCBvbiB0aGUgZmlyc3Qgcm9sbG92ZXIuCi0gICAgaWYgKGFsd2F5c0NyZWF0 ZUxpbmVCb3hlcygpKQotICAgICAgICByZXR1cm47Ci0KKyAgICAvLyBUZXN0IGlmIHdlIGNhbiBn ZXQgYXdheSB3aXRoIGN1bGxpbmcuCiAgICAgYXV0byogcGFyZW50U3R5bGUgPSAmcGFyZW50KCkt PnN0eWxlKCk7CiAgICAgUmVuZGVySW5saW5lKiBwYXJlbnRSZW5kZXJJbmxpbmUgPSBpczxSZW5k ZXJJbmxpbmU+KCpwYXJlbnQoKSkgPyBkb3duY2FzdDxSZW5kZXJJbmxpbmU+KHBhcmVudCgpKSA6 IG51bGxwdHI7CiAgICAgYXV0byBoYXNIYXJkTGluZUJyZWFrQ2hpbGRPbmx5ID0gZmlyc3RDaGls ZCgpICYmIGZpcnN0Q2hpbGQoKSA9PSBsYXN0Q2hpbGQoKSAmJiBmaXJzdENoaWxkKCktPmlzQlIo KTsKICAgICBib29sIGNoZWNrRm9udHMgPSBkb2N1bWVudCgpLmluTm9RdWlya3NNb2RlKCk7Ci0g ICAgYm9vbCBhbHdheXNDcmVhdGVMaW5lQm94ZXMgPSAocGFyZW50UmVuZGVySW5saW5lICYmIHBh cmVudFJlbmRlcklubGluZS0+YWx3YXlzQ3JlYXRlTGluZUJveGVzKCkpCisgICAgYXV0byBuZWVk c0xpbmVCb3hlcyA9IChwYXJlbnRSZW5kZXJJbmxpbmUgJiYgcGFyZW50UmVuZGVySW5saW5lLT5h bHdheXNDcmVhdGVMaW5lQm94ZXMoKSkKICAgICAgICAgfHwgKHBhcmVudFJlbmRlcklubGluZSAm JiBwYXJlbnRTdHlsZS0+dmVydGljYWxBbGlnbigpICE9IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5l KQogICAgICAgICB8fCBzdHlsZSgpLnZlcnRpY2FsQWxpZ24oKSAhPSBWZXJ0aWNhbEFsaWduOjpC YXNlbGluZQogICAgICAgICB8fCBzdHlsZSgpLnRleHRFbXBoYXNpc01hcmsoKSAhPSBUZXh0RW1w aGFzaXNNYXJrOjpOb25lCkBAIC0yMjIsMjAgKzIxOCwyNyBAQCB2b2lkIFJlbmRlcklubGluZTo6 dXBkYXRlQWx3YXlzQ3JlYXRlTGluZUJveGVzKGJvb2wgZnVsbExheW91dCkKICAgICAgICAgfHwg cGFyZW50U3R5bGUtPmxpbmVIZWlnaHQoKSAhPSBzdHlsZSgpLmxpbmVIZWlnaHQoKSkpCiAgICAg ICAgIHx8IGhhc0hhcmRMaW5lQnJlYWtDaGlsZE9ubHk7CiAKLSAgICBpZiAoIWFsd2F5c0NyZWF0 ZUxpbmVCb3hlcyAmJiBjaGVja0ZvbnRzICYmIHZpZXcoKS51c2VzRmlyc3RMaW5lUnVsZXMoKSkg eworICAgIGlmICghbmVlZHNMaW5lQm94ZXMgJiYgY2hlY2tGb250cyAmJiB2aWV3KCkudXNlc0Zp cnN0TGluZVJ1bGVzKCkpIHsKICAgICAgICAgLy8gSGF2ZSB0byBjaGVjayB0aGUgZmlyc3QgbGlu ZSBzdHlsZSBhcyB3ZWxsLgogICAgICAgICBwYXJlbnRTdHlsZSA9ICZwYXJlbnQoKS0+Zmlyc3RM aW5lU3R5bGUoKTsKICAgICAgICAgYXV0byYgY2hpbGRTdHlsZSA9IGZpcnN0TGluZVN0eWxlKCk7 Ci0gICAgICAgIGFsd2F5c0NyZWF0ZUxpbmVCb3hlcyA9ICFwYXJlbnRTdHlsZS0+Zm9udENhc2Nh ZGUoKS5mb250TWV0cmljcygpLmhhc0lkZW50aWNhbEFzY2VudERlc2NlbnRBbmRMaW5lR2FwKGNo aWxkU3R5bGUuZm9udENhc2NhZGUoKS5mb250TWV0cmljcygpKQorICAgICAgICBuZWVkc0xpbmVC b3hlcyA9ICFwYXJlbnRTdHlsZS0+Zm9udENhc2NhZGUoKS5mb250TWV0cmljcygpLmhhc0lkZW50 aWNhbEFzY2VudERlc2NlbnRBbmRMaW5lR2FwKGNoaWxkU3R5bGUuZm9udENhc2NhZGUoKS5mb250 TWV0cmljcygpKQogICAgICAgICAgICAgfHwgY2hpbGRTdHlsZS52ZXJ0aWNhbEFsaWduKCkgIT0g VmVydGljYWxBbGlnbjo6QmFzZWxpbmUKICAgICAgICAgICAgIHx8IHBhcmVudFN0eWxlLT5saW5l SGVpZ2h0KCkgIT0gY2hpbGRTdHlsZS5saW5lSGVpZ2h0KCk7CiAgICAgfQorICAgIHJldHVybiBu ZWVkc0xpbmVCb3hlczsKK30KIAotICAgIGlmIChhbHdheXNDcmVhdGVMaW5lQm94ZXMpIHsKLSAg ICAgICAgaWYgKCFmdWxsTGF5b3V0KQotICAgICAgICAgICAgZGlydHlMaW5lQm94ZXMoZmFsc2Up OwotICAgICAgICBzZXRBbHdheXNDcmVhdGVMaW5lQm94ZXMoKTsKLSAgICB9Cit2b2lkIFJlbmRl cklubGluZTo6dXBkYXRlQWx3YXlzQ3JlYXRlTGluZUJveGVzKGJvb2wgZnVsbExheW91dCkKK3sK KyAgICAvLyBPbmNlIHdlIGhhdmUgYmVlbiB0YWludGVkIG9uY2UsIGp1c3QgYXNzdW1lIGl0IHdp bGwgaGFwcGVuIGFnYWluLiBUaGlzIHdheSBlZmZlY3RzIGxpa2UgaG92ZXIgaGlnaGxpZ2h0aW5n IHRoYXQgY2hhbmdlIHRoZQorICAgIC8vIGJhY2tncm91bmQgY29sb3Igd2lsbCBvbmx5IGNhdXNl IGEgbGF5b3V0IG9uIHRoZSBmaXJzdCByb2xsb3Zlci4KKyAgICBpZiAoYWx3YXlzQ3JlYXRlTGlu ZUJveGVzKCkgfHwgIXNob3VsZENyZWF0ZUxpbmVCb3hlcygpKQorICAgICAgICByZXR1cm47CisK KyAgICBzZXRBbHdheXNDcmVhdGVMaW5lQm94ZXMoKTsKKyAgICBpZiAoIWZ1bGxMYXlvdXQpCisg ICAgICAgIGRpcnR5TGluZUJveGVzKGZhbHNlKTsKIH0KIAogdm9pZCBSZW5kZXJJbmxpbmU6OnBh aW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgKaW5kZXggODc4OGZmZGVmMDQy ZTU4NzBjZTFmZTU3YTNjNzhmOTA2YTQzZTE4MC4uMWZjYTM4NDVjNzBkYjY5M2I5N2IxYzJhNTFk YWZiNzFkYWRlYTJiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl cklubGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuaApA QCAtODQsNiArODQsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGFsd2F5c0NyZWF0ZUxpbmVCb3hl cygpIGNvbnN0IHsgcmV0dXJuIHJlbmRlcklubGluZUFsd2F5c0NyZWF0ZXNMaW5lQm94ZXMoKTsg fQogICAgIHZvaWQgc2V0QWx3YXlzQ3JlYXRlTGluZUJveGVzKCkgeyBzZXRSZW5kZXJJbmxpbmVB bHdheXNDcmVhdGVzTGluZUJveGVzKHRydWUpOyB9CisgICAgYm9vbCBzaG91bGRDcmVhdGVMaW5l Qm94ZXMoKSBjb25zdDsKICAgICB2b2lkIHVwZGF0ZUFsd2F5c0NyZWF0ZUxpbmVCb3hlcyhib29s IGZ1bGxMYXlvdXQpOwogCiAgICAgYm9vbCBoaXRUZXN0Q3VsbGVkSW5saW5lKGNvbnN0IEhpdFRl c3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEhpdFRlc3RMb2NhdGlvbiYgbG9jYXRp b25JbkNvbnRhaW5lciwgY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0KTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcAppbmRleCAzZmM2 YTA1MzhjYzFkOGY1ZTkxMDE1ZGYyNDgxNjhmNWVjMGYxODdlLi41ZGVmMWY5YjBmMTZhODExNGYz Y2Y4YmYwZGEyYmFmOWVmMWUwNzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRyZWVBc1RleHQuY3BwCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiSFRNTEVsZW1l bnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MU3BhbkVsZW1lbnQu aCIKKyNpbmNsdWRlICJJbmxpbmVJdGVyYXRvci5oIgogI2luY2x1ZGUgIklubGluZVRleHRCb3gu aCIKICNpbmNsdWRlICJMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAi TG9nZ2luZy5oIgpAQCAtMTcxLDYgKzE3Miw0MyBAQCBTdHJpbmcgcXVvdGVBbmRFc2NhcGVOb25Q cmludGFibGVzKFN0cmluZ1ZpZXcgcykKICAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5nKCk7CiB9 CiAKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc1JlbmRlcklubGluZUVtcHR5KGNvbnN0IFJlbmRlcklu bGluZSYgaW5saW5lUmVuZGVyZXIpCit7CisgICAgaWYgKGlzRW1wdHlJbmxpbmUoaW5saW5lUmVu ZGVyZXIpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGZvciAoYXV0byYgY2hpbGQgOiBj aGlsZHJlbk9mVHlwZTxSZW5kZXJPYmplY3Q+KGlubGluZVJlbmRlcmVyKSkgeworICAgICAgICBp ZiAoY2hpbGQuaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpKQorICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgIGF1dG8gaXNDaGlsZEVtcHR5ID0gZmFsc2U7CisgICAgICAgIGlm IChpczxSZW5kZXJJbmxpbmU+KGNoaWxkKSkKKyAgICAgICAgICAgIGlzQ2hpbGRFbXB0eSA9IGlz UmVuZGVySW5saW5lRW1wdHkoZG93bmNhc3Q8UmVuZGVySW5saW5lPihjaGlsZCkpOworICAgICAg ICBlbHNlIGlmIChpczxSZW5kZXJUZXh0PihjaGlsZCkpCisgICAgICAgICAgICBpc0NoaWxkRW1w dHkgPSAhZG93bmNhc3Q8UmVuZGVyVGV4dD4oY2hpbGQpLmxpbmVzQm91bmRpbmdCb3goKS5oZWln aHQoKTsKKyAgICAgICAgaWYgKCFpc0NoaWxkRW1wdHkpCisgICAgICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgfQorICAgIHJldHVybiB0cnVlOworfQorCitzdGF0aWMgaW5saW5lIGJvb2wgaGFz Tm9uRW1wdHlTaWJsaW5nKGNvbnN0IFJlbmRlcklubGluZSYgaW5saW5lUmVuZGVyZXIpCit7Cisg ICAgYXV0byogcGFyZW50ID0gaW5saW5lUmVuZGVyZXIucGFyZW50KCk7CisgICAgaWYgKCFwYXJl bnQpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGZvciAoYXV0byYgc2libGluZyA6IGNo aWxkcmVuT2ZUeXBlPFJlbmRlck9iamVjdD4oKnBhcmVudCkpIHsKKyAgICAgICAgaWYgKCZzaWJs aW5nID09ICZpbmxpbmVSZW5kZXJlciB8fCBzaWJsaW5nLmlzRmxvYXRpbmdPck91dE9mRmxvd1Bv c2l0aW9uZWQoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBpZiAoIWlzPFJlbmRl cklubGluZT4oc2libGluZykpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgYXV0 byYgc2libGluZ1JlbmRlcmVySW5saW5lID0gZG93bmNhc3Q8UmVuZGVySW5saW5lPihzaWJsaW5n KTsKKyAgICAgICAgaWYgKHNpYmxpbmdSZW5kZXJlcklubGluZS5zaG91bGRDcmVhdGVMaW5lQm94 ZXMoKSB8fCAhaXNSZW5kZXJJbmxpbmVFbXB0eShzaWJsaW5nUmVuZGVyZXJJbmxpbmUpKQorICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9p ZCBSZW5kZXJUcmVlQXNUZXh0Ojp3cml0ZVJlbmRlck9iamVjdChUZXh0U3RyZWFtJiB0cywgY29u c3QgUmVuZGVyT2JqZWN0JiBvLCBPcHRpb25TZXQ8UmVuZGVyQXNUZXh0RmxhZz4gYmVoYXZpb3Ip CiB7CiAgICAgdHMgPDwgby5yZW5kZXJOYW1lKCk7CkBAIC0yMjcsMjEgKzI2NSwxMSBAQCB2b2lk IFJlbmRlclRyZWVBc1RleHQ6OndyaXRlUmVuZGVyT2JqZWN0KFRleHRTdHJlYW0mIHRzLCBjb25z dCBSZW5kZXJPYmplY3QmIG8sCiAgICAgICAgICAgICBpZiAoaW5saW5lRmxvdy5tYXJnaW5TdGFy dCgpIHx8IGlubGluZUZsb3cubWFyZ2luRW5kKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGhl aWdodDsKICAgICAgICAgICAgIC8vIFRoaXMgaXMgbW9zdGx5IHByZS9wb3N0IGNvbnRpbnVhdGlv biBjb250ZW50LiBBbHNvIHNlZSB3ZWJraXQub3JnL2IvMjIwNzM1Ci0gICAgICAgICAgICBpZiAo aW5saW5lRmxvdy5wcmV2aW91c1NpYmxpbmcoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gaGVp Z2h0OwotICAgICAgICAgICAgaWYgKGlubGluZUZsb3cubmV4dFNpYmxpbmcoKSAmJiAhaW5saW5l Rmxvdy5kb2N1bWVudCgpLmluUXVpcmtzTW9kZSgpKQorICAgICAgICAgICAgaWYgKGhhc05vbkVt cHR5U2libGluZyhpbmxpbmVGbG93KSkKICAgICAgICAgICAgICAgICByZXR1cm4gaGVpZ2h0Owot ICAgICAgICAgICAgaWYgKGF1dG8qIGZpcnN0Q2hpbGQgPSBpbmxpbmVGbG93LmZpcnN0Q2hpbGQo KSkgewotICAgICAgICAgICAgICAgIGlmIChmaXJzdENoaWxkICE9IGlubGluZUZsb3cubGFzdENo aWxkKCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBoZWlnaHQ7Ci0gICAgICAgICAgICAg ICAgYXV0byBjaGlsZElzRW1wdHkgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBpZiAoaXM8UmVu ZGVyVGV4dD4oKmZpcnN0Q2hpbGQpKQotICAgICAgICAgICAgICAgICAgICBjaGlsZElzRW1wdHkg PSAhZG93bmNhc3Q8UmVuZGVyVGV4dD4oKmZpcnN0Q2hpbGQpLmxpbmVzQm91bmRpbmdCb3goKS5o ZWlnaHQoKTsKLSAgICAgICAgICAgICAgICBlbHNlIGlmIChpczxSZW5kZXJJbmxpbmU+KCpmaXJz dENoaWxkKSkKLSAgICAgICAgICAgICAgICAgICAgY2hpbGRJc0VtcHR5ID0gIWRvd25jYXN0PFJl bmRlcklubGluZT4oKmZpcnN0Q2hpbGQpLmxpbmVzQm91bmRpbmdCb3goKS5oZWlnaHQoKTsKLSAg ICAgICAgICAgICAgICByZXR1cm4gY2hpbGRJc0VtcHR5ID8gMCA6IGhlaWdodDsKLSAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICAgaWYgKGlzUmVuZGVySW5s aW5lRW1wdHkoaW5saW5lRmxvdykpCisgICAgICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAg ICAgICByZXR1cm4gaGVpZ2h0OwogICAgICAgICB9OwogICAgICAgICByID0gSW50UmVjdCgwLCAw LCB3aWR0aCwgaW5saW5lSGVpZ2h0KCkpOwogICAgICAgICBhZGp1c3RGb3JUYWJsZUNlbGxzID0g ZmFsc2U7Cg== 418207 2021-01-22 19:22:14 -0800 2021-01-22 19:55:22 -0800 Patch bug-220884-20210122192213.patch text/plain 8734 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTM4NTY4NWEzZjU1YWQz NGRhODZmNTE3NDkwMmExODg2YjBkZWUxYi4uMzJhOTJiNWVmYzI0ZGE0YTEyZmIyMzcxMDkxNzU0 YmVhZmQ0NTcxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bUmVuZGVyVHJlZUR1 bXBdIEV4cGFuZCBSZW5kZXJJbmxpbmUgMCBoZWlnaHQgcXVpcmsgbG9naWMgdG8gcHJldmlvdXMv bmV4dCBzaWJsaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjIwODg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAg ICAgIENoZWNrIHRoZSBwcmV2aW91cy9uZXh0IHNpYmxpbmdzIHRvIHNlZSB3aGV0aGVyIHdlIHNo b3VsZCBhcHBseSB0aGUgemVyby1oZWlnaHQgcXVpcmsgb24gdGhlIGN1cnJlbnQgUmVuZGVySW5s aW5lLgorICAgICAgICBOb3RlIHRoYXQgdGhpcyBkb2VzIG5vdCBjaGFuZ2UgdGhlIFJlbmRlcklu bGluZXMnIHJlcG9ydGVkIGhlaWdodCB2YWx1ZXMgb24gdHJ1bmsuCisgICAgICAgIEhvd2V2ZXIg aXQgZ3JlYXRseSBoZWxwcyB0byByZWR1Y2UgdGhlIHJlcXVpcmVkIHJlYmFzZWxpbmUgd2hlbiBM RkMncyBpbmxpbmUgYm94IHN1cHBvcnQgaXMgZW5hYmxlZCAoc2VlIHdlYmtpdC5vcmcvYi8yMjAx NDgpLiAKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVySW5saW5lOjpzaG91bGRDcmVhdGVMaW5lQm94ZXMgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjp1cGRhdGVBbHdheXNDcmVhdGVMaW5lQm94ZXMp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuaDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVHJlZUFzVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc1JlbmRlcklubGlu ZUVtcHR5KToKKyAgICAgICAgKFdlYkNvcmU6Omhhc05vbkVtcHR5U2libGluZyk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUcmVlQXNUZXh0Ojp3cml0ZVJlbmRlck9iamVjdCk6CisKIDIwMjEt MDEtMjAgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAg ICAgU2FmYXJpIHNheXMgIkJsb2NrZWQgUGx1Zy1pbiIgaW5zdGVhZCBzaG93aW5nIGEgUERGCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCmluZGV4IGQyMjNlYjJkODQ0 ZTNkMDBmYzAxZjQwZGI3NWZhZTZkNGQzNTFiMWUuLjcwMWQxMzAxMGIwZGVmOTgyZDI1MDExN2I4 MTg2MjMyZGE5OTY4MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJJbmxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUu Y3BwCkBAIC0yMDMsMTggKzIwMywxNCBAQCB2b2lkIFJlbmRlcklubGluZTo6c3R5bGVEaWRDaGFu Z2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdAogI2VuZGlm CiB9CiAKLXZvaWQgUmVuZGVySW5saW5lOjp1cGRhdGVBbHdheXNDcmVhdGVMaW5lQm94ZXMoYm9v bCBmdWxsTGF5b3V0KQorYm9vbCBSZW5kZXJJbmxpbmU6OnNob3VsZENyZWF0ZUxpbmVCb3hlcygp IGNvbnN0CiB7Ci0gICAgLy8gT25jZSB3ZSBoYXZlIGJlZW4gdGFpbnRlZCBvbmNlLCBqdXN0IGFz c3VtZSBpdCB3aWxsIGhhcHBlbiBhZ2Fpbi4gVGhpcyB3YXkgZWZmZWN0cyBsaWtlIGhvdmVyIGhp Z2hsaWdodGluZyB0aGF0IGNoYW5nZSB0aGUKLSAgICAvLyBiYWNrZ3JvdW5kIGNvbG9yIHdpbGwg b25seSBjYXVzZSBhIGxheW91dCBvbiB0aGUgZmlyc3Qgcm9sbG92ZXIuCi0gICAgaWYgKGFsd2F5 c0NyZWF0ZUxpbmVCb3hlcygpKQotICAgICAgICByZXR1cm47Ci0KKyAgICAvLyBUZXN0IGlmIHdl IGNhbiBnZXQgYXdheSB3aXRoIGN1bGxpbmcuCiAgICAgYXV0byogcGFyZW50U3R5bGUgPSAmcGFy ZW50KCktPnN0eWxlKCk7CiAgICAgUmVuZGVySW5saW5lKiBwYXJlbnRSZW5kZXJJbmxpbmUgPSBp czxSZW5kZXJJbmxpbmU+KCpwYXJlbnQoKSkgPyBkb3duY2FzdDxSZW5kZXJJbmxpbmU+KHBhcmVu dCgpKSA6IG51bGxwdHI7CiAgICAgYXV0byBoYXNIYXJkTGluZUJyZWFrQ2hpbGRPbmx5ID0gZmly c3RDaGlsZCgpICYmIGZpcnN0Q2hpbGQoKSA9PSBsYXN0Q2hpbGQoKSAmJiBmaXJzdENoaWxkKCkt PmlzQlIoKTsKICAgICBib29sIGNoZWNrRm9udHMgPSBkb2N1bWVudCgpLmluTm9RdWlya3NNb2Rl KCk7Ci0gICAgYm9vbCBhbHdheXNDcmVhdGVMaW5lQm94ZXMgPSAocGFyZW50UmVuZGVySW5saW5l ICYmIHBhcmVudFJlbmRlcklubGluZS0+YWx3YXlzQ3JlYXRlTGluZUJveGVzKCkpCisgICAgYXV0 byBuZWVkc0xpbmVCb3hlcyA9IChwYXJlbnRSZW5kZXJJbmxpbmUgJiYgcGFyZW50UmVuZGVySW5s aW5lLT5hbHdheXNDcmVhdGVMaW5lQm94ZXMoKSkKICAgICAgICAgfHwgKHBhcmVudFJlbmRlcklu bGluZSAmJiBwYXJlbnRTdHlsZS0+dmVydGljYWxBbGlnbigpICE9IFZlcnRpY2FsQWxpZ246OkJh c2VsaW5lKQogICAgICAgICB8fCBzdHlsZSgpLnZlcnRpY2FsQWxpZ24oKSAhPSBWZXJ0aWNhbEFs aWduOjpCYXNlbGluZQogICAgICAgICB8fCBzdHlsZSgpLnRleHRFbXBoYXNpc01hcmsoKSAhPSBU ZXh0RW1waGFzaXNNYXJrOjpOb25lCkBAIC0yMjIsMjAgKzIxOCwyNyBAQCB2b2lkIFJlbmRlcklu bGluZTo6dXBkYXRlQWx3YXlzQ3JlYXRlTGluZUJveGVzKGJvb2wgZnVsbExheW91dCkKICAgICAg ICAgfHwgcGFyZW50U3R5bGUtPmxpbmVIZWlnaHQoKSAhPSBzdHlsZSgpLmxpbmVIZWlnaHQoKSkp CiAgICAgICAgIHx8IGhhc0hhcmRMaW5lQnJlYWtDaGlsZE9ubHk7CiAKLSAgICBpZiAoIWFsd2F5 c0NyZWF0ZUxpbmVCb3hlcyAmJiBjaGVja0ZvbnRzICYmIHZpZXcoKS51c2VzRmlyc3RMaW5lUnVs ZXMoKSkgeworICAgIGlmICghbmVlZHNMaW5lQm94ZXMgJiYgY2hlY2tGb250cyAmJiB2aWV3KCku dXNlc0ZpcnN0TGluZVJ1bGVzKCkpIHsKICAgICAgICAgLy8gSGF2ZSB0byBjaGVjayB0aGUgZmly c3QgbGluZSBzdHlsZSBhcyB3ZWxsLgogICAgICAgICBwYXJlbnRTdHlsZSA9ICZwYXJlbnQoKS0+ Zmlyc3RMaW5lU3R5bGUoKTsKICAgICAgICAgYXV0byYgY2hpbGRTdHlsZSA9IGZpcnN0TGluZVN0 eWxlKCk7Ci0gICAgICAgIGFsd2F5c0NyZWF0ZUxpbmVCb3hlcyA9ICFwYXJlbnRTdHlsZS0+Zm9u dENhc2NhZGUoKS5mb250TWV0cmljcygpLmhhc0lkZW50aWNhbEFzY2VudERlc2NlbnRBbmRMaW5l R2FwKGNoaWxkU3R5bGUuZm9udENhc2NhZGUoKS5mb250TWV0cmljcygpKQorICAgICAgICBuZWVk c0xpbmVCb3hlcyA9ICFwYXJlbnRTdHlsZS0+Zm9udENhc2NhZGUoKS5mb250TWV0cmljcygpLmhh c0lkZW50aWNhbEFzY2VudERlc2NlbnRBbmRMaW5lR2FwKGNoaWxkU3R5bGUuZm9udENhc2NhZGUo KS5mb250TWV0cmljcygpKQogICAgICAgICAgICAgfHwgY2hpbGRTdHlsZS52ZXJ0aWNhbEFsaWdu KCkgIT0gVmVydGljYWxBbGlnbjo6QmFzZWxpbmUKICAgICAgICAgICAgIHx8IHBhcmVudFN0eWxl LT5saW5lSGVpZ2h0KCkgIT0gY2hpbGRTdHlsZS5saW5lSGVpZ2h0KCk7CiAgICAgfQorICAgIHJl dHVybiBuZWVkc0xpbmVCb3hlczsKK30KIAotICAgIGlmIChhbHdheXNDcmVhdGVMaW5lQm94ZXMp IHsKLSAgICAgICAgaWYgKCFmdWxsTGF5b3V0KQotICAgICAgICAgICAgZGlydHlMaW5lQm94ZXMo ZmFsc2UpOwotICAgICAgICBzZXRBbHdheXNDcmVhdGVMaW5lQm94ZXMoKTsKLSAgICB9Cit2b2lk IFJlbmRlcklubGluZTo6dXBkYXRlQWx3YXlzQ3JlYXRlTGluZUJveGVzKGJvb2wgZnVsbExheW91 dCkKK3sKKyAgICAvLyBPbmNlIHdlIGhhdmUgYmVlbiB0YWludGVkIG9uY2UsIGp1c3QgYXNzdW1l IGl0IHdpbGwgaGFwcGVuIGFnYWluLiBUaGlzIHdheSBlZmZlY3RzIGxpa2UgaG92ZXIgaGlnaGxp Z2h0aW5nIHRoYXQgY2hhbmdlIHRoZQorICAgIC8vIGJhY2tncm91bmQgY29sb3Igd2lsbCBvbmx5 IGNhdXNlIGEgbGF5b3V0IG9uIHRoZSBmaXJzdCByb2xsb3Zlci4KKyAgICBpZiAoYWx3YXlzQ3Jl YXRlTGluZUJveGVzKCkgfHwgIXNob3VsZENyZWF0ZUxpbmVCb3hlcygpKQorICAgICAgICByZXR1 cm47CisKKyAgICBzZXRBbHdheXNDcmVhdGVMaW5lQm94ZXMoKTsKKyAgICBpZiAoIWZ1bGxMYXlv dXQpCisgICAgICAgIGRpcnR5TGluZUJveGVzKGZhbHNlKTsKIH0KIAogdm9pZCBSZW5kZXJJbmxp bmU6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRP ZmZzZXQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5l LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgKaW5kZXggODc4OGZm ZGVmMDQyZTU4NzBjZTFmZTU3YTNjNzhmOTA2YTQzZTE4MC4uMWZjYTM4NDVjNzBkYjY5M2I5N2Ix YzJhNTFkYWZiNzFkYWRlYTJiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlcklubGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxp bmUuaApAQCAtODQsNiArODQsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGFsd2F5c0NyZWF0ZUxp bmVCb3hlcygpIGNvbnN0IHsgcmV0dXJuIHJlbmRlcklubGluZUFsd2F5c0NyZWF0ZXNMaW5lQm94 ZXMoKTsgfQogICAgIHZvaWQgc2V0QWx3YXlzQ3JlYXRlTGluZUJveGVzKCkgeyBzZXRSZW5kZXJJ bmxpbmVBbHdheXNDcmVhdGVzTGluZUJveGVzKHRydWUpOyB9CisgICAgYm9vbCBzaG91bGRDcmVh dGVMaW5lQm94ZXMoKSBjb25zdDsKICAgICB2b2lkIHVwZGF0ZUFsd2F5c0NyZWF0ZUxpbmVCb3hl cyhib29sIGZ1bGxMYXlvdXQpOwogCiAgICAgYm9vbCBoaXRUZXN0Q3VsbGVkSW5saW5lKGNvbnN0 IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEhpdFRlc3RMb2NhdGlvbiYg bG9jYXRpb25JbkNvbnRhaW5lciwgY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcAppbmRl eCAzZmM2YTA1MzhjYzFkOGY1ZTkxMDE1ZGYyNDgxNjhmNWVjMGYxODdlLi41ZGVmMWY5YjBmMTZh ODExNGYzY2Y4YmYwZGEyYmFmOWVmMWUwNzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiSFRN TEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MU3BhbkVs ZW1lbnQuaCIKKyNpbmNsdWRlICJJbmxpbmVJdGVyYXRvci5oIgogI2luY2x1ZGUgIklubGluZVRl eHRCb3guaCIKICNpbmNsdWRlICJMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmgiCiAjaW5j bHVkZSAiTG9nZ2luZy5oIgpAQCAtMTcxLDYgKzE3Miw0MyBAQCBTdHJpbmcgcXVvdGVBbmRFc2Nh cGVOb25QcmludGFibGVzKFN0cmluZ1ZpZXcgcykKICAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5n KCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc1JlbmRlcklubGluZUVtcHR5KGNvbnN0IFJl bmRlcklubGluZSYgaW5saW5lUmVuZGVyZXIpCit7CisgICAgaWYgKGlzRW1wdHlJbmxpbmUoaW5s aW5lUmVuZGVyZXIpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGZvciAoYXV0byYgY2hp bGQgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJPYmplY3Q+KGlubGluZVJlbmRlcmVyKSkgeworICAg ICAgICBpZiAoY2hpbGQuaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpKQorICAgICAg ICAgICAgY29udGludWU7CisgICAgICAgIGF1dG8gaXNDaGlsZEVtcHR5ID0gZmFsc2U7CisgICAg ICAgIGlmIChpczxSZW5kZXJJbmxpbmU+KGNoaWxkKSkKKyAgICAgICAgICAgIGlzQ2hpbGRFbXB0 eSA9IGlzUmVuZGVySW5saW5lRW1wdHkoZG93bmNhc3Q8UmVuZGVySW5saW5lPihjaGlsZCkpOwor ICAgICAgICBlbHNlIGlmIChpczxSZW5kZXJUZXh0PihjaGlsZCkpCisgICAgICAgICAgICBpc0No aWxkRW1wdHkgPSAhZG93bmNhc3Q8UmVuZGVyVGV4dD4oY2hpbGQpLmxpbmVzQm91bmRpbmdCb3go KS5oZWlnaHQoKTsKKyAgICAgICAgaWYgKCFpc0NoaWxkRW1wdHkpCisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgfQorICAgIHJldHVybiB0cnVlOworfQorCitzdGF0aWMgaW5saW5lIGJv b2wgaGFzTm9uRW1wdHlTaWJsaW5nKGNvbnN0IFJlbmRlcklubGluZSYgaW5saW5lUmVuZGVyZXIp Cit7CisgICAgYXV0byogcGFyZW50ID0gaW5saW5lUmVuZGVyZXIucGFyZW50KCk7CisgICAgaWYg KCFwYXJlbnQpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGZvciAoYXV0byYgc2libGlu ZyA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlck9iamVjdD4oKnBhcmVudCkpIHsKKyAgICAgICAgaWYg KCZzaWJsaW5nID09ICZpbmxpbmVSZW5kZXJlciB8fCBzaWJsaW5nLmlzRmxvYXRpbmdPck91dE9m Rmxvd1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBpZiAoIWlz PFJlbmRlcklubGluZT4oc2libGluZykpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgYXV0byYgc2libGluZ1JlbmRlcmVySW5saW5lID0gZG93bmNhc3Q8UmVuZGVySW5saW5lPihz aWJsaW5nKTsKKyAgICAgICAgaWYgKHNpYmxpbmdSZW5kZXJlcklubGluZS5zaG91bGRDcmVhdGVM aW5lQm94ZXMoKSB8fCAhaXNSZW5kZXJJbmxpbmVFbXB0eShzaWJsaW5nUmVuZGVyZXJJbmxpbmUp KQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30K Kwogdm9pZCBSZW5kZXJUcmVlQXNUZXh0Ojp3cml0ZVJlbmRlck9iamVjdChUZXh0U3RyZWFtJiB0 cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvLCBPcHRpb25TZXQ8UmVuZGVyQXNUZXh0RmxhZz4gYmVo YXZpb3IpCiB7CiAgICAgdHMgPDwgby5yZW5kZXJOYW1lKCk7CkBAIC0yMjcsMjEgKzI2NSwxMSBA QCB2b2lkIFJlbmRlclRyZWVBc1RleHQ6OndyaXRlUmVuZGVyT2JqZWN0KFRleHRTdHJlYW0mIHRz LCBjb25zdCBSZW5kZXJPYmplY3QmIG8sCiAgICAgICAgICAgICBpZiAoaW5saW5lRmxvdy5tYXJn aW5TdGFydCgpIHx8IGlubGluZUZsb3cubWFyZ2luRW5kKCkpCiAgICAgICAgICAgICAgICAgcmV0 dXJuIGhlaWdodDsKICAgICAgICAgICAgIC8vIFRoaXMgaXMgbW9zdGx5IHByZS9wb3N0IGNvbnRp bnVhdGlvbiBjb250ZW50LiBBbHNvIHNlZSB3ZWJraXQub3JnL2IvMjIwNzM1Ci0gICAgICAgICAg ICBpZiAoaW5saW5lRmxvdy5wcmV2aW91c1NpYmxpbmcoKSkKLSAgICAgICAgICAgICAgICByZXR1 cm4gaGVpZ2h0OwotICAgICAgICAgICAgaWYgKGlubGluZUZsb3cubmV4dFNpYmxpbmcoKSAmJiAh aW5saW5lRmxvdy5kb2N1bWVudCgpLmluUXVpcmtzTW9kZSgpKQorICAgICAgICAgICAgaWYgKGhh c05vbkVtcHR5U2libGluZyhpbmxpbmVGbG93KSkKICAgICAgICAgICAgICAgICByZXR1cm4gaGVp Z2h0OwotICAgICAgICAgICAgaWYgKGF1dG8qIGZpcnN0Q2hpbGQgPSBpbmxpbmVGbG93LmZpcnN0 Q2hpbGQoKSkgewotICAgICAgICAgICAgICAgIGlmIChmaXJzdENoaWxkICE9IGlubGluZUZsb3cu bGFzdENoaWxkKCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBoZWlnaHQ7Ci0gICAgICAg ICAgICAgICAgYXV0byBjaGlsZElzRW1wdHkgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBpZiAo aXM8UmVuZGVyVGV4dD4oKmZpcnN0Q2hpbGQpKQotICAgICAgICAgICAgICAgICAgICBjaGlsZElz RW1wdHkgPSAhZG93bmNhc3Q8UmVuZGVyVGV4dD4oKmZpcnN0Q2hpbGQpLmxpbmVzQm91bmRpbmdC b3goKS5oZWlnaHQoKTsKLSAgICAgICAgICAgICAgICBlbHNlIGlmIChpczxSZW5kZXJJbmxpbmU+ KCpmaXJzdENoaWxkKSkKLSAgICAgICAgICAgICAgICAgICAgY2hpbGRJc0VtcHR5ID0gIWRvd25j YXN0PFJlbmRlcklubGluZT4oKmZpcnN0Q2hpbGQpLmxpbmVzQm91bmRpbmdCb3goKS5oZWlnaHQo KTsKLSAgICAgICAgICAgICAgICByZXR1cm4gY2hpbGRJc0VtcHR5ID8gMCA6IGhlaWdodDsKLSAg ICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICAgaWYgKGlzUmVu ZGVySW5saW5lRW1wdHkoaW5saW5lRmxvdykpCisgICAgICAgICAgICAgICAgcmV0dXJuIDA7Cisg ICAgICAgICAgICByZXR1cm4gaGVpZ2h0OwogICAgICAgICB9OwogICAgICAgICByID0gSW50UmVj dCgwLCAwLCB3aWR0aCwgaW5saW5lSGVpZ2h0KCkpOwogICAgICAgICBhZGp1c3RGb3JUYWJsZUNl bGxzID0gZmFsc2U7Cg==