223766 2021-03-25 15:20:36 -0700 It should be possible to drag images with overlay content 2021-03-25 19:27:37 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin cdumez changseok esprehn+autocc ews-watchlist glenn gyuyoung.kim kondapallykalyan megan_gardner pdr thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1743939 0 wenson_hsieh 2021-03-25 15:20:36 -0700 . 1743940 1 webkit-bug-importer 2021-03-25 15:21:08 -0700 <rdar://problem/75856030> 1743960 2 424290 wenson_hsieh 2021-03-25 16:03:20 -0700 Created attachment 424290 Patch 1744039 3 424290 wenson_hsieh 2021-03-25 19:13:24 -0700 Comment on attachment 424290 Patch Thanks for the review! 1744041 4 ews-feeder 2021-03-25 19:27:35 -0700 Committed r275072: <https://commits.webkit.org/r275072> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424290. 424290 2021-03-25 16:03:20 -0700 2021-03-25 19:27:36 -0700 Patch bug-223766-20210325160319.patch text/plain 22201 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0OTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjA4NjM0Nzg5NzBlYmEx OGI4NWMyNTg0MWNhYmIxM2Q3YWQ1ZDU1ZC4uODJiNWRjNGI4N2RjMTJjZTNkNTA3YmMwYjVhNTQ5 MWU1NjlkNTc5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDIxLTAzLTI1ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEl0IHNob3VsZCBi ZSBwb3NzaWJsZSB0byBkcmFnIGltYWdlcyB3aXRoIG92ZXJsYXkgY29udGVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNzY2CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS83NTg1NjAzMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBNYWtlIGEgZmV3IG1pbm9yIGFkanVzdG1lbnRzIHRvIG1ha2UgZHJh ZyBhbmQgZHJvcCBwbGF5IHdlbGwgd2l0aCBpbWFnZXMgd2l0aCBvdmVybGF5IGNvbnRlbnQuIFNl ZSBiZWxvdyBmb3IKKyAgICAgICAgbW9yZSBkZXRhaWxzLgorCisgICAgICAgIFRlc3Q6IERyYWdB bmREcm9wVGVzdHMuRHJhZ0VsZW1lbnRXaXRoSW1hZ2VPdmVybGF5CisKKyAgICAgICAgKiBodG1s L0hUTUxFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50Ojppc0luc2lk ZUltYWdlT3ZlcmxheSk6CisKKyAgICAgICAgQWRkIGEgaGVscGVyIG1ldGhvZCB0byByZXR1cm4g d2hldGhlciBhbiBpbmRpdmlkdWFsIERPTSBub2RlIGlzIGluc2lkZSBhbiBpbWFnZSBvdmVybGF5 LiBVc2UgdGhpcyBpbiB0aGUKKyAgICAgICAgZXhpc3RpbmcgdmVyc2lvbiBvZiB0aGlzIG1ldGhv ZCB0aGF0IHRha2VzIGEgYFNpbXBsZVJhbmdlYC4KKworICAgICAgICAqIGh0bWwvSFRNTEVsZW1l bnQuaDoKKyAgICAgICAgKiBwYWdlL0RyYWdDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRyYWdDb250cm9sbGVyOjpkcmFnZ2FibGVFbGVtZW50IGNvbnN0KToKKworICAgICAgICBT a2lwIGFsbCBkcmFnIHNvdXJjZSBhY3Rpb25zIGV4Y2VwdCBmb3IgYFNlbGVjdGlvbmAgaW4gdGhl IGNhc2Ugd2hlcmUgd2UncmUgaGl0LXRlc3RpbmcgdG8gdGV4dCBpbnNpZGUgb2YgYW4KKyAgICAg ICAgaW1hZ2Ugb3ZlcmxheS4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VQcmVzc0V2ZW50KToKKwor ICAgICAgICBNYWtlIGBpc01vdXNlRG93bk9uTGlua09ySW1hZ2VgIGBmYWxzZWAgaW4gdGhlIGNh c2Ugd2hlcmUgd2UncmUgb3ZlciBpbWFnZSBvdmVybGF5IHRleHQuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXRUZXN0UmVzdWx0 Ojpub2RlRm9ySW1hZ2VEYXRhIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkhpdFRlc3RSZXN1 bHQ6OmltYWdlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkhpdFRlc3RSZXN1bHQ6OmltYWdl UmVjdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpIaXRUZXN0UmVzdWx0OjphYnNvbHV0ZUlt YWdlVVJMIGNvbnN0KToKKworICAgICAgICBUZWFjaCBgSGl0VGVzdFJlc3VsdGAgdG8gc2tpcCBv dXQgb2YgaW1hZ2Ugb3ZlcmxheSBjb250ZW50IGFuZCBmaW5kIHRoZSBhY3R1YWwgaW1hZ2UgZWxl bWVudCB3aGVuIGRldGVybWluaW5nCisgICAgICAgIHRoZSBpbWFnZSBVUkwsIGltYWdlLCBvciBp bWFnZSByZWN0LgorCisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuaDoKKwogMjAy MS0wMy0yMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtK U0NdIEZ1bmN0b3IgZm9yIFdlYWtHQ01hcDo6ZW5zdXJlVmFsdWUgbXVzdCBub3QgaW52b2tlIEdD CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCmluZGV4IDhkMzc3M2Y4N2E0NTg1Y2NmZTI1 NWRmNWRhMjY1YTc1Mjk5ODI2MjAuLjcwOGE4ZDg4ZWYxZTQ2NzhjNTc3MGFkNmU3OGE2Y2FkYWZj MWFkMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCkBAIC0xMjUwLDExICsxMjUw LDE2IEBAIGJvb2wgSFRNTEVsZW1lbnQ6OmlzSW5zaWRlSW1hZ2VPdmVybGF5KGNvbnN0IFNpbXBs ZVJhbmdlJiByYW5nZSkKICAgICBpZiAoIWNvbW1vbkFuY2VzdG9yKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKLSAgICBhdXRvIGhvc3QgPSBpbWFnZU92ZXJsYXlIb3N0KCpjb21tb25BbmNlc3Rv cik7CisgICAgcmV0dXJuIGlzSW5zaWRlSW1hZ2VPdmVybGF5KCpjb21tb25BbmNlc3Rvcik7Cit9 CisKK2Jvb2wgSFRNTEVsZW1lbnQ6OmlzSW5zaWRlSW1hZ2VPdmVybGF5KGNvbnN0IE5vZGUmIG5v ZGUpCit7CisgICAgYXV0byBob3N0ID0gaW1hZ2VPdmVybGF5SG9zdChub2RlKTsKICAgICBpZiAo IWhvc3QpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiBob3N0LT51c2VyQWdl bnRTaGFkb3dSb290KCktPmNvbnRhaW5zKCpjb21tb25BbmNlc3Rvcik7CisgICAgcmV0dXJuIGhv c3QtPnVzZXJBZ2VudFNoYWRvd1Jvb3QoKS0+Y29udGFpbnMobm9kZSk7CiB9CiAKIGJvb2wgSFRN TEVsZW1lbnQ6OmlzSW1hZ2VPdmVybGF5VGV4dChjb25zdCBOb2RlJiBub2RlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MRWxlbWVudC5oCmluZGV4IGZjM2Q1NjYwMTNhNDU1Y2E2Y2Y1ODBjN2ZlMWJkOGE3YWNh ZjJjNjEuLmU3ZWJkZGNjMjM2NDQzNzkwNmJjYTcwODU3NWRmZWMzZTZlYmM0ZjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxFbGVtZW50LmgKQEAgLTEzMCw2ICsxMzAsNyBAQCBwdWJsaWM6CiAgICAgV0VC Q09SRV9FWFBPUlQgc3RhdGljIGJvb2wgc2hvdWxkRXh0ZW5kU2VsZWN0aW9uVG9UYXJnZXROb2Rl KGNvbnN0IE5vZGUmIHRhcmdldE5vZGUsIGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIHNlbGVjdGlv bkJlZm9yZVVwZGF0ZSk7CiAgICAgYm9vbCBoYXNJbWFnZU92ZXJsYXkoKSBjb25zdDsKICAgICBz dGF0aWMgYm9vbCBpc0luc2lkZUltYWdlT3ZlcmxheShjb25zdCBTaW1wbGVSYW5nZSYpOworICAg IHN0YXRpYyBib29sIGlzSW5zaWRlSW1hZ2VPdmVybGF5KGNvbnN0IE5vZGUmKTsKICAgICBXRUJD T1JFX0VYUE9SVCBzdGF0aWMgYm9vbCBpc0ltYWdlT3ZlcmxheVRleHQoY29uc3QgTm9kZSYpOwog CiAjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRy b2xsZXIuY3BwCmluZGV4IDNmYjIxNzE5ZGZkNzQ0NmEzMGMzNzk3YWE0ZjAwZjIyOGUzZDY2OGMu LjVmYWY3YmMxMGIzYjM5ZWRkZGMyZGI2YzU2NmViZjI3ZjRmMGM4MzMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCkBAIC03ODUsNiArNzg1LDEwIEBAIEVsZW1lbnQqIERy YWdDb250cm9sbGVyOjpkcmFnZ2FibGVFbGVtZW50KGNvbnN0IEZyYW1lKiBzb3VyY2VGcmFtZSwg RWxlbWVudCogc3RhCiAgICAgfQogI2VuZGlmCiAKKyAgICBhdXRvIHNlbGVjdGlvbkRyYWdFbGVt ZW50ID0gc3RhdGUudHlwZS5jb250YWlucyhEcmFnU291cmNlQWN0aW9uOjpTZWxlY3Rpb24pICYm IG1fZHJhZ1NvdXJjZUFjdGlvbi5jb250YWlucyhEcmFnU291cmNlQWN0aW9uOjpTZWxlY3Rpb24p ID8gc3RhcnRFbGVtZW50IDogbnVsbHB0cjsKKyAgICBpZiAoc3RhcnRFbGVtZW50ICYmIEhUTUxF bGVtZW50Ojppc0ltYWdlT3ZlcmxheVRleHQoKnN0YXJ0RWxlbWVudCkpCisgICAgICAgIHJldHVy biBzZWxlY3Rpb25EcmFnRWxlbWVudDsKKwogICAgIGZvciAoYXV0byogZWxlbWVudCA9IHN0YXJ0 RWxlbWVudDsgZWxlbWVudDsgZWxlbWVudCA9IGVsZW1lbnQtPnBhcmVudE9yU2hhZG93SG9zdEVs ZW1lbnQoKSkgewogICAgICAgICBhdXRvKiByZW5kZXJlciA9IGVsZW1lbnQtPnJlbmRlcmVyKCk7 CiAgICAgICAgIGlmICghcmVuZGVyZXIpCkBAIC03OTgsNyArODAyLDYgQEAgRWxlbWVudCogRHJh Z0NvbnRyb2xsZXI6OmRyYWdnYWJsZUVsZW1lbnQoY29uc3QgRnJhbWUqIHNvdXJjZUZyYW1lLCBF bGVtZW50KiBzdGEKICAgICAgICAgaWYgKGRyYWdNb2RlID09IFVzZXJEcmFnOjpBdXRvKSB7CiAg ICAgICAgICAgICBpZiAoKG1fZHJhZ1NvdXJjZUFjdGlvbi5jb250YWlucyhEcmFnU291cmNlQWN0 aW9uOjpJbWFnZSkpCiAgICAgICAgICAgICAgICAgJiYgaXM8SFRNTEltYWdlRWxlbWVudD4oKmVs ZW1lbnQpCi0gICAgICAgICAgICAgICAgJiYgIUhUTUxFbGVtZW50Ojppc0ltYWdlT3ZlcmxheVRl eHQoKnN0YXJ0RWxlbWVudCkKICAgICAgICAgICAgICAgICAmJiBpbWFnZUVsZW1lbnRJc0RyYWdn YWJsZShkb3duY2FzdDxIVE1MSW1hZ2VFbGVtZW50PigqZWxlbWVudCksICpzb3VyY2VGcmFtZSkp IHsKICAgICAgICAgICAgICAgICBzdGF0ZS50eXBlLmFkZChEcmFnU291cmNlQWN0aW9uOjpJbWFn ZSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGVsZW1lbnQ7CkBAIC04MjUsMTAgKzgyOCw3IEBA IEVsZW1lbnQqIERyYWdDb250cm9sbGVyOjpkcmFnZ2FibGVFbGVtZW50KGNvbnN0IEZyYW1lKiBz b3VyY2VGcmFtZSwgRWxlbWVudCogc3RhCiAgICAgfQogCiAgICAgLy8gV2UgZWl0aGVyIGhhdmUg bm90aGluZyB0byBkcmFnIG9yIHdlIGhhdmUgYSBzZWxlY3Rpb24gYW5kIHdlJ3JlIG5vdCBvdmVy IGEgZHJhZ2dhYmxlIGVsZW1lbnQuCi0gICAgaWYgKHN0YXRlLnR5cGUuY29udGFpbnMoRHJhZ1Nv dXJjZUFjdGlvbjo6U2VsZWN0aW9uKSAmJiBtX2RyYWdTb3VyY2VBY3Rpb24uY29udGFpbnMoRHJh Z1NvdXJjZUFjdGlvbjo6U2VsZWN0aW9uKSkKLSAgICAgICAgcmV0dXJuIHN0YXJ0RWxlbWVudDsK LQotICAgIHJldHVybiBudWxscHRyOworICAgIHJldHVybiBzZWxlY3Rpb25EcmFnRWxlbWVudDsK IH0KIAogc3RhdGljIENhY2hlZEltYWdlKiBnZXRDYWNoZWRJbWFnZShFbGVtZW50JiBlbGVtZW50 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IDM3MGVhYjNiMGVmYjQ3NWU0 ZTdjOGQyNTVhYThjODRkODU1NGRkOTQuLmM4MzFmODJjMzU2MWUyMGJkODU1NDk2N2FmZTJmMzU1 MWM1ZGVlM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTc0Niw3ICs3 NDYsOCBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VQcmVzc0V2ZW50KGNvbnN0IE1v dXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMmIGV2ZQogICAgIC8vIEJ1ZzogaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTM5MAogCiAgICAgLy8gU2luZ2xlIG1vdXNl IGRvd24gb24gbGlua3Mgb3IgaW1hZ2VzIGNhbiBhbHdheXMgdHJpZ2dlciBkcmFnLW4tZHJvcC4K LSAgICBib29sIGlzTW91c2VEb3duT25MaW5rT3JJbWFnZSA9IGV2ZW50LmlzT3ZlckxpbmsoKSB8 fCBldmVudC5oaXRUZXN0UmVzdWx0KCkuaW1hZ2UoKTsKKyAgICBib29sIGlzSW1hZ2VPdmVybGF5 VGV4dCA9IGV2ZW50LnRhcmdldE5vZGUoKSAmJiBIVE1MRWxlbWVudDo6aXNJbWFnZU92ZXJsYXlU ZXh0KCpldmVudC50YXJnZXROb2RlKCkpOworICAgIGJvb2wgaXNNb3VzZURvd25PbkxpbmtPcklt YWdlID0gZXZlbnQuaXNPdmVyTGluaygpIHx8IChldmVudC5oaXRUZXN0UmVzdWx0KCkuaW1hZ2Uo KSAmJiAhaXNJbWFnZU92ZXJsYXlUZXh0KTsKICAgICBtX21vdXNlRG93bk1heVN0YXJ0RHJhZyA9 IHNpbmdsZUNsaWNrICYmICghZXZlbnQuZXZlbnQoKS5zaGlmdEtleSgpIHx8IGlzTW91c2VEb3du T25MaW5rT3JJbWFnZSkgJiYgc2hvdWxkQWxsb3dNb3VzZURvd25Ub1N0YXJ0RHJhZygpOwogI2Vu ZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcAppbmRleCBm MTQwZGZhMDI1YjIwMjA2MWFkMmY2ZGMwYjFhMTc3NTczOThjNGNlLi4wMzA3ZDkyMGYwNGVhM2E5 YTZlYjQzYzgwOGZjMGJiOWI2N2Q1ZDg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hp dFRlc3RSZXN1bHQuY3BwCkBAIC0zMzEsMTMgKzMzMSwyNCBAQCBTdHJpbmcgSGl0VGVzdFJlc3Vs dDo6YWx0RGlzcGxheVN0cmluZygpIGNvbnN0CiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCi1J bWFnZSogSGl0VGVzdFJlc3VsdDo6aW1hZ2UoKSBjb25zdAorUmVmUHRyPE5vZGU+IEhpdFRlc3RS ZXN1bHQ6Om5vZGVGb3JJbWFnZURhdGEoKSBjb25zdAogewogICAgIGlmICghbV9pbm5lck5vblNo YXJlZE5vZGUpCiAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgIAotICAgIGF1dG8qIHJlbmRl cmVyID0gbV9pbm5lck5vblNoYXJlZE5vZGUtPnJlbmRlcmVyKCk7Ci0gICAgaWYgKGlzPFJlbmRl ckltYWdlPihyZW5kZXJlcikpIHsKKworICAgIGlmIChIVE1MRWxlbWVudDo6aXNJbnNpZGVJbWFn ZU92ZXJsYXkoKm1faW5uZXJOb25TaGFyZWROb2RlKSkKKyAgICAgICAgcmV0dXJuIG1faW5uZXJO b25TaGFyZWROb2RlLT5zaGFkb3dIb3N0KCk7CisKKyAgICByZXR1cm4gbV9pbm5lck5vblNoYXJl ZE5vZGU7Cit9CisKK0ltYWdlKiBIaXRUZXN0UmVzdWx0OjppbWFnZSgpIGNvbnN0Cit7CisgICAg YXV0byBpbWFnZU5vZGUgPSBub2RlRm9ySW1hZ2VEYXRhKCk7CisgICAgaWYgKCFpbWFnZU5vZGUp CisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBpbWFn ZU5vZGUtPnJlbmRlcmVyKCk7IGlzPFJlbmRlckltYWdlPihyZW5kZXJlcikpIHsKICAgICAgICAg YXV0byYgaW1hZ2UgPSBkb3duY2FzdDxSZW5kZXJJbWFnZT4oKnJlbmRlcmVyKTsKICAgICAgICAg aWYgKGltYWdlLmNhY2hlZEltYWdlKCkgJiYgIWltYWdlLmNhY2hlZEltYWdlKCktPmVycm9yT2Nj dXJyZWQoKSkKICAgICAgICAgICAgIHJldHVybiBpbWFnZS5jYWNoZWRJbWFnZSgpLT5pbWFnZUZv clJlbmRlcmVyKCZpbWFnZSk7CkBAIC0zNTAsMjggKzM2MSwzMiBAQCBJbnRSZWN0IEhpdFRlc3RS ZXN1bHQ6OmltYWdlUmVjdCgpIGNvbnN0CiB7CiAgICAgaWYgKCFpbWFnZSgpKQogICAgICAgICBy ZXR1cm4gSW50UmVjdCgpOwotICAgIHJldHVybiBtX2lubmVyTm9uU2hhcmVkTm9kZS0+cmVuZGVy Qm94KCktPmFic29sdXRlQ29udGVudFF1YWQoKS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOworCisg ICAgYXV0byBpbWFnZU5vZGUgPSBub2RlRm9ySW1hZ2VEYXRhKCk7CisgICAgaWYgKCFpbWFnZU5v ZGUpCisgICAgICAgIHJldHVybiB7IH07CisKKyAgICByZXR1cm4gaW1hZ2VOb2RlLT5yZW5kZXJC b3goKS0+YWJzb2x1dGVDb250ZW50UXVhZCgpLmVuY2xvc2luZ0JvdW5kaW5nQm94KCk7CiB9CiAK IFVSTCBIaXRUZXN0UmVzdWx0OjphYnNvbHV0ZUltYWdlVVJMKCkgY29uc3QKIHsKLSAgICBpZiAo IW1faW5uZXJOb25TaGFyZWROb2RlKQotICAgICAgICByZXR1cm4gVVJMKCk7CisgICAgYXV0byBp bWFnZU5vZGUgPSBub2RlRm9ySW1hZ2VEYXRhKCk7CisgICAgaWYgKCFpbWFnZU5vZGUpCisgICAg ICAgIHJldHVybiB7IH07CiAKLSAgICBpZiAoIShtX2lubmVyTm9uU2hhcmVkTm9kZS0+cmVuZGVy ZXIoKSAmJiBtX2lubmVyTm9uU2hhcmVkTm9kZS0+cmVuZGVyZXIoKS0+aXNJbWFnZSgpKSkKLSAg ICAgICAgcmV0dXJuIFVSTCgpOworICAgIGF1dG8gcmVuZGVyZXIgPSBpbWFnZU5vZGUtPnJlbmRl cmVyKCk7CisgICAgaWYgKCFyZW5kZXJlciB8fCAhcmVuZGVyZXItPmlzSW1hZ2UoKSkKKyAgICAg ICAgcmV0dXJuIHsgfTsKIAotICAgIEF0b21TdHJpbmcgdXJsU3RyaW5nOwotICAgIGlmIChpczxI VE1MRW1iZWRFbGVtZW50PigqbV9pbm5lck5vblNoYXJlZE5vZGUpCi0gICAgICAgIHx8IGlzPEhU TUxJbWFnZUVsZW1lbnQ+KCptX2lubmVyTm9uU2hhcmVkTm9kZSkKLSAgICAgICAgfHwgaXM8SFRN TElucHV0RWxlbWVudD4oKm1faW5uZXJOb25TaGFyZWROb2RlKQotICAgICAgICB8fCBpczxIVE1M T2JqZWN0RWxlbWVudD4oKm1faW5uZXJOb25TaGFyZWROb2RlKQotICAgICAgICB8fCBpczxTVkdJ bWFnZUVsZW1lbnQ+KCptX2lubmVyTm9uU2hhcmVkTm9kZSkpIHsKLSAgICAgICAgdXJsU3RyaW5n ID0gZG93bmNhc3Q8RWxlbWVudD4oKm1faW5uZXJOb25TaGFyZWROb2RlKS5pbWFnZVNvdXJjZVVS TCgpOwotICAgIH0gZWxzZQotICAgICAgICByZXR1cm4gVVJMKCk7CisgICAgaWYgKGlzPEhUTUxF bWJlZEVsZW1lbnQ+KCppbWFnZU5vZGUpCisgICAgICAgIHx8IGlzPEhUTUxJbWFnZUVsZW1lbnQ+ KCppbWFnZU5vZGUpCisgICAgICAgIHx8IGlzPEhUTUxJbnB1dEVsZW1lbnQ+KCppbWFnZU5vZGUp CisgICAgICAgIHx8IGlzPEhUTUxPYmplY3RFbGVtZW50PigqaW1hZ2VOb2RlKQorICAgICAgICB8 fCBpczxTVkdJbWFnZUVsZW1lbnQ+KCppbWFnZU5vZGUpKQorICAgICAgICByZXR1cm4gaW1hZ2VO b2RlLT5kb2N1bWVudCgpLmNvbXBsZXRlVVJMKGRvd25jYXN0PEVsZW1lbnQ+KCppbWFnZU5vZGUp LmltYWdlU291cmNlVVJMKCkpOwogCi0gICAgcmV0dXJuIG1faW5uZXJOb25TaGFyZWROb2RlLT5k b2N1bWVudCgpLmNvbXBsZXRlVVJMKHN0cmlwTGVhZGluZ0FuZFRyYWlsaW5nSFRNTFNwYWNlcyh1 cmxTdHJpbmcpKTsKKyAgICByZXR1cm4geyB9OwogfQogCiBVUkwgSGl0VGVzdFJlc3VsdDo6YWJz b2x1dGVQREZVUkwoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0hpdFRlc3RSZXN1bHQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0 LmgKaW5kZXggNDhhZWFkOWVhMmJhMGIyMGU4OThjZmM2NWE4MjA5YjQ1NjQ5ZjFmZC4uNWVjOTJi ZjExZDBjOTJkMjEwNjI5N2JjZjQ4ZGUzN2RjODYzNDBmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvSGl0VGVzdFJlc3VsdC5oCkBAIC0xNTEsNiArMTUxLDggQEAgcHJpdmF0ZToKIAogICAg IHRlbXBsYXRlPHR5cGVuYW1lIFJlY3RUeXBlPiBIaXRUZXN0UHJvZ3Jlc3MgYWRkTm9kZVRvTGlz dEJhc2VkVGVzdFJlc3VsdENvbW1vbihOb2RlKiwgY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBjb25z dCBIaXRUZXN0TG9jYXRpb24mLCBjb25zdCBSZWN0VHlwZSYpOwogCisgICAgUmVmUHRyPE5vZGU+ IG5vZGVGb3JJbWFnZURhdGEoKSBjb25zdDsKKwogI2lmIEVOQUJMRShWSURFTykKICAgICBIVE1M TWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQoKSBjb25zdDsKICNlbmRpZgpkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGIxOTgyMGNjMWNlNjU5NDgy YTU3OGViZTFmMmQwYWU2ZDQ3MjE2ZWIuLmU4OGRjNjI5MDkwYWI1NWJmNWM3YzNhYzU3NjM0ZDY3 NjBhNTdlZTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwzNiBAQAorMjAyMS0wMy0yNSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KKworICAgICAgICBJdCBzaG91bGQgYmUgcG9zc2libGUgdG8gZHJhZyBp bWFnZXMgd2l0aCBvdmVybGF5IGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMzc2NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzU4NTYw MzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IGFuIEFQSSB0ZXN0IHRvIHZlcmlmeSB0aGF0IHRoZSB0b3AgcGFydCBvZiB0aGUgaW1hZ2UgKHdp dGggYW4gb3ZlcmxheSkgZG9lc24ndCB0cmlnZ2VyIGEgYGRyYWdzdGFydGAgd2hlbgorICAgICAg ICBkcmFnZ2VkLCBidXQgdGhlIGJvdHRvbSBwYXJ0IG9mIHRoZSBpbWFnZSBkb2VzLgorCisgICAg ICAgICogVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2o6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvc2ltcGxlLWltYWdlLW92 ZXJsYXkuaHRtbDogQWRkZWQuCisKKyAgICAgICAgQWRkIGEgdGVzdCBwYWdlIHRoYXQgaW5zdGFs bHMgYW4gaW1hZ2Ugb3ZlcmxheSBmb3IgdGVzdGluZyBwdXJwb3NlcyAoYXNzdW1pbmcgdGhhdCB0 aGUgd2ViIHZpZXcgaW5qZWN0cyB0aGUKKyAgICAgICAgZ2xvYmFsIGBpbnRlcm5hbHNgIG9iamVj dCkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0RyYWdBbmRE cm9wVGVzdHMubW06CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvRHJhZ0FuZERy b3BUZXN0c01hYy5tbToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvY29hL0RyYWdBbmREcm9w U2ltdWxhdG9yLmg6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9pb3MvRHJhZ0FuZERyb3BTaW11 bGF0b3JJT1MubW06CisgICAgICAgICgtW0RyYWdBbmREcm9wU2ltdWxhdG9yIGNvbnRhaW5zRHJh Z2dlZFR5cGU6XSk6CisKKyAgICAgICAgQWRkIGEgaGVscGVyIG1ldGhvZCB0byByZXR1cm4gd2hl dGhlciBvciBub3QgdGhlIHNpbXVsYXRlZCBkcmFnIHJlc3VsdGVkIGluIHRoZSBnaXZlbiB0eXBl IGJlaW5nIHdyaXR0ZW4gdG8gdGhlCisgICAgICAgICJkcmFnIHBhc3RlYm9hcmQiIChpbiB0aGUg Y2FzZSBvZiBpT1MsIHRoaXMganVzdCBtZWFucyBhbnkgb2YgdGhlIHNvdXJjZSBpdGVtIHByb3Zp ZGVycykuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL21hYy9EcmFnQW5kRHJvcFNpbXVsYXRv ck1hYy5tbToKKyAgICAgICAgKC1bRHJhZ0FuZERyb3BTaW11bGF0b3IgaW5pdFdpdGhXZWJWaWV3 RnJhbWU6Y29uZmlndXJhdGlvbjpdKToKKworICAgICAgICBNYWtlIGEgbWlub3IgYWRqdXN0bWVu dCB0byBlbnN1cmUgdGhhdCB0aGUgZHJhZyBwYXN0ZWJvYXJkIGlzIGNsZWFyZWQgb3V0IGJlZm9y ZSBzdGFydGluZyBhIHNpbXVsYXRlZCBkcmFnLgorCisgICAgICAgICgtW0RyYWdBbmREcm9wU2lt dWxhdG9yIGNvbnRhaW5zRHJhZ2dlZFR5cGU6XSk6CisKIDIwMjEtMDMtMjMgIENocmlzIER1bWV6 ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBEZXJpdmVkU291cmNlcy9XZWJLaXRUZXN0 UnVubmVyL0pTQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5jcHA6ODAyOjcyOiBydW50aW1lIGVycm9y OiAtMSBpcyBvdXRzaWRlIHRoZSByYW5nZSBvZiByZXByZXNlbnRhYmxlIHZhbHVlcyBvZiB0eXBl ICd1bnNpZ25lZCBpbnQnCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJL aXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDE0MTUzNzdlYzNlMTY0 M2U3ZWU2NWNlNjg4MjExNGI5NTU2MjExZmMuLmJhZDZlODhiMTQyYjdlOGEwNGVmNDRlOThlYjRh NjhiN2FjMjU5NTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQ SS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xMjI3LDYgKzEyMjcsNyBA QAogCQlGNEUwQTJCODIxMjI4NDc0MDBBRjdDN0YgLyogVGVzdEZpbGVQcm9taXNlUmVjZWl2ZXIu bW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEUwQTJC NzIxMjI4NDc0MDBBRjdDN0YgLyogVGVzdEZpbGVQcm9taXNlUmVjZWl2ZXIubW0gKi87IH07CiAJ CUY0RTNEODA4MjBGNzBCQjkwMDdCNThDNSAvKiBzaWduaWZpY2FudC10ZXh0LW1pbGVzdG9uZS1h cnRpY2xlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gRjRFM0Q4MDcyMEY3MDhFNDAwN0I1OEM1IC8qIHNpZ25pZmljYW50LXRleHQtbWls ZXN0b25lLWFydGljbGUuaHRtbCAqLzsgfTsKIAkJRjRFQjRFOTEyMzI4QUMzMDAwNTc0REFCIC8q IE5TSXRlbVByb3ZpZGVyQWRkaXRpb25zLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gRjRFQjRFOTAyMzI4QUMzMDAwNTc0REFCIC8qIE5TSXRlbVByb3Zp ZGVyQWRkaXRpb25zLm1tICovOyB9OworCQlGNEVDODA5NDI2MEQzMDU0MDAxMDMxMUQgLyogc2lt cGxlLWltYWdlLW92ZXJsYXkuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSBGNEVDODA5MzI2MEQyRTYyMDAxMDMxMUQgLyogc2ltcGxlLWlt YWdlLW92ZXJsYXkuaHRtbCAqLzsgfTsKIAkJRjRGMTM3OTIxRDlCNjgzRTAwMkJFQzU3IC8qIGxh cmdlLXZpZGVvLXRlc3Qtbm93LXBsYXlpbmcuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEYxMzc5MTFEOUI2ODMyMDAyQkVDNTcgLyog bGFyZ2UtdmlkZW8tdGVzdC1ub3ctcGxheWluZy5odG1sICovOyB9OwogCQlGNEY0MDVCQzFENEMw RDFDMDA3QTk3MDcgLyogZnVsbC1zaXplLWF1dG9wbGF5aW5nLXZpZGVvLXdpdGgtYXVkaW8uaHRt bCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBG NEY0MDVCQTFENEMwQ0Y4MDA3QTk3MDcgLyogZnVsbC1zaXplLWF1dG9wbGF5aW5nLXZpZGVvLXdp dGgtYXVkaW8uaHRtbCAqLzsgfTsKIAkJRjRGNDA1QkQxRDRDMEQxQzAwN0E5NzA3IC8qIHNraW5u eS1hdXRvcGxheWluZy12aWRlby13aXRoLWF1ZGlvLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjRGNDA1QkIxRDRDMENGODAwN0E5NzA3 IC8qIHNraW5ueS1hdXRvcGxheWluZy12aWRlby13aXRoLWF1ZGlvLmh0bWwgKi87IH07CkBAIC0x NjM4LDYgKzE2MzksNyBAQAogCQkJCTFBREJFRkUzMTMwQzZBQTEwMEQ2MUQxOSAvKiBzaW1wbGUt YWNjZWxlcmF0ZWQtY29tcG9zaXRpbmcuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlD MEFEQkU5NjEyRkNBNzlCMDBEMkMxMjkgLyogc2ltcGxlLWZvcm0uaHRtbCBpbiBDb3B5IFJlc291 cmNlcyAqLywKIAkJCQkzM0RDODkxMjE0MTk1NUZFMDA3NDdFRjcgLyogc2ltcGxlLWlmcmFtZS5o dG1sIGluIENvcHkgUmVzb3VyY2VzICovLAorCQkJCUY0RUM4MDk0MjYwRDMwNTQwMDEwMzExRCAv KiBzaW1wbGUtaW1hZ2Utb3ZlcmxheS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUJD QUE0ODU2MTRBMDQ0NEMwMDg4RkFDNCAvKiBzaW1wbGUtdGFsbC5odG1sIGluIENvcHkgUmVzb3Vy Y2VzICovLAogCQkJCUJDOTA5Nzg0MTI1NTcxQ0YwMDA4Mzc1NiAvKiBzaW1wbGUuaHRtbCBpbiBD b3B5IFJlc291cmNlcyAqLywKIAkJCQk1MUU1QzcwMjE5MTlDM0IyMDBEOEIzRTEgLyogc2ltcGxl Mi5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLApAQCAtMzAyNSw2ICszMDI3LDcgQEAKIAkJRjRF M0Q4MDcyMEY3MDhFNDAwN0I1OEM1IC8qIHNpZ25pZmljYW50LXRleHQtbWlsZXN0b25lLWFydGlj bGUuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9ICJzaWduaWZpY2FudC10ZXh0LW1p bGVzdG9uZS1hcnRpY2xlLmh0bWwiOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGNEVC NEU4RjIzMjhBQzMwMDA1NzREQUIgLyogTlNJdGVtUHJvdmlkZXJBZGRpdGlvbnMuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBuYW1lID0gTlNJdGVtUHJvdmlkZXJBZGRpdGlvbnMuaDsgcGF0aCA9IGNvY29hL05TSXRlbVBy b3ZpZGVyQWRkaXRpb25zLmg7IHNvdXJjZVRyZWUgPSBTT1VSQ0VfUk9PVDsgfTsKIAkJRjRFQjRF OTAyMzI4QUMzMDAwNTc0REFCIC8qIE5TSXRlbVByb3ZpZGVyQWRkaXRpb25zLm1tICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAu b2JqY3BwOyBuYW1lID0gTlNJdGVtUHJvdmlkZXJBZGRpdGlvbnMubW07IHBhdGggPSBjb2NvYS9O U0l0ZW1Qcm92aWRlckFkZGl0aW9ucy5tbTsgc291cmNlVHJlZSA9IFNPVVJDRV9ST09UOyB9Owor CQlGNEVDODA5MzI2MEQyRTYyMDAxMDMxMUQgLyogc2ltcGxlLWltYWdlLW92ZXJsYXkuaHRtbCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9ICJzaW1wbGUtaW1hZ2Utb3ZlcmxheS5odG1sIjsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRjRGMTM3OTExRDlCNjgzMjAwMkJFQzU3IC8q IGxhcmdlLXZpZGVvLXRlc3Qtbm93LXBsYXlpbmcuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsg cGF0aCA9ICJsYXJnZS12aWRlby10ZXN0LW5vdy1wbGF5aW5nLmh0bWwiOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQlGNEY0MDVCQTFENEMwQ0Y4MDA3QTk3MDcgLyogZnVsbC1zaXplLWF1 dG9wbGF5aW5nLXZpZGVvLXdpdGgtYXVkaW8uaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0 aCA9ICJmdWxsLXNpemUtYXV0b3BsYXlpbmctdmlkZW8td2l0aC1hdWRpby5odG1sIjsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRjRGNDA1QkIxRDRDMENGODAwN0E5NzA3IC8qIHNraW5u eS1hdXRvcGxheWluZy12aWRlby13aXRoLWF1ZGlvLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7 IHBhdGggPSAic2tpbm55LWF1dG9wbGF5aW5nLXZpZGVvLXdpdGgtYXVkaW8uaHRtbCI7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00NDg0LDYgKzQ0ODcsNyBAQAogCQkJCTFBREJFRkJD MTMwQzZBMDEwMEQ2MUQxOSAvKiBzaW1wbGUtYWNjZWxlcmF0ZWQtY29tcG9zaXRpbmcuaHRtbCAq LywKIAkJCQlDMEFEQkU4NDEyRkNBNkI2MDBEMkMxMjkgLyogc2ltcGxlLWZvcm0uaHRtbCAqLywK IAkJCQkzM0RDODkwRTE0MTk1MzkzMDA3NDdFRjcgLyogc2ltcGxlLWlmcmFtZS5odG1sICovLAor CQkJCUY0RUM4MDkzMjYwRDJFNjIwMDEwMzExRCAvKiBzaW1wbGUtaW1hZ2Utb3ZlcmxheS5odG1s ICovLAogCQkJCUJDQUE0ODU1MTRBMDIxNjQwMDg4RkFDNCAvKiBzaW1wbGUtdGFsbC5odG1sICov LAogCQkJCUJDOTA5Nzc4MTI1NTcxQUIwMDA4Mzc1NiAvKiBzaW1wbGUuaHRtbCAqLywKIAkJCQk1 MUU3ODAzNjE5MTlBRkY4MDAxODI5QTIgLyogc2ltcGxlMi5odG1sICovLApkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvc2ltcGxlLWltYWdlLW92ZXJsYXkuaHRt bCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L3NpbXBsZS1pbWFnZS1vdmVybGF5 Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uOThjMGI3YTNhYjJkYjczZjdmNWJjZWNiYTIzMWRmM2JlMzhjYjQ4 YQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L3Np bXBsZS1pbWFnZS1vdmVybGF5Lmh0bWwKQEAgLTAsMCArMSwzMSBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lk dGgsIGluaXRpYWwtc2NhbGU9MSI+Cis8aGVhZD4KKzxzdHlsZT4KK2ltZyB7CisgICAgd2lkdGg6 IDMwMHB4OworICAgIGhlaWdodDogMjI1cHg7Cit9CisKK2JvZHksIGh0bWwgeworICAgIG1hcmdp bjogMDsKK30KKzwvc3R5bGU+Cis8c2NyaXB0PgorYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsICgp ID0+IHsKKyAgICBpZiAoIXdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgIHJldHVybjsKKworICAg IGludGVybmFscy5pbnN0YWxsSW1hZ2VPdmVybGF5KGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoImlt ZyIpLCBbeworICAgICAgICB0ZXh0IDogImZvb2JhciIsCisgICAgICAgIHRvcExlZnQgOiBuZXcg RE9NUG9pbnRSZWFkT25seSgwLCAwKSwKKyAgICAgICAgdG9wUmlnaHQgOiBuZXcgRE9NUG9pbnRS ZWFkT25seSgxLCAwKSwKKyAgICAgICAgYm90dG9tUmlnaHQgOiBuZXcgRE9NUG9pbnRSZWFkT25s eSgxLCAwLjUpLAorICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwg MC41KSwKKyAgICB9XSk7Cit9KTsKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+PGltZyBzcmM9 J3N1bnNldC1pbi1jdXBlcnRpbm8tNjAwcHguanBnJz48L2ltZz48L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0RyYWdBbmRE cm9wVGVzdHMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0RyYWdB bmREcm9wVGVzdHMubW0KaW5kZXggZWMzNTg4NGFmZTZmMzUxNTZkZWJhN2UzY2UyM2FkNTllOTA1 MWU3Yi4uM2Y2OTcxNTg2NTQzMDkzOGViMWQ1ODQyY2QwNTk0N2RmZDdiZWFlZCAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9EcmFnQW5kRHJvcFRlc3Rz Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRHJhZ0FuZERy b3BUZXN0cy5tbQpAQCAtMzAsNiArMzAsNyBAQAogCiAjaW1wb3J0ICJEcmFnQW5kRHJvcFNpbXVs YXRvci5oIgogI2ltcG9ydCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKKyNpbXBvcnQgIldLV2ViVmll d0NvbmZpZ3VyYXRpb25FeHRyYXMuaCIKICNpbXBvcnQgPFdlYktpdC9XS1ByZWZlcmVuY2VzUHJp dmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYkFyY2hpdmUuaD4KIApAQCAtMzgzLDQgKzM4NCwy MyBAQCBURVNUKERyYWdBbmREcm9wVGVzdHMsIENvbG9ySW5wdXRFdmVudHMpCiAKICNlbmRpZiAv LyBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUikKIAorI2lmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9O KQorCitURVNUKERyYWdBbmREcm9wVGVzdHMsIERyYWdFbGVtZW50V2l0aEltYWdlT3ZlcmxheSkK K3sKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSByZXRhaW5QdHIoW1dLV2ViVmlld0NvbmZpZ3Vy YXRpb24gX3Rlc3RfY29uZmlndXJhdGlvbldpdGhUZXN0UGx1Z0luQ2xhc3NOYW1lOkAiV2ViUHJv Y2Vzc1BsdWdJbldpdGhJbnRlcm5hbHMiIGNvbmZpZ3VyZUpTQ0ZvclRlc3Rpbmc6WUVTXSk7Cisg ICAgW1tjb25maWd1cmF0aW9uIHByZWZlcmVuY2VzXSBfc2V0TGFyZ2VJbWFnZUFzeW5jRGVjb2Rp bmdFbmFibGVkOk5PXTsKKworICAgIGF1dG8gc2ltdWxhdG9yID0gYWRvcHROUyhbW0RyYWdBbmRE cm9wU2ltdWxhdG9yIGFsbG9jXSBpbml0V2l0aFdlYlZpZXdGcmFtZTpOU01ha2VSZWN0KDAsIDAs IDQwMCwgNDAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBbW3Np bXVsYXRvciB3ZWJWaWV3XSBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6QCJzaW1wbGUt aW1hZ2Utb3ZlcmxheSJdOworCisgICAgW3NpbXVsYXRvciBydW5Gcm9tOk5TTWFrZVBvaW50KDE1 MCwgNDApIHRvOk5TTWFrZVBvaW50KDMwMCwgNDApXTsKKyAgICBFWFBFQ1RfRkFMU0UoW3NpbXVs YXRvciBjb250YWluc0RyYWdnZWRUeXBlOihfX2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVKUEVH XSk7CisKKyAgICBbc2ltdWxhdG9yIHJ1bkZyb206TlNNYWtlUG9pbnQoMTUwLCAyMDApIHRvOk5T TWFrZVBvaW50KDMwMCwgMjAwKV07CisgICAgRVhQRUNUX1RSVUUoW3NpbXVsYXRvciBjb250YWlu c0RyYWdnZWRUeXBlOihfX2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVKUEVHXSk7Cit9CisKKyNl bmRpZiAvLyBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKKwogI2VuZGlmIC8vIEVOQUJMRShEUkFH X1NVUFBPUlQpICYmICFQTEFURk9STShNQUNDQVRBTFlTVCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvbWFjL0RyYWdBbmREcm9wVGVzdHNNYWMubW0gYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL21hYy9EcmFnQW5kRHJvcFRlc3RzTWFjLm1tCmluZGV4IDI5OTUyMTU2 ZTk1YjBmZmU3YTA5Y2ZlYzM0ZGM5OGZhZjFjNTExOWYuLmZiZGYzYWE4ZjZkMGJmMjU2YzQ2NjY4 OTY4NjEzMGUzODVmM2NlODggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv bWFjL0RyYWdBbmREcm9wVGVzdHNNYWMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9tYWMvRHJhZ0FuZERyb3BUZXN0c01hYy5tbQpAQCAtMTQ4LDcgKzE0OCw2IEBAIFRFU1QoRHJh Z0FuZERyb3BUZXN0cywgRHJhZ0ltYWdlV2l0aE9wdGlvbktleURvd24pCiAgICAgRVhQRUNUX0VR KHBpZCwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CiB9CiAKLQogVEVTVChEcmFn QW5kRHJvcFRlc3RzLCBQcm92aWRlSW1hZ2VEYXRhRm9yTXVsdGlwbGVQYXN0ZWJvYXJkcykKIHsK ICAgICBhdXRvIHNpbXVsYXRvciA9IGFkb3B0TlMoW1tEcmFnQW5kRHJvcFNpbXVsYXRvciBhbGxv Y10gaW5pdFdpdGhXZWJWaWV3RnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA0MDAsIDQwMCldKTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvRHJhZ0FuZERyb3BTaW11bGF0b3Iu aCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvRHJhZ0FuZERyb3BTaW11bGF0b3IuaAppbmRl eCA3YTAzYmUzMzlmNTU3ZTNiYmM2NjllMmFkZGY2MzU2MmU2ZjcxNmUyLi45ZWZhOGU3NDNjODIx Y2NlYzVjNjgyYjE2ZWQwNzA1ODY2MWUwMmQ0IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL2NvY29hL0RyYWdBbmREcm9wU2ltdWxhdG9yLmgKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9jb2NvYS9EcmFnQW5kRHJvcFNpbXVsYXRvci5oCkBAIC0xMzksNiArMTM5LDggQEAgdHlwZWRl ZiBOU0RpY3Rpb25hcnk8TlNOdW1iZXIgKiwgTlNWYWx1ZSAqPiAqUHJvZ3Jlc3NUb0NHUG9pbnRW YWx1ZU1hcDsKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAorLSAoQk9PTCljb250YWluc0Ry YWdnZWRUeXBlOihOU1N0cmluZyAqKXR5cGU7CisKIEBlbmQKIAogI2VuZGlmIC8vIEVOQUJMRShE UkFHX1NVUFBPUlQpCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2lvcy9EcmFnQW5k RHJvcFNpbXVsYXRvcklPUy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvaW9zL0RyYWdBbmREcm9w U2ltdWxhdG9ySU9TLm1tCmluZGV4IGUwNDk5NWQ0MzM3MTYxMjI4OTQ2ZDQ3Mjk5ZTNkNmZlZDcy YzBlNTQuLjk4ZDE1NTc1MmRiYzBkMWVkZDdiMjgzY2Q0ODRjNThlZDAwMDBiNDEgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvaW9zL0RyYWdBbmREcm9wU2ltdWxhdG9ySU9TLm1tCisr KyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvaW9zL0RyYWdBbmREcm9wU2ltdWxhdG9ySU9TLm1tCkBA IC04NjMsNiArODYzLDE3IEBAIC0gKHZvaWQpX2ludm9rZURyb3BBbmltYXRpb25Db21wbGV0aW9u QmxvY2tzQW5kQ29uY2x1ZGVEcm9wCiAgICAgW1tfd2ViVmlldyBkcm9wSW50ZXJhY3Rpb25EZWxl Z2F0ZV0gZHJvcEludGVyYWN0aW9uOltfd2ViVmlldyBkcm9wSW50ZXJhY3Rpb25dIGNvbmNsdWRl RHJvcDpfZHJvcFNlc3Npb24uZ2V0KCldOwogfQogCistIChCT09MKWNvbnRhaW5zRHJhZ2dlZFR5 cGU6KE5TU3RyaW5nICopZXhwZWN0ZWRUeXBlCit7CisgICAgZm9yIChOU0l0ZW1Qcm92aWRlciAq aXRlbVByb3ZpZGVyIGluIHNlbGYuc291cmNlSXRlbVByb3ZpZGVycykgeworICAgICAgICBmb3Ig KE5TU3RyaW5nICp0eXBlIGluIGl0ZW1Qcm92aWRlci5yZWdpc3RlcmVkVHlwZUlkZW50aWZpZXJz KSB7CisgICAgICAgICAgICBpZiAoW3R5cGUgaXNFcXVhbFRvU3RyaW5nOmV4cGVjdGVkVHlwZV0p CisgICAgICAgICAgICAgICAgcmV0dXJuIFlFUzsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1 cm4gTk87Cit9CisKICNwcmFnbWEgbWFyayAtIFdLVUlEZWxlZ2F0ZVByaXZhdGUKIAogLSAodm9p ZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkYXRhSW50ZXJhY3Rpb246KFVJRHJhZ0lu dGVyYWN0aW9uICopaW50ZXJhY3Rpb24gc2Vzc2lvbldpbGxCZWdpbjooaWQgPFVJRHJhZ1Nlc3Np b24+KXNlc3Npb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvbWFjL0RyYWdBbmRE cm9wU2ltdWxhdG9yTWFjLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9tYWMvRHJhZ0FuZERyb3BT aW11bGF0b3JNYWMubW0KaW5kZXggNzg0ZWNmNTNmY2EyMDA5OGQ4YTRjNzdiZmNkMDM2NGExMDA5 YjIwYS4uNzY2ZjEwNWIwYWQyYzkwOGRlZTcwZGNhZDdmZmM0M2JmMDdjN2NkYyAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9tYWMvRHJhZ0FuZERyb3BTaW11bGF0b3JNYWMubW0KKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9tYWMvRHJhZ0FuZERyb3BTaW11bGF0b3JNYWMubW0KQEAg LTExNSw2ICsxMTUsOCBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhXZWJWaWV3RnJhbWU6KENH UmVjdClmcmFtZSBjb25maWd1cmF0aW9uOihXS1dlYlZpZXdDb25maQogICAgICAgICBfZmlsZVBy b21pc2VEZXN0aW5hdGlvblVSTHMgPSBhZG9wdE5TKFtOU011dGFibGVBcnJheSBuZXddKTsKICAg ICAgICAgW193ZWJWaWV3IHNldFVJRGVsZWdhdGU6c2VsZl07CiAgICAgICAgIHNlbGYuZHJhZ0Rl c3RpbmF0aW9uQWN0aW9uID0gV0tEcmFnRGVzdGluYXRpb25BY3Rpb25BbnkgJiB+V0tEcmFnRGVz dGluYXRpb25BY3Rpb25Mb2FkOworCisgICAgICAgIFtbTlNQYXN0ZWJvYXJkIHBhc3RlYm9hcmRX aXRoTmFtZTpOU1Bhc3RlYm9hcmROYW1lRHJhZ10gY2xlYXJDb250ZW50c107CiAgICAgfQogICAg IHJldHVybiBzZWxmOwogfQpAQCAtNDQ5LDYgKzQ1MSwxNSBAQCAtICh2b2lkKWVuZERhdGFUcmFu c2ZlcgogewogfQogCistIChCT09MKWNvbnRhaW5zRHJhZ2dlZFR5cGU6KE5TU3RyaW5nICopZXhw ZWN0ZWRUeXBlCit7CisgICAgZm9yIChOU1Bhc3RlYm9hcmRUeXBlIHR5cGUgaW4gW05TUGFzdGVi b2FyZCBwYXN0ZWJvYXJkV2l0aE5hbWU6TlNQYXN0ZWJvYXJkTmFtZURyYWddLnR5cGVzKSB7Cisg ICAgICAgIGlmIChbdHlwZSBpc0VxdWFsVG9TdHJpbmc6ZXhwZWN0ZWRUeXBlXSkKKyAgICAgICAg ICAgIHJldHVybiBZRVM7CisgICAgfQorICAgIHJldHVybiBOTzsKK30KKwogI3ByYWdtYSBtYXJr IC0gV0tVSURlbGVnYXRlUHJpdmF0ZQogCiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3 ZWJWaWV3IGRpZEluc2VydEF0dGFjaG1lbnQ6KF9XS0F0dGFjaG1lbnQgKilhdHRhY2htZW50IHdp dGhTb3VyY2U6KE5TU3RyaW5nICopc291cmNlCg==