223518 2021-03-19 09:21:35 -0700 [macOS] Context menu should account for image overlay content 2021-03-22 12:06:09 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin cdumez changseok esprehn+autocc ews-watchlist gyuyoung.kim hi megan_gardner mifenton thorton webkit-bug-importer oldest_to_newest 1741733 0 wenson_hsieh 2021-03-19 09:21:35 -0700 <rdar://problem/75505210> 1741865 1 423767 wenson_hsieh 2021-03-19 13:32:50 -0700 Created attachment 423767 Patch 1741869 2 423767 hi 2021-03-19 13:46:49 -0700 Comment on attachment 423767 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423767&action=review r=me > Source/WebCore/html/HTMLElement.cpp:1240 > + if (auto host = node.shadowHost(); is<HTMLElement>(host) && downcast<HTMLElement>(*host).hasImageOverlay()) > + return makeRefPtr(downcast<HTMLElement>(*host)); NIT: Can we avoid the double dereference-`downcast`? 1741875 3 423767 wenson_hsieh 2021-03-19 13:53:16 -0700 Comment on attachment 423767 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423767&action=review >> Source/WebCore/html/HTMLElement.cpp:1240 >> + return makeRefPtr(downcast<HTMLElement>(*host)); > > NIT: Can we avoid the double dereference-`downcast`? Yes, fixed! 1741913 4 423783 wenson_hsieh 2021-03-19 14:54:12 -0700 Created attachment 423783 Patch 1742356 5 ews-feeder 2021-03-22 12:06:07 -0700 Committed r274772: <https://commits.webkit.org/r274772> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423783. 423767 2021-03-19 13:32:50 -0700 2021-03-19 14:54:10 -0700 Patch bug-223518-20210319133249.patch text/plain 10669 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTU5NGYyNzA5NmExZmRl YWE2YmZmNjM5NTg3N2FjYWI5ZmJlMGY3Yy4uODA0MDZmOWEzYWE1ZmY5N2Y4NzFlY2M0Njk4N2U4 MjNmMTBmODY4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDIxLTAzLTE5ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gQ29u dGV4dCBtZW51IHNob3VsZCBhY2NvdW50IGZvciBpbWFnZSBvdmVybGF5IGNvbnRlbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUxOAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNzU1MDUyMTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTWFrZSBzb21lIGFkanVzdG1lbnRzIHRvIGFsbG93IGNvbnRl eHQgbWVudSBpdGVtcyBmb3IgdGV4dCBzZWxlY3Rpb24gdG8gc2hvdyB1cCB3aGVuIHJpZ2h0IGNs aWNraW5nIG9uIHRleHQgaW4KKyAgICAgICAgYW4gaW1hZ2Ugb3ZlcmxheS4KKworICAgICAgICBU ZXN0OiBmYXN0L2ltYWdlcy9pbWFnZS1leHRyYWN0aW9uL21hYy9jb3B5LWltYWdlLW92ZXJsYXkt dGV4dC13aXRoLWNvbnRleHQtbWVudS5odG1sCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnBlcmZvcm1DdXRPckNvcHkpOgorCisgICAg ICAgIEFkanVzdCB0aGlzIGxvZ2ljIHNvIHRoYXQgd2Ugb25seSBhdHRlbXB0IHRvIHdyaXRlIHBs YWluIHRleHQgdG8gdGhlIHN5c3RlbSBwYXN0ZWJvYXJkIHdoZW4gY29weWluZyB0ZXh0IGluc2lk ZQorICAgICAgICBpbWFnZSBvdmVybGF5cyAodGhpcyBtYXRjaGVzIHRoZSBiZWhhdmlvciBvZiBj b3B5aW5nIHNlbGVjdGVkIHRleHQgaW4gYHRleHRhcmVhYCBlbGVtZW50cyBhbmQgdGV4dCBmaWVs ZHMpLgorCisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MRWxlbWVudDo6aGFzSW1hZ2VPdmVybGF5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OmltYWdlT3ZlcmxheUhvc3QpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVsZW1lbnQ6OmlzSW5z aWRlSW1hZ2VPdmVybGF5KToKKworICAgICAgICBBZGQgYSBoZWxwZXIgZnVuY3Rpb24gdG8gZGV0 ZXJtaW5lIHdoZXRoZXIgb3Igbm90IGEgZ2l2ZW4gcmFuZ2UgaW4gdGhlIERPTSBpcyBpbnNpZGUg YW4gaW1hZ2Ugb3ZlcmxheSBzaGFkb3cKKyAgICAgICAgcm9vdC4gVG8gYXZvaWQgY29kZSBkdXBs aWNhdGlvbiwgcHVsbCBvdXQgc29tZSBsb2dpYyB0byBncmFiIHRoZSBpbWFnZSBvdmVybGF5J3Mg ZWxlbWVudCBob3N0IChpZiBpdCBleGlzdHMpIG91dAorICAgICAgICBpbnRvIGEgc2VwYXJhdGUg c3RhdGljIGhlbHBlciBmdW5jdGlvbiAoYGltYWdlT3ZlcmxheUhvc3RgKSwgYW5kIHVzZSBpdCBo ZXJlIGFuZCBhbHNvIGluIGBpc0ltYWdlT3ZlcmxheVRleHRgLgorCisgICAgICAgIChXZWJDb3Jl OjpIVE1MRWxlbWVudDo6aXNJbWFnZU92ZXJsYXlUZXh0KToKKworICAgICAgICBNb3ZlIHRoZSBV QSBzaGFkb3cgcm9vdCBjaGVjayBpbnRvIGBIVE1MRWxlbWVudDo6aGFzSW1hZ2VPdmVybGF5YCwg c28gdGhhdCBgaGFzSW1hZ2VPdmVybGF5YCBjYW4gYmUgaW52b2tlZCBmb3IKKyAgICAgICAgZWxl bWVudHMgd2l0aCBub24tVUEgc2hhZG93IHJvb3RzIHdpdGhvdXQgaGl0dGluZyBhbiBhc3NlcnRp b24uCisKKyAgICAgICAgKiBodG1sL0hUTUxFbGVtZW50Lmg6CisgICAgICAgICogcGFnZS9Db250 ZXh0TWVudUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDb250 cm9sbGVyOjpwb3B1bGF0ZSk6CisKKyAgICAgICAgUHVsbCBsb2dpYyB0aGF0IGRldGVybWluZXMg d2hldGhlciBvciBub3Qgd2Ugc2hvdWxkIHNob3cgdGV4dC1zZWxlY3Rpb24tcmVsYXRlZCBjb250 ZXh0IG1lbnUgaXRlbXMgb3V0IGludG8gYQorICAgICAgICBzZXBhcmF0ZSBsYW1iZGEgZnVuY3Rp b24sIHNvIHRoYXQgaXQncyBlYXNpZXIgdG8gdGFrZSBhZHZhbnRhZ2Ugb2YgZWFybHkgcmV0dXJu czsgdGhlbiwgaW4gdGhlIGNhc2Ugd2hlcmUgd2UKKyAgICAgICAgaGF2ZSBhbiBpbWFnZSBVUkws IGFkZGl0aW9uYWxseSBzaG93IHNlbGVjdGVkIHRleHQgb3B0aW9ucyBpZiB0aGUgc2VsZWN0aW9u IGlzIGluc2lkZSB0aGUgaW1hZ2Ugb3ZlcmxheS4KKwogMjAyMS0wMy0xOSAgSmVyIE5vYmxlICA8 amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBNYW55IG1lZGlhL21lZGlhLWZyYWdtZW50 cy8gdGVzdHMgYXJlIGNyYXNoaW5nIGR1ZSB0byBvdGhlciB0ZXN0cyB0aGF0IHJ1biBiZWZvcmUg dGhlbS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAppbmRleCA2MjQyNmVmZTgyNzA0NjNjNzIz NmM5ZDljYTM2NTJkOWZmYWZjNThlLi40MTZkODQ2Yjc0MDk4NzFmNmMzMmY1YWQ3ZDJiNDRkNjFm NTMyYTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCkBAIC0xNDExLDcgKzE0MTEsNyBA QCB2b2lkIEVkaXRvcjo6cGVyZm9ybUN1dE9yQ29weShFZGl0b3JBY3Rpb25TcGVjaWZpZXIgYWN0 aW9uKQogICAgICAgICB1cGRhdGVNYXJrZXJzRm9yV29yZHNBZmZlY3RlZEJ5RWRpdGluZyh0cnVl KTsKICAgICB9CiAKLSAgICBpZiAoZW5jbG9zaW5nVGV4dEZvcm1Db250cm9sKG1fZG9jdW1lbnQu c2VsZWN0aW9uKCkuc2VsZWN0aW9uKCkuc3RhcnQoKSkpCisgICAgaWYgKGVuY2xvc2luZ1RleHRG b3JtQ29udHJvbChtX2RvY3VtZW50LnNlbGVjdGlvbigpLnNlbGVjdGlvbigpLnN0YXJ0KCkpIHx8 IChzZWxlY3Rpb24gJiYgSFRNTEVsZW1lbnQ6OmlzSW5zaWRlSW1hZ2VPdmVybGF5KCpzZWxlY3Rp b24pKSkKICAgICAgICAgUGFzdGVib2FyZDo6Y3JlYXRlRm9yQ29weUFuZFBhc3RlKFBhZ2VQYXN0 ZWJvYXJkQ29udGV4dDo6Y3JlYXRlKG1fZG9jdW1lbnQucGFnZUlEKCkpKS0+d3JpdGVQbGFpblRl eHQoc2VsZWN0ZWRUZXh0Rm9yRGF0YVRyYW5zZmVyKCksIGNhblNtYXJ0Q29weU9yRGVsZXRlKCkg PyBQYXN0ZWJvYXJkOjpDYW5TbWFydFJlcGxhY2UgOiBQYXN0ZWJvYXJkOjpDYW5ub3RTbWFydFJl cGxhY2UpOwogICAgIGVsc2UgewogICAgICAgICBIVE1MSW1hZ2VFbGVtZW50KiBpbWFnZUVsZW1l bnQgPSBudWxscHRyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcAppbmRleCAxNWRiNDNj MWQzNTRjNTM5M2M2NzNhMjM0ZmNhMDQxNmU2N2NmOWU5Li5lNjc2MTUxYmE4MzU5OWQ3MjcwY2Nl MWFhMDVmOWVjZDk1Yzk4OWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxF bGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcApAQCAt MTIyNywyNiArMTIyNyw0MyBAQCBib29sIEhUTUxFbGVtZW50OjpzaG91bGRFeHRlbmRTZWxlY3Rp b25Ub1RhcmdldE5vZGUoY29uc3QgTm9kZSYgdGFyZ2V0Tm9kZSwgY29ucwogCiBib29sIEhUTUxF bGVtZW50OjpoYXNJbWFnZU92ZXJsYXkoKSBjb25zdAogewotICAgIGF1dG8gc2hhZG93Um9vdCA9 IHVzZXJBZ2VudFNoYWRvd1Jvb3QoKTsKLSAgICBpZiAoTElLRUxZKCFzaGFkb3dSb290KSkKKyAg ICBhdXRvIHNoYWRvd1Jvb3QgPSB0aGlzLT5zaGFkb3dSb290KCk7CisgICAgaWYgKExJS0VMWSgh c2hhZG93Um9vdCB8fCBzaGFkb3dSb290LT5tb2RlKCkgIT0gU2hhZG93Um9vdE1vZGU6OlVzZXJB Z2VudCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiBzaGFkb3dSb290LT5o YXNFbGVtZW50V2l0aElkKCppbWFnZU92ZXJsYXlFbGVtZW50SWRlbnRpZmllcigpLmltcGwoKSk7 CiB9CiAKLWJvb2wgSFRNTEVsZW1lbnQ6OmlzSW1hZ2VPdmVybGF5VGV4dChjb25zdCBOb2RlJiBu b2RlKQorc3RhdGljIFJlZlB0cjxIVE1MRWxlbWVudD4gaW1hZ2VPdmVybGF5SG9zdChjb25zdCBO b2RlJiBub2RlKQoreworICAgIGlmIChhdXRvIGhvc3QgPSBub2RlLnNoYWRvd0hvc3QoKTsgaXM8 SFRNTEVsZW1lbnQ+KGhvc3QpICYmIGRvd25jYXN0PEhUTUxFbGVtZW50PigqaG9zdCkuaGFzSW1h Z2VPdmVybGF5KCkpCisgICAgICAgIHJldHVybiBtYWtlUmVmUHRyKGRvd25jYXN0PEhUTUxFbGVt ZW50PigqaG9zdCkpOworCisgICAgcmV0dXJuIG51bGxwdHI7Cit9CisKK2Jvb2wgSFRNTEVsZW1l bnQ6OmlzSW5zaWRlSW1hZ2VPdmVybGF5KGNvbnN0IFNpbXBsZVJhbmdlJiByYW5nZSkKIHsKLSAg ICBhdXRvIHNoYWRvd0hvc3QgPSBub2RlLnNoYWRvd0hvc3QoKTsKLSAgICBpZiAoIXNoYWRvd0hv c3QpCisgICAgYXV0byBjb21tb25BbmNlc3RvciA9IG1ha2VSZWZQdHIoY29tbW9uSW5jbHVzaXZl QW5jZXN0b3I8Q29tcG9zZWRUcmVlPihyYW5nZSkpOworICAgIGlmICghY29tbW9uQW5jZXN0b3Ip CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGF1dG8gc2hhZG93Um9vdCA9IHNoYWRvd0hv c3QtPnNoYWRvd1Jvb3QoKTsKLSAgICBpZiAoIXNoYWRvd1Jvb3QgfHwgc2hhZG93Um9vdC0+bW9k ZSgpICE9IFNoYWRvd1Jvb3RNb2RlOjpVc2VyQWdlbnQgfHwgc2hhZG93Um9vdCAhPSBub2RlLmNv bnRhaW5pbmdTaGFkb3dSb290KCkpCisgICAgYXV0byBob3N0ID0gaW1hZ2VPdmVybGF5SG9zdCgq Y29tbW9uQW5jZXN0b3IpOworICAgIGlmICghaG9zdCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgcmV0dXJuIGhvc3QtPnVzZXJBZ2VudFNoYWRvd1Jvb3QoKS0+Y29udGFpbnMoKmNvbW1v bkFuY2VzdG9yKTsKK30KKworYm9vbCBIVE1MRWxlbWVudDo6aXNJbWFnZU92ZXJsYXlUZXh0KGNv bnN0IE5vZGUmIG5vZGUpCit7CisgICAgYXV0byBob3N0ID0gaW1hZ2VPdmVybGF5SG9zdChub2Rl KTsKKyAgICBpZiAoIWhvc3QpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGZvciAoYXV0 byYgY2hpbGQgOiBjaGlsZHJlbk9mVHlwZTxIVE1MRGl2RWxlbWVudD4oKnNoYWRvd1Jvb3QpKSB7 CisgICAgZm9yIChhdXRvJiBjaGlsZCA6IGNoaWxkcmVuT2ZUeXBlPEhUTUxEaXZFbGVtZW50Pigq aG9zdC0+dXNlckFnZW50U2hhZG93Um9vdCgpKSkgewogICAgICAgICBpZiAoY2hpbGQuZ2V0SWRB dHRyaWJ1dGUoKSA9PSBpbWFnZU92ZXJsYXlFbGVtZW50SWRlbnRpZmllcigpKQotICAgICAgICAg ICAgcmV0dXJuIG5vZGUuaXNEZXNjZW5kYW50T2YoJmNoaWxkKTsKKyAgICAgICAgICAgIHJldHVy biBub2RlLmlzRGVzY2VuZGFudE9mKGNoaWxkKTsKICAgICB9CiAKICAgICByZXR1cm4gZmFsc2U7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmgKaW5kZXggYmQ5MDI0NmNiYzVlYzEyMTVkZDk4OWNk OGE1NjNlNTRjY2NiYzdmNS4uZmMzZDU2NjAxM2E0NTVjYTZjZjU4MGM3ZmUxYmQ4YTdhY2FmMmM2 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuaApAQCAtMzUsNiArMzUsNyBAQCBjbGFzcyBG b3JtQXNzb2NpYXRlZEVsZW1lbnQ7CiBjbGFzcyBGb3JtTmFtZWRJdGVtOwogY2xhc3MgSFRNTEZv cm1FbGVtZW50OwogY2xhc3MgVmlzaWJsZVNlbGVjdGlvbjsKK3N0cnVjdCBTaW1wbGVSYW5nZTsK IAogI2lmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQogc3RydWN0IEltYWdlRXh0cmFjdGlvblJl c3VsdDsKQEAgLTEyOCw2ICsxMjksNyBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9SVCBz dGF0aWMgYm9vbCBzaG91bGRFeHRlbmRTZWxlY3Rpb25Ub1RhcmdldE5vZGUoY29uc3QgTm9kZSYg dGFyZ2V0Tm9kZSwgY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYgc2VsZWN0aW9uQmVmb3JlVXBkYXRl KTsKICAgICBib29sIGhhc0ltYWdlT3ZlcmxheSgpIGNvbnN0OworICAgIHN0YXRpYyBib29sIGlz SW5zaWRlSW1hZ2VPdmVybGF5KGNvbnN0IFNpbXBsZVJhbmdlJik7CiAgICAgV0VCQ09SRV9FWFBP UlQgc3RhdGljIGJvb2wgaXNJbWFnZU92ZXJsYXlUZXh0KGNvbnN0IE5vZGUmKTsKIAogI2lmIEVO QUJMRShJTUFHRV9FWFRSQUNUSU9OKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9D b250ZXh0TWVudUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVu dUNvbnRyb2xsZXIuY3BwCmluZGV4IDc4MzE5MzEzZjRjYjZhNGUxYWViOThmYzhkZWQ0ODg1MzRm YTBmOTMuLjkzZTYyZmQwMGI2ZGZkMDZkM2FlZDBkZTA4YjE3MDAzMDNlOGFmNWEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAKQEAgLTkxNCw3ICs5 MTQsMjUgQEAgdm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRlKCkKICAgICAgICAg ICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIGlmIChpbWFnZVVSTC5pc0VtcHR5KCkgJiYgbGlu a1VSTC5pc0VtcHR5KCkgJiYgbWVkaWFVUkwuaXNFbXB0eSgpKSB7CisgICAgICAgIGJvb2wgc2hv dWxkU2hvd0l0ZW1zRm9yTm9uRWRpdGFibGVUZXh0ID0gKFsmXSB7CisgICAgICAgICAgICBpZiAo IWxpbmtVUkwuaXNFbXB0eSgpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg ICAgICAgICAgaWYgKCFtZWRpYVVSTC5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworCisgICAgICAgICAgICBpZiAoIWltYWdlVVJMLmlzRW1wdHkoKSkgeworICAgICAg ICAgICAgICAgIGF1dG8gc2VsZWN0ZWRSYW5nZSA9IGZyYW1lLT5zZWxlY3Rpb24oKS5zZWxlY3Rp b24oKS5yYW5nZSgpOworICAgICAgICAgICAgICAgIHJldHVybiBzZWxlY3RlZFJhbmdlICYmIEhU TUxFbGVtZW50Ojppc0luc2lkZUltYWdlT3ZlcmxheSgqc2VsZWN0ZWRSYW5nZSk7CisgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9KSgpOworCisgICAg ICAgIGlmIChzaG91bGRTaG93SXRlbXNGb3JOb25FZGl0YWJsZVRleHQpIHsKKyAgICAgICAgICAg IGlmICghaW1hZ2VVUkwuaXNFbXB0eSgpKQorICAgICAgICAgICAgICAgIGFwcGVuZEl0ZW0oKnNl cGFyYXRvckl0ZW0oKSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CisKICAgICAgICAgICAgIGlmICht X2NvbnRleHQuaGl0VGVzdFJlc3VsdCgpLmlzU2VsZWN0ZWQoKSkgewogICAgICAgICAgICAgICAg IGlmICghc2VsZWN0ZWRTdHJpbmcuaXNFbXB0eSgpKSB7CiAjaWYgUExBVEZPUk0oQ09DT0EpCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggZTE4MDJlOTY4YmYyNjk1YjhmNzJmOWQ2NjRhZDIzYzJlZGU0OWM3OS4uODhiODVhY2Jm YzNjYmFmM2FkN2Q4YmVhOWU4YmZhZjc1ZTE2YzM5NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDIxLTAzLTE5ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAg ICAgIFttYWNPU10gQ29udGV4dCBtZW51IHNob3VsZCBhY2NvdW50IGZvciBpbWFnZSBvdmVybGF5 IGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyMzUxOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzU1MDUyMTA+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbGF5b3V0IHRlc3QgdG8g ZXhlcmNpc2UgY29weWluZyB2aWEgdGhlIGNvbnRleHQgbWVudS4KKworICAgICAgICAqIGZhc3Qv aW1hZ2VzL2ltYWdlLWV4dHJhY3Rpb24vbWFjL2NvcHktaW1hZ2Utb3ZlcmxheS10ZXh0LXdpdGgt Y29udGV4dC1tZW51LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9pbWFnZXMv aW1hZ2UtZXh0cmFjdGlvbi9tYWMvY29weS1pbWFnZS1vdmVybGF5LXRleHQtd2l0aC1jb250ZXh0 LW1lbnUuaHRtbDogQWRkZWQuCisKIDIwMjEtMDMtMTkgIEplciBOb2JsZSAgPGplci5ub2JsZUBh cHBsZS5jb20+CiAKICAgICAgICAgTWFueSBtZWRpYS9tZWRpYS1mcmFnbWVudHMvIHRlc3RzIGFy ZSBjcmFzaGluZyBkdWUgdG8gb3RoZXIgdGVzdHMgdGhhdCBydW4gYmVmb3JlIHRoZW0uCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy9pbWFnZS1leHRyYWN0aW9uL21hYy9jb3B5 LWltYWdlLW92ZXJsYXktdGV4dC13aXRoLWNvbnRleHQtbWVudS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9mYXN0L2ltYWdlcy9pbWFnZS1leHRyYWN0aW9uL21hYy9jb3B5LWltYWdlLW92ZXJs YXktdGV4dC13aXRoLWNvbnRleHQtbWVudS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTAyMzRl YzFhYTQ3MDkzMDI3YWQ1ZWJiNjYwMDc2YmY2ZDkxODg3OAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2ltYWdlLWV4dHJhY3Rpb24vbWFjL2NvcHktaW1hZ2Utb3Zl cmxheS10ZXh0LXdpdGgtY29udGV4dC1tZW51LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAK K1BBU1MgZWRpdG9yLnRleHRDb250ZW50IGlzICJmb29iYXIiCitQQVNTIHN1Y2Nlc3NmdWxseVBh cnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9pbWFnZXMvaW1hZ2UtZXh0cmFjdGlvbi9tYWMvY29weS1pbWFnZS1vdmVybGF5LXRleHQt d2l0aC1jb250ZXh0LW1lbnUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2ltYWdlLWV4 dHJhY3Rpb24vbWFjL2NvcHktaW1hZ2Utb3ZlcmxheS10ZXh0LXdpdGgtY29udGV4dC1tZW51Lmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uNDA1MjllYzQ1OGYxNTQwODIwY2YzNmM1ZWNkMDk0YmU1NjYyNjMzYgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2ltYWdlLWV4dHJhY3Rp b24vbWFjL2NvcHktaW1hZ2Utb3ZlcmxheS10ZXh0LXdpdGgtY29udGV4dC1tZW51Lmh0bWwKQEAg LTAsMCArMSw0NyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBz cmM9Ii4uLy4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzdHlsZT4K K2ltZyB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogMDsKKyAgICBsZWZ0OiAw OworfQorCitkaXZbY29udGVudGVkaXRhYmxlXSB7CisgICAgYm9yZGVyOiAxcHggc29saWQgdG9t YXRvOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGltZyBzcmM9Ii4uLy4uL3Jlc291 cmNlcy9ncmVlbi00MDB4NDAwLnBuZyI+PC9pbWc+Cis8ZGl2IGNvbnRlbnRlZGl0YWJsZT48L2Rp dj4KKzxzY3JpcHQ+CithZGRFdmVudExpc3RlbmVyKCJsb2FkIiwgKCkgPT4geworICAgIGxldCBp bWFnZSA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoImltZyIpOworICAgIGludGVybmFscy5pbnN0 YWxsSW1hZ2VPdmVybGF5KGltYWdlLCBbeworICAgICAgICB0ZXh0IDogImZvb2JhciIsCisgICAg ICAgIHRvcExlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLCAwKSwKKyAgICAgICAgdG9wUmln aHQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgxLCAwKSwKKyAgICAgICAgYm90dG9tUmlnaHQgOiBu ZXcgRE9NUG9pbnRSZWFkT25seSgxLCAwLjUpLAorICAgICAgICBib3R0b21MZWZ0IDogbmV3IERP TVBvaW50UmVhZE9ubHkoMCwgMC41KSwKKyAgICB9XSk7CisKKyAgICBldmVudFNlbmRlci5tb3Vz ZU1vdmVUbyg1MCwgMTUwKTsKKworICAgIGZvciAobGV0IGl0ZW0gb2YgZXZlbnRTZW5kZXIuY29u dGV4dENsaWNrKCkpIHsKKyAgICAgICAgaWYgKGl0ZW0udGl0bGUgPT09ICJDb3B5IikKKyAgICAg ICAgICAgIGl0ZW0uY2xpY2soKTsKKyAgICB9CisKKyAgICBlZGl0b3IgPSBkb2N1bWVudC5xdWVy eVNlbGVjdG9yKCJkaXZbY29udGVudGVkaXRhYmxlXSIpOworICAgIGVkaXRvci5mb2N1cygpOwor ICAgIGRvY3VtZW50LmV4ZWNDb21tYW5kKCJQYXN0ZSIpOworCisgICAgc2hvdWxkQmVFcXVhbFRv U3RyaW5nKCJlZGl0b3IudGV4dENvbnRlbnQiLCAiZm9vYmFyIik7CisgICAgZWRpdG9yLnJlbW92 ZSgpOworfSk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVu ZCBvZiBmaWxlCg== 423783 2021-03-19 14:54:12 -0700 2021-03-22 12:06:08 -0700 Patch bug-223518-20210319145412.patch text/plain 10689 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTU5NGYyNzA5NmExZmRl YWE2YmZmNjM5NTg3N2FjYWI5ZmJlMGY3Yy4uMjFmZWE4ZmMwZmFiNGMzODZiNDhhZjA1ODNmMDVj ZWFmMzA1M2YxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDIxLTAzLTE5ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gQ29u dGV4dCBtZW51IHNob3VsZCBhY2NvdW50IGZvciBpbWFnZSBvdmVybGF5IGNvbnRlbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUxOAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNzU1MDUyMTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4g Um91c3NvLgorCisgICAgICAgIE1ha2Ugc29tZSBhZGp1c3RtZW50cyB0byBhbGxvdyBjb250ZXh0 IG1lbnUgaXRlbXMgZm9yIHRleHQgc2VsZWN0aW9uIHRvIHNob3cgdXAgd2hlbiByaWdodCBjbGlj a2luZyBvbiB0ZXh0IGluCisgICAgICAgIGFuIGltYWdlIG92ZXJsYXkuCisKKyAgICAgICAgVGVz dDogZmFzdC9pbWFnZXMvaW1hZ2UtZXh0cmFjdGlvbi9tYWMvY29weS1pbWFnZS1vdmVybGF5LXRl eHQtd2l0aC1jb250ZXh0LW1lbnUuaHRtbAorCisgICAgICAgICogZWRpdGluZy9FZGl0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpwZXJmb3JtQ3V0T3JDb3B5KToKKworICAgICAg ICBBZGp1c3QgdGhpcyBsb2dpYyBzbyB0aGF0IHdlIG9ubHkgYXR0ZW1wdCB0byB3cml0ZSBwbGFp biB0ZXh0IHRvIHRoZSBzeXN0ZW0gcGFzdGVib2FyZCB3aGVuIGNvcHlpbmcgdGV4dCBpbnNpZGUK KyAgICAgICAgaW1hZ2Ugb3ZlcmxheXMgKHRoaXMgbWF0Y2hlcyB0aGUgYmVoYXZpb3Igb2YgY29w eWluZyBzZWxlY3RlZCB0ZXh0IGluIGB0ZXh0YXJlYWAgZWxlbWVudHMgYW5kIHRleHQgZmllbGRz KS4KKworICAgICAgICAqIGh0bWwvSFRNTEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTEVsZW1lbnQ6Omhhc0ltYWdlT3ZlcmxheSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpp bWFnZU92ZXJsYXlIb3N0KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50Ojppc0luc2lk ZUltYWdlT3ZlcmxheSk6CisKKyAgICAgICAgQWRkIGEgaGVscGVyIGZ1bmN0aW9uIHRvIGRldGVy bWluZSB3aGV0aGVyIG9yIG5vdCBhIGdpdmVuIHJhbmdlIGluIHRoZSBET00gaXMgaW5zaWRlIGFu IGltYWdlIG92ZXJsYXkgc2hhZG93CisgICAgICAgIHJvb3QuIFRvIGF2b2lkIGNvZGUgZHVwbGlj YXRpb24sIHB1bGwgb3V0IHNvbWUgbG9naWMgdG8gZ3JhYiB0aGUgaW1hZ2Ugb3ZlcmxheSdzIGVs ZW1lbnQgaG9zdCAoaWYgaXQgZXhpc3RzKSBvdXQKKyAgICAgICAgaW50byBhIHNlcGFyYXRlIHN0 YXRpYyBoZWxwZXIgZnVuY3Rpb24gKGBpbWFnZU92ZXJsYXlIb3N0YCksIGFuZCB1c2UgaXQgaGVy ZSBhbmQgYWxzbyBpbiBgaXNJbWFnZU92ZXJsYXlUZXh0YC4KKworICAgICAgICAoV2ViQ29yZTo6 SFRNTEVsZW1lbnQ6OmlzSW1hZ2VPdmVybGF5VGV4dCk6CisKKyAgICAgICAgTW92ZSB0aGUgVUEg c2hhZG93IHJvb3QgY2hlY2sgaW50byBgSFRNTEVsZW1lbnQ6Omhhc0ltYWdlT3ZlcmxheWAsIHNv IHRoYXQgYGhhc0ltYWdlT3ZlcmxheWAgY2FuIGJlIGludm9rZWQgZm9yCisgICAgICAgIGVsZW1l bnRzIHdpdGggbm9uLVVBIHNoYWRvdyByb290cyB3aXRob3V0IGhpdHRpbmcgYW4gYXNzZXJ0aW9u LgorCisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudC5oOgorICAgICAgICAqIHBhZ2UvQ29udGV4 dE1lbnVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51Q29udHJv bGxlcjo6cG9wdWxhdGUpOgorCisgICAgICAgIFB1bGwgbG9naWMgdGhhdCBkZXRlcm1pbmVzIHdo ZXRoZXIgb3Igbm90IHdlIHNob3VsZCBzaG93IHRleHQtc2VsZWN0aW9uLXJlbGF0ZWQgY29udGV4 dCBtZW51IGl0ZW1zIG91dCBpbnRvIGEKKyAgICAgICAgc2VwYXJhdGUgbGFtYmRhIGZ1bmN0aW9u LCBzbyB0aGF0IGl0J3MgZWFzaWVyIHRvIHRha2UgYWR2YW50YWdlIG9mIGVhcmx5IHJldHVybnM7 IHRoZW4sIGluIHRoZSBjYXNlIHdoZXJlIHdlCisgICAgICAgIGhhdmUgYW4gaW1hZ2UgVVJMLCBh ZGRpdGlvbmFsbHkgc2hvdyBzZWxlY3RlZCB0ZXh0IG9wdGlvbnMgaWYgdGhlIHNlbGVjdGlvbiBp cyBpbnNpZGUgdGhlIGltYWdlIG92ZXJsYXkuCisKIDIwMjEtMDMtMTkgIEplciBOb2JsZSAgPGpl ci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgTWFueSBtZWRpYS9tZWRpYS1mcmFnbWVudHMv IHRlc3RzIGFyZSBjcmFzaGluZyBkdWUgdG8gb3RoZXIgdGVzdHMgdGhhdCBydW4gYmVmb3JlIHRo ZW0uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKaW5kZXggNjI0MjZlZmU4MjcwNDYzYzcyMzZj OWQ5Y2EzNjUyZDlmZmFmYzU4ZS4uNDE2ZDg0NmI3NDA5ODcxZjZjMzJmNWFkN2QyYjQ0ZDYxZjUz MmEwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcApAQCAtMTQxMSw3ICsxNDExLDcgQEAg dm9pZCBFZGl0b3I6OnBlcmZvcm1DdXRPckNvcHkoRWRpdG9yQWN0aW9uU3BlY2lmaWVyIGFjdGlv bikKICAgICAgICAgdXBkYXRlTWFya2Vyc0ZvcldvcmRzQWZmZWN0ZWRCeUVkaXRpbmcodHJ1ZSk7 CiAgICAgfQogCi0gICAgaWYgKGVuY2xvc2luZ1RleHRGb3JtQ29udHJvbChtX2RvY3VtZW50LnNl bGVjdGlvbigpLnNlbGVjdGlvbigpLnN0YXJ0KCkpKQorICAgIGlmIChlbmNsb3NpbmdUZXh0Rm9y bUNvbnRyb2wobV9kb2N1bWVudC5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS5zdGFydCgpKSB8fCAo c2VsZWN0aW9uICYmIEhUTUxFbGVtZW50Ojppc0luc2lkZUltYWdlT3ZlcmxheSgqc2VsZWN0aW9u KSkpCiAgICAgICAgIFBhc3RlYm9hcmQ6OmNyZWF0ZUZvckNvcHlBbmRQYXN0ZShQYWdlUGFzdGVi b2FyZENvbnRleHQ6OmNyZWF0ZShtX2RvY3VtZW50LnBhZ2VJRCgpKSktPndyaXRlUGxhaW5UZXh0 KHNlbGVjdGVkVGV4dEZvckRhdGFUcmFuc2ZlcigpLCBjYW5TbWFydENvcHlPckRlbGV0ZSgpID8g UGFzdGVib2FyZDo6Q2FuU21hcnRSZXBsYWNlIDogUGFzdGVib2FyZDo6Q2Fubm90U21hcnRSZXBs YWNlKTsKICAgICBlbHNlIHsKICAgICAgICAgSFRNTEltYWdlRWxlbWVudCogaW1hZ2VFbGVtZW50 ID0gbnVsbHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAKaW5kZXggMTVkYjQzYzFk MzU0YzUzOTNjNjczYTIzNGZjYTA0MTZlNjdjZjllOS4uOGQzNzczZjg3YTQ1ODVjY2ZlMjU1ZGY1 ZGEyNjVhNzUyOTk4MjYyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxl bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAKQEAgLTEy MjcsMjYgKzEyMjcsNDUgQEAgYm9vbCBIVE1MRWxlbWVudDo6c2hvdWxkRXh0ZW5kU2VsZWN0aW9u VG9UYXJnZXROb2RlKGNvbnN0IE5vZGUmIHRhcmdldE5vZGUsIGNvbnMKIAogYm9vbCBIVE1MRWxl bWVudDo6aGFzSW1hZ2VPdmVybGF5KCkgY29uc3QKIHsKLSAgICBhdXRvIHNoYWRvd1Jvb3QgPSB1 c2VyQWdlbnRTaGFkb3dSb290KCk7Ci0gICAgaWYgKExJS0VMWSghc2hhZG93Um9vdCkpCisgICAg YXV0byBzaGFkb3dSb290ID0gdGhpcy0+c2hhZG93Um9vdCgpOworICAgIGlmIChMSUtFTFkoIXNo YWRvd1Jvb3QgfHwgc2hhZG93Um9vdC0+bW9kZSgpICE9IFNoYWRvd1Jvb3RNb2RlOjpVc2VyQWdl bnQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gc2hhZG93Um9vdC0+aGFz RWxlbWVudFdpdGhJZCgqaW1hZ2VPdmVybGF5RWxlbWVudElkZW50aWZpZXIoKS5pbXBsKCkpOwog fQogCi1ib29sIEhUTUxFbGVtZW50Ojppc0ltYWdlT3ZlcmxheVRleHQoY29uc3QgTm9kZSYgbm9k ZSkKK3N0YXRpYyBSZWZQdHI8SFRNTEVsZW1lbnQ+IGltYWdlT3ZlcmxheUhvc3QoY29uc3QgTm9k ZSYgbm9kZSkKK3sKKyAgICBhdXRvIGhvc3QgPSBub2RlLnNoYWRvd0hvc3QoKTsKKyAgICBpZiAo IWlzPEhUTUxFbGVtZW50Pihob3N0KSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBh dXRvIGVsZW1lbnQgPSBtYWtlUmVmUHRyKGRvd25jYXN0PEhUTUxFbGVtZW50PigqaG9zdCkpOwor ICAgIHJldHVybiBlbGVtZW50LT5oYXNJbWFnZU92ZXJsYXkoKSA/IGVsZW1lbnQgOiBudWxscHRy OworfQorCitib29sIEhUTUxFbGVtZW50Ojppc0luc2lkZUltYWdlT3ZlcmxheShjb25zdCBTaW1w bGVSYW5nZSYgcmFuZ2UpCiB7Ci0gICAgYXV0byBzaGFkb3dIb3N0ID0gbm9kZS5zaGFkb3dIb3N0 KCk7Ci0gICAgaWYgKCFzaGFkb3dIb3N0KQorICAgIGF1dG8gY29tbW9uQW5jZXN0b3IgPSBtYWtl UmVmUHRyKGNvbW1vbkluY2x1c2l2ZUFuY2VzdG9yPENvbXBvc2VkVHJlZT4ocmFuZ2UpKTsKKyAg ICBpZiAoIWNvbW1vbkFuY2VzdG9yKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBhdXRv IHNoYWRvd1Jvb3QgPSBzaGFkb3dIb3N0LT5zaGFkb3dSb290KCk7Ci0gICAgaWYgKCFzaGFkb3dS b290IHx8IHNoYWRvd1Jvb3QtPm1vZGUoKSAhPSBTaGFkb3dSb290TW9kZTo6VXNlckFnZW50IHx8 IHNoYWRvd1Jvb3QgIT0gbm9kZS5jb250YWluaW5nU2hhZG93Um9vdCgpKQorICAgIGF1dG8gaG9z dCA9IGltYWdlT3ZlcmxheUhvc3QoKmNvbW1vbkFuY2VzdG9yKTsKKyAgICBpZiAoIWhvc3QpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiBob3N0LT51c2VyQWdlbnRTaGFkb3dS b290KCktPmNvbnRhaW5zKCpjb21tb25BbmNlc3Rvcik7Cit9CisKK2Jvb2wgSFRNTEVsZW1lbnQ6 OmlzSW1hZ2VPdmVybGF5VGV4dChjb25zdCBOb2RlJiBub2RlKQoreworICAgIGF1dG8gaG9zdCA9 IGltYWdlT3ZlcmxheUhvc3Qobm9kZSk7CisgICAgaWYgKCFob3N0KQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKLSAgICBmb3IgKGF1dG8mIGNoaWxkIDogY2hpbGRyZW5PZlR5cGU8SFRNTERpdkVs ZW1lbnQ+KCpzaGFkb3dSb290KSkgeworICAgIGZvciAoYXV0byYgY2hpbGQgOiBjaGlsZHJlbk9m VHlwZTxIVE1MRGl2RWxlbWVudD4oKmhvc3QtPnVzZXJBZ2VudFNoYWRvd1Jvb3QoKSkpIHsKICAg ICAgICAgaWYgKGNoaWxkLmdldElkQXR0cmlidXRlKCkgPT0gaW1hZ2VPdmVybGF5RWxlbWVudElk ZW50aWZpZXIoKSkKLSAgICAgICAgICAgIHJldHVybiBub2RlLmlzRGVzY2VuZGFudE9mKCZjaGls ZCk7CisgICAgICAgICAgICByZXR1cm4gbm9kZS5pc0Rlc2NlbmRhbnRPZihjaGlsZCk7CiAgICAg fQogCiAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5oCmluZGV4IGJk OTAyNDZjYmM1ZWMxMjE1ZGQ5ODljZDhhNTYzZTU0Y2NjYmM3ZjUuLmZjM2Q1NjYwMTNhNDU1Y2E2 Y2Y1ODBjN2ZlMWJkOGE3YWNhZjJjNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmgKQEAg LTM1LDYgKzM1LDcgQEAgY2xhc3MgRm9ybUFzc29jaWF0ZWRFbGVtZW50OwogY2xhc3MgRm9ybU5h bWVkSXRlbTsKIGNsYXNzIEhUTUxGb3JtRWxlbWVudDsKIGNsYXNzIFZpc2libGVTZWxlY3Rpb247 CitzdHJ1Y3QgU2ltcGxlUmFuZ2U7CiAKICNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKIHN0 cnVjdCBJbWFnZUV4dHJhY3Rpb25SZXN1bHQ7CkBAIC0xMjgsNiArMTI5LDcgQEAgcHVibGljOgog CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIGJvb2wgc2hvdWxkRXh0ZW5kU2VsZWN0aW9uVG9U YXJnZXROb2RlKGNvbnN0IE5vZGUmIHRhcmdldE5vZGUsIGNvbnN0IFZpc2libGVTZWxlY3Rpb24m IHNlbGVjdGlvbkJlZm9yZVVwZGF0ZSk7CiAgICAgYm9vbCBoYXNJbWFnZU92ZXJsYXkoKSBjb25z dDsKKyAgICBzdGF0aWMgYm9vbCBpc0luc2lkZUltYWdlT3ZlcmxheShjb25zdCBTaW1wbGVSYW5n ZSYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBib29sIGlzSW1hZ2VPdmVybGF5VGV4dChj b25zdCBOb2RlJik7CiAKICNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcAppbmRleCA3ODMxOTMxM2Y0Y2I2 YTRlMWFlYjk4ZmM4ZGVkNDg4NTM0ZmEwZjkzLi45M2U2MmZkMDBiNmRmZDA2ZDNhZWQwZGUwOGIx NzAwMzAzZThhZjVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51 Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRy b2xsZXIuY3BwCkBAIC05MTQsNyArOTE0LDI1IEBAIHZvaWQgQ29udGV4dE1lbnVDb250cm9sbGVy Ojpwb3B1bGF0ZSgpCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoaW1h Z2VVUkwuaXNFbXB0eSgpICYmIGxpbmtVUkwuaXNFbXB0eSgpICYmIG1lZGlhVVJMLmlzRW1wdHko KSkgeworICAgICAgICBib29sIHNob3VsZFNob3dJdGVtc0Zvck5vbkVkaXRhYmxlVGV4dCA9IChb Jl0geworICAgICAgICAgICAgaWYgKCFsaW5rVVJMLmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgICAgIGlmICghbWVkaWFVUkwuaXNFbXB0eSgpKQor ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICAgICAgaWYgKCFpbWFnZVVS TC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICBhdXRvIHNlbGVjdGVkUmFuZ2UgPSBmcmFt ZS0+c2VsZWN0aW9uKCkuc2VsZWN0aW9uKCkucmFuZ2UoKTsKKyAgICAgICAgICAgICAgICByZXR1 cm4gc2VsZWN0ZWRSYW5nZSAmJiBIVE1MRWxlbWVudDo6aXNJbnNpZGVJbWFnZU92ZXJsYXkoKnNl bGVjdGVkUmFuZ2UpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK KyAgICAgICAgfSkoKTsKKworICAgICAgICBpZiAoc2hvdWxkU2hvd0l0ZW1zRm9yTm9uRWRpdGFi bGVUZXh0KSB7CisgICAgICAgICAgICBpZiAoIWltYWdlVVJMLmlzRW1wdHkoKSkKKyAgICAgICAg ICAgICAgICBhcHBlbmRJdGVtKCpzZXBhcmF0b3JJdGVtKCksIG1fY29udGV4dE1lbnUuZ2V0KCkp OworCiAgICAgICAgICAgICBpZiAobV9jb250ZXh0LmhpdFRlc3RSZXN1bHQoKS5pc1NlbGVjdGVk KCkpIHsKICAgICAgICAgICAgICAgICBpZiAoIXNlbGVjdGVkU3RyaW5nLmlzRW1wdHkoKSkgewog I2lmIFBMQVRGT1JNKENPQ09BKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGUxODAyZTk2OGJmMjY5NWI4ZjcyZjlkNjY0YWQy M2MyZWRlNDljNzkuLjI5MTA3NzUwYzQ0YzBiN2QwNmVhOWQ5ODkwZjk4OWJkNDQ5OWU0MTQgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wMy0xOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIENvbnRleHQgbWVudSBzaG91bGQgYWNj b3VudCBmb3IgaW1hZ2Ugb3ZlcmxheSBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM1MTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc1 NTA1MjEwPgorCisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAgICBB ZGQgYSBsYXlvdXQgdGVzdCB0byBleGVyY2lzZSBjb3B5aW5nIHZpYSB0aGUgY29udGV4dCBtZW51 LgorCisgICAgICAgICogZmFzdC9pbWFnZXMvaW1hZ2UtZXh0cmFjdGlvbi9tYWMvY29weS1pbWFn ZS1vdmVybGF5LXRleHQtd2l0aC1jb250ZXh0LW1lbnUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBmYXN0L2ltYWdlcy9pbWFnZS1leHRyYWN0aW9uL21hYy9jb3B5LWltYWdlLW92ZXJs YXktdGV4dC13aXRoLWNvbnRleHQtbWVudS5odG1sOiBBZGRlZC4KKwogMjAyMS0wMy0xOSAgSmVy IE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBNYW55IG1lZGlhL21lZGlh LWZyYWdtZW50cy8gdGVzdHMgYXJlIGNyYXNoaW5nIGR1ZSB0byBvdGhlciB0ZXN0cyB0aGF0IHJ1 biBiZWZvcmUgdGhlbS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2ltYWdl LWV4dHJhY3Rpb24vbWFjL2NvcHktaW1hZ2Utb3ZlcmxheS10ZXh0LXdpdGgtY29udGV4dC1tZW51 LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2ltYWdlLWV4dHJhY3Rpb24v bWFjL2NvcHktaW1hZ2Utb3ZlcmxheS10ZXh0LXdpdGgtY29udGV4dC1tZW51LWV4cGVjdGVkLnR4 dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi41MDIzNGVjMWFhNDcwOTMwMjdhZDVlYmI2NjAwNzZiZjZkOTE4ODc4Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvaW1hZ2UtZXh0cmFjdGlv bi9tYWMvY29weS1pbWFnZS1vdmVybGF5LXRleHQtd2l0aC1jb250ZXh0LW1lbnUtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsNSBAQAorUEFTUyBlZGl0b3IudGV4dENvbnRlbnQgaXMgImZvb2JhciIK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy9pbWFnZS1leHRyYWN0aW9uL21hYy9jb3B5 LWltYWdlLW92ZXJsYXktdGV4dC13aXRoLWNvbnRleHQtbWVudS5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9pbWFnZXMvaW1hZ2UtZXh0cmFjdGlvbi9tYWMvY29weS1pbWFnZS1vdmVybGF5LXRleHQt d2l0aC1jb250ZXh0LW1lbnUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40MDUyOWVjNDU4ZjE1NDA4MjBjZjM2 YzVlY2QwOTRiZTU2NjI2MzNiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9p bWFnZXMvaW1hZ2UtZXh0cmFjdGlvbi9tYWMvY29weS1pbWFnZS1vdmVybGF5LXRleHQtd2l0aC1j b250ZXh0LW1lbnUuaHRtbApAQCAtMCwwICsxLDQ3IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s PgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMi Pjwvc2NyaXB0PgorPHN0eWxlPgoraW1nIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAg dG9wOiAwOworICAgIGxlZnQ6IDA7Cit9CisKK2Rpdltjb250ZW50ZWRpdGFibGVdIHsKKyAgICBi b3JkZXI6IDFweCBzb2xpZCB0b21hdG87Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8 aW1nIHNyYz0iLi4vLi4vcmVzb3VyY2VzL2dyZWVuLTQwMHg0MDAucG5nIj48L2ltZz4KKzxkaXYg Y29udGVudGVkaXRhYmxlPjwvZGl2PgorPHNjcmlwdD4KK2FkZEV2ZW50TGlzdGVuZXIoImxvYWQi LCAoKSA9PiB7CisgICAgbGV0IGltYWdlID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiaW1nIik7 CisgICAgaW50ZXJuYWxzLmluc3RhbGxJbWFnZU92ZXJsYXkoaW1hZ2UsIFt7CisgICAgICAgIHRl eHQgOiAiZm9vYmFyIiwKKyAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAs IDApLAorICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDApLAorICAg ICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDAuNSksCisgICAgICAg IGJvdHRvbUxlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLCAwLjUpLAorICAgIH1dKTsKKwor ICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKDUwLCAxNTApOworCisgICAgZm9yIChsZXQgaXRl bSBvZiBldmVudFNlbmRlci5jb250ZXh0Q2xpY2soKSkgeworICAgICAgICBpZiAoaXRlbS50aXRs ZSA9PT0gIkNvcHkiKQorICAgICAgICAgICAgaXRlbS5jbGljaygpOworICAgIH0KKworICAgIGVk aXRvciA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoImRpdltjb250ZW50ZWRpdGFibGVdIik7Cisg ICAgZWRpdG9yLmZvY3VzKCk7CisgICAgZG9jdW1lbnQuZXhlY0NvbW1hbmQoIlBhc3RlIik7CisK KyAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImVkaXRvci50ZXh0Q29udGVudCIsICJmb29iYXIi KTsKKyAgICBlZGl0b3IucmVtb3ZlKCk7Cit9KTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1s PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK