215344 2020-08-10 16:12:39 -0700 Text manipulation crashes when replacing element with img role 2020-08-11 11:14:32 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu ews-watchlist mifenton webkit-bug-importer wenson_hsieh oldest_to_newest 1679237 0 sihui_liu 2020-08-10 16:12:39 -0700 ... 1679238 1 sihui_liu 2020-08-10 16:13:01 -0700 rdar://problem/65267930 1679309 2 406361 sihui_liu 2020-08-10 21:54:10 -0700 Created attachment 406361 Patch 1679460 3 406392 sihui_liu 2020-08-11 10:48:08 -0700 Created attachment 406392 Patch for landing 1679462 4 406393 sihui_liu 2020-08-11 10:48:59 -0700 Created attachment 406393 Patch for landing 1679474 5 ews-feeder 2020-08-11 11:14:31 -0700 Committed r265508: <https://trac.webkit.org/changeset/265508> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406393. 406361 2020-08-10 21:54:10 -0700 2020-08-11 10:48:06 -0700 Patch bug-215344-20200810215410.patch text/plain 7267 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2VhOTExN2VlYWU4MWJm ODYzMTQ5YTE2NDUxZWFiOWU3MDMxZDczNS4uYTg3YmQzZWYzYjQ0MGNhZjIyM2NiNmIyNmU5YmFj OWZiYzJiYmViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA4LTEwICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFRleHQgbWFuaXB1bGF0aW9u IGNyYXNoZXMgd2hlbiByZXBsYWNpbmcgZWxlbWVudCB3aXRoIGltZyByb2xlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUzNDQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBwb3NpdGlvbkluUGFyZW50QWZ0 ZXJOb2RlIGFuZCBwb3NpdGlvbkluUGFyZW50QmVmb3JlTm9kZSBkbyBub3QgcmV0dXJuIFBvc2l0 aW9uIHdpdGggTm9kZXMgdGhhdCBhcmUgaWdub3JlZCBieSAKKyAgICAgICAgZWRpdGluZy4gRWxl bWVudCB3aXRoIGltZyByb2xlIGlzIG9uZSBvZiBzdWNoIE5vZGVzLiBIb3dldmVyLCBUZXh0TWFu aXB1bGF0aW9uQ29udHJvbGxlciBjYW4gbWFuaXB1bGF0ZSBjb250ZW50IAorICAgICAgICBvZiBj aGlsZHJlbiBvZiB0aGUgaWdub3JlZCBOb2Rlcy4gU2VlIHRoZSBuZXdseSBhZGRlZCB0ZXN0LiBU aGVyZWZvcmUsIHdlJ2QgYmV0dGVyIG5vdCB1c2UgCisgICAgICAgIHBvc2l0aW9uSW5QYXJlbnRC ZWZvcmVOb2RlIG9yIHBvc2l0aW9uSW5QYXJlbnRCZWZvcmVOb2RlIGluIFRleHRNYW5pcHVsYXRp b25Db250cm9sbGVyOjpyZXBsYWNlLCBiZWNhdXNlIHRoZSAKKyAgICAgICAgaW5zZXJ0aW9uIHBv c2l0aW9uIGNhbiBiZSBpbnNpZGUgYSBpZ25vcmVkIE5vZGUuCisKKyAgICAgICAgQVBJIFRlc3Q6 IFRleHRNYW5pcHVsYXRpb24uQ29tcGxldGVUZXh0TWFuaXB1bGF0aW9uU2hvdWxkUmVwbGFjZUNv bnRlbnRJZ25vcmVkQnlFZGl0aW5nCisKKyAgICAgICAgKiBlZGl0aW5nL1RleHRNYW5pcHVsYXRp b25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRNYW5pcHVsYXRpb25Db250 cm9sbGVyOjpyZXBsYWNlKToKKwogMjAyMC0wOC0wOSAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWJv dWhhbGxhd2FAYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10gRHJhZy9kcm9wIGFuIGltYWdl IG9mIGEgdW5zdXBwb3J0ZWQgZm9ybWF0IHRvIGFuIGZpbGUgaW5wdXQgZWxlbWVudCBzaG91bGQg Y29udmVydCBpdCB0byBhIHN1cHBvcnRlZCBmb3JtYXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHAKaW5kZXggNGVlNWU2Yzk2 YjExOTg4YmQzOGRlYTZkNjVkMDQ4YjdmOGY4NWRkNS4uZjViMzA5YjhlYTVmYmE4NGNhNWEwMjc0 MWY0YzEyZDY1OTc5MzI1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0 TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9U ZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHAKQEAgLTg2MSwxNCArODYxLDEyIEBAIGF1dG8g VGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXI6OnJlcGxhY2UoY29uc3QgTWFuaXB1bGF0aW9uSXRl bURhdGEmIGl0ZW0sIGNvbnN0CiAgICAgICAgIHVwZGF0ZUluc2VydGlvbnMobGFzdFRvcERvd25Q YXRoLCB0b3BEb3duUGF0aCwgcmVwbGFjZW1lbnROb2RlLmdldCgpLCByZXVzZWRPcmlnaW5hbE5v ZGVzLCBpbnNlcnRpb25zKTsKICAgICB9CiAKLSAgICBhdXRvIGVuZCA9IGxhc3RDaGlsZE9mQ29t bW9uQW5jZXN0b3JJblJhbmdlID8gcG9zaXRpb25JblBhcmVudEFmdGVyTm9kZShsYXN0Q2hpbGRP ZkNvbW1vbkFuY2VzdG9ySW5SYW5nZS5nZXQoKSkgOiBwb3NpdGlvbkFmdGVyTm9kZShjb21tb25B bmNlc3Rvci5nZXQoKSk7CiAgICAgUmVmUHRyPE5vZGU+IG5vZGUgPSBpdGVtLmVuZC5maXJzdE5v ZGUoKTsKLSAgICBSZWZQdHI8Tm9kZT4gZW5kTm9kZSA9IGVuZC5maXJzdE5vZGUoKTsKLSAgICBp ZiAobm9kZSAmJiBub2RlICE9IGVuZE5vZGUpIHsKKyAgICBpZiAobm9kZSAmJiBsYXN0Q2hpbGRP ZkNvbW1vbkFuY2VzdG9ySW5SYW5nZS0+Y29udGFpbnMobm9kZS5nZXQoKSkpIHsKICAgICAgICAg YXV0byB0b3BEb3duUGF0aCA9IGdldFBhdGgoY29tbW9uQW5jZXN0b3IuZ2V0KCksIG5vZGUtPnBh cmVudE5vZGUoKSk7CiAgICAgICAgIHVwZGF0ZUluc2VydGlvbnMobGFzdFRvcERvd25QYXRoLCB0 b3BEb3duUGF0aCwgbnVsbHB0ciwgcmV1c2VkT3JpZ2luYWxOb2RlcywgaW5zZXJ0aW9ucyk7CiAg ICAgfQotICAgIHdoaWxlIChub2RlICE9IGVuZE5vZGUpIHsKKyAgICB3aGlsZSAobGFzdENoaWxk T2ZDb21tb25BbmNlc3RvckluUmFuZ2UtPmNvbnRhaW5zKG5vZGUuZ2V0KCkpKSB7CiAgICAgICAg IFJlZjxOb2RlPiBwYXJlbnROb2RlID0gKm5vZGUtPnBhcmVudE5vZGUoKTsKICAgICAgICAgd2hp bGUgKCFsYXN0VG9wRG93blBhdGguaXNFbXB0eSgpICYmIGxhc3RUb3BEb3duUGF0aC5sYXN0KCku Zmlyc3QucHRyKCkgIT0gcGFyZW50Tm9kZS5wdHIoKSkKICAgICAgICAgICAgIGxhc3RUb3BEb3du UGF0aC5yZW1vdmVMYXN0KCk7CkBAIC04NzgsMjEgKzg3NiwxOCBAQCBhdXRvIFRleHRNYW5pcHVs YXRpb25Db250cm9sbGVyOjpyZXBsYWNlKGNvbnN0IE1hbmlwdWxhdGlvbkl0ZW1EYXRhJiBpdGVt LCBjb25zdAogICAgICAgICBub2RlID0gTm9kZVRyYXZlcnNhbDo6bmV4dCgqbm9kZSk7CiAgICAg fQogCi0gICAgUG9zaXRpb24gaW5zZXJ0aW9uUG9pbnQgPSBwb3NpdGlvbkJlZm9yZU5vZGUoZmly c3RDb250ZW50Tm9kZS5nZXQoKSkucGFyZW50QW5jaG9yZWRFcXVpdmFsZW50KCk7Ci0gICAgd2hp bGUgKGluc2VydGlvblBvaW50LmNvbnRhaW5lck5vZGUoKSAhPSBjb21tb25BbmNlc3RvcikKLSAg ICAgICAgaW5zZXJ0aW9uUG9pbnQgPSBwb3NpdGlvbkluUGFyZW50QmVmb3JlTm9kZShpbnNlcnRp b25Qb2ludC5jb250YWluZXJOb2RlKCkpOworICAgIFJlZlB0cjxOb2RlPiBpbnNlcnRpb25Qb2lu dE5vZGUgPSBsYXN0Q2hpbGRPZkNvbW1vbkFuY2VzdG9ySW5SYW5nZS0+bmV4dFNpYmxpbmcoKTsK IAogICAgIGZvciAoYXV0byYgbm9kZSA6IG5vZGVzVG9SZW1vdmUpCiAgICAgICAgIG5vZGUtPnJl bW92ZSgpOwogCiAgICAgZm9yIChhdXRvJiBpbnNlcnRpb24gOiBpbnNlcnRpb25zKSB7CiAgICAg ICAgIGF1dG8gcGFyZW50Q29udGFpbmVyID0gaW5zZXJ0aW9uLnBhcmVudElmRGlmZmVyZW50RnJv bUNvbW1vbkFuY2VzdG9yOwotICAgICAgICBpZiAoIWluc2VydGlvbi5wYXJlbnRJZkRpZmZlcmVu dEZyb21Db21tb25BbmNlc3RvcikgewotICAgICAgICAgICAgcGFyZW50Q29udGFpbmVyID0gaW5z ZXJ0aW9uUG9pbnQuY29udGFpbmVyTm9kZSgpOwotICAgICAgICAgICAgcGFyZW50Q29udGFpbmVy LT5pbnNlcnRCZWZvcmUoaW5zZXJ0aW9uLmNoaWxkLCBpbnNlcnRpb25Qb2ludC5jb21wdXRlTm9k ZUFmdGVyUG9zaXRpb24oKSk7Ci0gICAgICAgICAgICBpbnNlcnRpb25Qb2ludCA9IHBvc2l0aW9u SW5QYXJlbnRBZnRlck5vZGUoaW5zZXJ0aW9uLmNoaWxkLnB0cigpKTsKKyAgICAgICAgaWYgKCFw YXJlbnRDb250YWluZXIpIHsKKyAgICAgICAgICAgIHBhcmVudENvbnRhaW5lciA9IGNvbW1vbkFu Y2VzdG9yOworICAgICAgICAgICAgcGFyZW50Q29udGFpbmVyLT5pbnNlcnRCZWZvcmUoaW5zZXJ0 aW9uLmNoaWxkLCBpbnNlcnRpb25Qb2ludE5vZGUuZ2V0KCkpOwogICAgICAgICB9IGVsc2UKLSAg ICAgICAgICAgIGluc2VydGlvbi5wYXJlbnRJZkRpZmZlcmVudEZyb21Db21tb25BbmNlc3Rvci0+ YXBwZW5kQ2hpbGQoaW5zZXJ0aW9uLmNoaWxkKTsKKyAgICAgICAgICAgIHBhcmVudENvbnRhaW5l ci0+YXBwZW5kQ2hpbGQoaW5zZXJ0aW9uLmNoaWxkKTsKIAogICAgICAgICBpZiAoYXV0byogYm94 ID0gcGFyZW50Q29udGFpbmVyLT5yZW5kZXJCb3goKSkgewogICAgICAgICAgICAgaWYgKCFib3gt Pmhhc1Zpc3VhbE92ZXJmbG93KCkpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggYzIxZTQzZTYxMDBkZGI3ODk5MTNlMTgzYjBhY2I3ZmIwMDYxOGI1 MC4uY2I3ZWVlN2Q1OTlkZTYwNjgzN2RhNTQxM2U5Yzk0Zjk3NTc2OTQ0ZSAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisy MDIwLTA4LTEwICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFRl eHQgbWFuaXB1bGF0aW9uIGNyYXNoZXMgd2hlbiByZXBsYWNpbmcgZWxlbWVudCB3aXRoIGltZyBy b2xlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUz NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5tbToKKyAgICAg ICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDIwLTA4LTA5ICBXZW5zb24gSHNpZWggIDx3 ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNjA4MzEpOiBX ZWIgcHJvY2VzcyBjcmFzaGVzIHVuZGVyIEVkaXRvcjo6c2V0Q29tcG9zaXRpb24oKSBhZnRlciBu YXZpZ2F0aW5nIHdpdGggbWFya2VkIHRleHQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5tbQppbmRleCAzOGM2YTVh ZWIzNDNmYmNiZjI1ZjVlYzc0NTk1NDUwNDQ4MjI4MGYxLi5jY2M4YzU2OWNmNjgxNTBkODM3ODRi ZDIzODE0ZGM1YTliNmVmZjNkIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1bGF0aW9uLm1tCkBAIC0zMDgyLDYgKzMwODIs NDggQEAgVEVTVChUZXh0TWFuaXB1bGF0aW9uLCBDb21wbGV0ZVRleHRNYW5pcHVsYXRpb25QYXJh Z3JhcGhzQ29udGFpbkNvbGxhcHNlZFNwYWNlcykKICAgICBFWFBFQ1RfV0tfU1RSRVEoIjxzcGFu PkhlbGxvPC9zcGFuPjxzcGFuPldvcmxkPC9zcGFuPiIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVh dGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5ib2R5LmlubmVySFRNTCJdKTsKIH0KIAorVEVTVChU ZXh0TWFuaXB1bGF0aW9uLCBDb21wbGV0ZVRleHRNYW5pcHVsYXRpb25TaG91bGRSZXBsYWNlQ29u dGVudElnbm9yZWRCeUVkaXRpbmcpCit7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tU ZXh0TWFuaXB1bGF0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBhdXRvIHdlYlZpZXcg PSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0 KDAsIDAsIDQwMCwgNDAwKV0pOworICAgIFt3ZWJWaWV3IF9zZXRUZXh0TWFuaXB1bGF0aW9uRGVs ZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkSFRN TFN0cmluZzpAIjwhRE9DVFlQRSBodG1sPiIKKyAgICAgICAgIjxib2R5PiIKKyAgICAgICAgIjxk aXYgcm9sZT0naW1nJz4iCisgICAgICAgICAgICAiaW1hZ2VzIgorICAgICAgICAgICAgIjxhPmxp bms8L2E+IgorICAgICAgICAgICAgIjxpbWcgaWQ9J3BpYzEnIHNyYz0naGVsbG8ucG5nJz4iCisg ICAgICAgICAgICAiPGltZyBpZD0ncGljMicgc3JjPSd3ZWJraXQucG5nJz4iCisgICAgICAgICI8 L2Rpdj4iCisgICAgICAgICI8L2JvZHk+Il07CisKKyAgICBkb25lID0gZmFsc2U7CisgICAgW3dl YlZpZXcgX3N0YXJ0VGV4dE1hbmlwdWxhdGlvbnNXaXRoQ29uZmlndXJhdGlvbjpuaWwgY29tcGxl dGlvbjpeeworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpydW4oJmRvbmUpOworCisgICAgYXV0byBpdGVtcyA9IFtkZWxlZ2F0ZSBpdGVtc107 CisgICAgRVhQRUNUX0VRKGl0ZW1zLmNvdW50LCAxVUwpOworICAgIEVYUEVDVF9FUShpdGVtc1sw XS50b2tlbnMuY291bnQsIDJVTCk7CisgICAgRVhQRUNUX1dLX1NUUkVRKCJpbWFnZXMiLCBpdGVt c1swXS50b2tlbnNbMF0uY29udGVudCk7CisgICAgRVhQRUNUX1dLX1NUUkVRKCJsaW5rIiwgaXRl bXNbMF0udG9rZW5zWzFdLmNvbnRlbnQpOworCisgICAgZG9uZSA9IGZhbHNlOworICAgIFt3ZWJW aWV3IF9jb21wbGV0ZVRleHRNYW5pcHVsYXRpb25Gb3JJdGVtczpAWworICAgICAgICBjcmVhdGVJ dGVtKGl0ZW1zWzBdLmlkZW50aWZpZXIsIHsKKyAgICAgICAgICAgIHsgaXRlbXNbMF0udG9rZW5z WzBdLmlkZW50aWZpZXIsIEAiSW1hZ2VzIiB9LAorICAgICAgICAgICAgeyBpdGVtc1swXS50b2tl bnNbMV0uaWRlbnRpZmllciwgQCJMaW5rIiB9CisgICAgfSkuZ2V0KCksCisgICAgXSBjb21wbGV0 aW9uOl4oTlNBcnJheTxOU0Vycm9yICo+ICplcnJvcnMpIHsKKyAgICAgICAgRVhQRUNUX0VRKGVy cm9ycywgbmlsKTsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktp dEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKworICAgIEVYUEVDVF9XS19TVFJFUSgiPGRpdiByb2xl PVwiaW1nXCI+SW1hZ2VzPGE+TGluazwvYT48aW1nIGlkPVwicGljMVwiIHNyYz1cImhlbGxvLnBu Z1wiPjxpbWcgaWQ9XCJwaWMyXCIgc3JjPVwid2Via2l0LnBuZ1wiPjwvZGl2PiIsIFt3ZWJWaWV3 IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5ib2R5LmlubmVySFRNTCJd KTsKK30KKwogVEVTVChUZXh0TWFuaXB1bGF0aW9uLCBUZXh0TWFuaXB1bGF0aW9uVG9rZW5EZWJ1 Z0Rlc2NyaXB0aW9uKQogewogICAgIGF1dG8gdG9rZW4gPSBhZG9wdE5TKFtbX1dLVGV4dE1hbmlw dWxhdGlvblRva2VuIGFsbG9jXSBpbml0XSk7Cg== 406392 2020-08-11 10:48:08 -0700 2020-08-11 10:48:58 -0700 Patch for landing bug-215344-20200811104807.patch text/plain 7156 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRmZWE2MjZhNTNiMDQ0 MTJiYTVhZDRlNDEyNGQzMTliZjE4Y2U0NS4uZjFjOGY2MDBlZTY2ZjdlOTFjM2MzOGRiMzdiNjgw NWZmMGMyNWZmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA4LTExICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFRleHQgbWFuaXB1bGF0aW9u IGNyYXNoZXMgd2hlbiByZXBsYWNpbmcgZWxlbWVudCB3aXRoIGltZyByb2xlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUzNDQKKworICAgICAgICBS ZXZpZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgcG9zaXRpb25JblBhcmVudEFmdGVy Tm9kZSBhbmQgcG9zaXRpb25JblBhcmVudEJlZm9yZU5vZGUgZG8gbm90IHJldHVybiBQb3NpdGlv biB3aXRoIE5vZGVzIHRoYXQgYXJlIGlnbm9yZWQgYnkgCisgICAgICAgIGVkaXRpbmcuIEVsZW1l bnQgd2l0aCBpbWcgcm9sZSBpcyBvbmUgb2Ygc3VjaCBOb2Rlcy4gSG93ZXZlciwgVGV4dE1hbmlw dWxhdGlvbkNvbnRyb2xsZXIgY2FuIG1hbmlwdWxhdGUgY29udGVudCAKKyAgICAgICAgb2YgY2hp bGRyZW4gb2YgdGhlIGlnbm9yZWQgTm9kZXMgKHNlZSB0aGUgbmV3bHkgYWRkZWQgdGVzKS4gVGhl cmVmb3JlLCB3ZSdkIGJldHRlciBub3QgdXNlIAorICAgICAgICBwb3NpdGlvbkluUGFyZW50QmVm b3JlTm9kZSBvciBwb3NpdGlvbkluUGFyZW50QmVmb3JlTm9kZSBpbiBUZXh0TWFuaXB1bGF0aW9u Q29udHJvbGxlcjo6cmVwbGFjZSwgYmVjYXVzZSB0aGUgCisgICAgICAgIGluc2VydGlvbiBwb3Np dGlvbiBjYW4gYmUgaW5zaWRlIGEgaWdub3JlZCBOb2RlLgorCisgICAgICAgIEFQSSBUZXN0OiBU ZXh0TWFuaXB1bGF0aW9uLkNvbXBsZXRlVGV4dE1hbmlwdWxhdGlvblNob3VsZFJlcGxhY2VDb250 ZW50SWdub3JlZEJ5RWRpdGluZworCisgICAgICAgICogZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9u Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0TWFuaXB1bGF0aW9uQ29udHJv bGxlcjo6cmVwbGFjZSk6CisKIDIwMjAtMDgtMTEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbQXV0b1RhYmxlTGF5b3V0XSBSRUdSRVNTSU9OKHIyNjM4NTUpIFBh eXBhbCBlbWFpbCBpcyByZW5kZXJlZCByaWdodCBhbGlnbmVkIG9uIFNhZmFyaQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRNYW5pcHVsYXRpb25Db250cm9sbGVyLmNwcApp bmRleCA0ZWU1ZTZjOTZiMTE5ODhiZDM4ZGVhNmQ2NWQwNDhiN2Y4Zjg1ZGQ1Li5mNWIzMDliOGVh NWZiYTg0Y2E1YTAyNzQxZjRjMTJkNjU5NzkzMjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL1RleHRNYW5pcHVsYXRpb25Db250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL1RleHRNYW5pcHVsYXRpb25Db250cm9sbGVyLmNwcApAQCAtODYxLDE0ICs4 NjEsMTIgQEAgYXV0byBUZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlcjo6cmVwbGFjZShjb25zdCBN YW5pcHVsYXRpb25JdGVtRGF0YSYgaXRlbSwgY29uc3QKICAgICAgICAgdXBkYXRlSW5zZXJ0aW9u cyhsYXN0VG9wRG93blBhdGgsIHRvcERvd25QYXRoLCByZXBsYWNlbWVudE5vZGUuZ2V0KCksIHJl dXNlZE9yaWdpbmFsTm9kZXMsIGluc2VydGlvbnMpOwogICAgIH0KIAotICAgIGF1dG8gZW5kID0g bGFzdENoaWxkT2ZDb21tb25BbmNlc3RvckluUmFuZ2UgPyBwb3NpdGlvbkluUGFyZW50QWZ0ZXJO b2RlKGxhc3RDaGlsZE9mQ29tbW9uQW5jZXN0b3JJblJhbmdlLmdldCgpKSA6IHBvc2l0aW9uQWZ0 ZXJOb2RlKGNvbW1vbkFuY2VzdG9yLmdldCgpKTsKICAgICBSZWZQdHI8Tm9kZT4gbm9kZSA9IGl0 ZW0uZW5kLmZpcnN0Tm9kZSgpOwotICAgIFJlZlB0cjxOb2RlPiBlbmROb2RlID0gZW5kLmZpcnN0 Tm9kZSgpOwotICAgIGlmIChub2RlICYmIG5vZGUgIT0gZW5kTm9kZSkgeworICAgIGlmIChub2Rl ICYmIGxhc3RDaGlsZE9mQ29tbW9uQW5jZXN0b3JJblJhbmdlLT5jb250YWlucyhub2RlLmdldCgp KSkgewogICAgICAgICBhdXRvIHRvcERvd25QYXRoID0gZ2V0UGF0aChjb21tb25BbmNlc3Rvci5n ZXQoKSwgbm9kZS0+cGFyZW50Tm9kZSgpKTsKICAgICAgICAgdXBkYXRlSW5zZXJ0aW9ucyhsYXN0 VG9wRG93blBhdGgsIHRvcERvd25QYXRoLCBudWxscHRyLCByZXVzZWRPcmlnaW5hbE5vZGVzLCBp bnNlcnRpb25zKTsKICAgICB9Ci0gICAgd2hpbGUgKG5vZGUgIT0gZW5kTm9kZSkgeworICAgIHdo aWxlIChsYXN0Q2hpbGRPZkNvbW1vbkFuY2VzdG9ySW5SYW5nZS0+Y29udGFpbnMobm9kZS5nZXQo KSkpIHsKICAgICAgICAgUmVmPE5vZGU+IHBhcmVudE5vZGUgPSAqbm9kZS0+cGFyZW50Tm9kZSgp OwogICAgICAgICB3aGlsZSAoIWxhc3RUb3BEb3duUGF0aC5pc0VtcHR5KCkgJiYgbGFzdFRvcERv d25QYXRoLmxhc3QoKS5maXJzdC5wdHIoKSAhPSBwYXJlbnROb2RlLnB0cigpKQogICAgICAgICAg ICAgbGFzdFRvcERvd25QYXRoLnJlbW92ZUxhc3QoKTsKQEAgLTg3OCwyMSArODc2LDE4IEBAIGF1 dG8gVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXI6OnJlcGxhY2UoY29uc3QgTWFuaXB1bGF0aW9u SXRlbURhdGEmIGl0ZW0sIGNvbnN0CiAgICAgICAgIG5vZGUgPSBOb2RlVHJhdmVyc2FsOjpuZXh0 KCpub2RlKTsKICAgICB9CiAKLSAgICBQb3NpdGlvbiBpbnNlcnRpb25Qb2ludCA9IHBvc2l0aW9u QmVmb3JlTm9kZShmaXJzdENvbnRlbnROb2RlLmdldCgpKS5wYXJlbnRBbmNob3JlZEVxdWl2YWxl bnQoKTsKLSAgICB3aGlsZSAoaW5zZXJ0aW9uUG9pbnQuY29udGFpbmVyTm9kZSgpICE9IGNvbW1v bkFuY2VzdG9yKQotICAgICAgICBpbnNlcnRpb25Qb2ludCA9IHBvc2l0aW9uSW5QYXJlbnRCZWZv cmVOb2RlKGluc2VydGlvblBvaW50LmNvbnRhaW5lck5vZGUoKSk7CisgICAgUmVmUHRyPE5vZGU+ IGluc2VydGlvblBvaW50Tm9kZSA9IGxhc3RDaGlsZE9mQ29tbW9uQW5jZXN0b3JJblJhbmdlLT5u ZXh0U2libGluZygpOwogCiAgICAgZm9yIChhdXRvJiBub2RlIDogbm9kZXNUb1JlbW92ZSkKICAg ICAgICAgbm9kZS0+cmVtb3ZlKCk7CiAKICAgICBmb3IgKGF1dG8mIGluc2VydGlvbiA6IGluc2Vy dGlvbnMpIHsKICAgICAgICAgYXV0byBwYXJlbnRDb250YWluZXIgPSBpbnNlcnRpb24ucGFyZW50 SWZEaWZmZXJlbnRGcm9tQ29tbW9uQW5jZXN0b3I7Ci0gICAgICAgIGlmICghaW5zZXJ0aW9uLnBh cmVudElmRGlmZmVyZW50RnJvbUNvbW1vbkFuY2VzdG9yKSB7Ci0gICAgICAgICAgICBwYXJlbnRD b250YWluZXIgPSBpbnNlcnRpb25Qb2ludC5jb250YWluZXJOb2RlKCk7Ci0gICAgICAgICAgICBw YXJlbnRDb250YWluZXItPmluc2VydEJlZm9yZShpbnNlcnRpb24uY2hpbGQsIGluc2VydGlvblBv aW50LmNvbXB1dGVOb2RlQWZ0ZXJQb3NpdGlvbigpKTsKLSAgICAgICAgICAgIGluc2VydGlvblBv aW50ID0gcG9zaXRpb25JblBhcmVudEFmdGVyTm9kZShpbnNlcnRpb24uY2hpbGQucHRyKCkpOwor ICAgICAgICBpZiAoIXBhcmVudENvbnRhaW5lcikgeworICAgICAgICAgICAgcGFyZW50Q29udGFp bmVyID0gY29tbW9uQW5jZXN0b3I7CisgICAgICAgICAgICBwYXJlbnRDb250YWluZXItPmluc2Vy dEJlZm9yZShpbnNlcnRpb24uY2hpbGQsIGluc2VydGlvblBvaW50Tm9kZS5nZXQoKSk7CiAgICAg ICAgIH0gZWxzZQotICAgICAgICAgICAgaW5zZXJ0aW9uLnBhcmVudElmRGlmZmVyZW50RnJvbUNv bW1vbkFuY2VzdG9yLT5hcHBlbmRDaGlsZChpbnNlcnRpb24uY2hpbGQpOworICAgICAgICAgICAg cGFyZW50Q29udGFpbmVyLT5hcHBlbmRDaGlsZChpbnNlcnRpb24uY2hpbGQpOwogCiAgICAgICAg IGlmIChhdXRvKiBib3ggPSBwYXJlbnRDb250YWluZXItPnJlbmRlckJveCgpKSB7CiAgICAgICAg ICAgICBpZiAoIWJveC0+aGFzVmlzdWFsT3ZlcmZsb3coKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkYTczMjk5ODUwYzAwNWYzNjA2YWNmODQy ZjRlODE0MjBkODY1ZjFkLi43ZjI4ZTAwNThiM2Q3NGRiYjBlNTU0YmNiMjQ0ZjlkN2E4MjJiYjk2 IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTMgQEAKKzIwMjAtMDgtMTEgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+ CisKKyAgICAgICAgVGV4dCBtYW5pcHVsYXRpb24gY3Jhc2hlcyB3aGVuIHJlcGxhY2luZyBlbGVt ZW50IHdpdGggaW1nIHJvbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNTM0NAorCisgICAgICAgIFJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKwor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlv bi5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDIwLTA4LTExICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVd IEFkZCBNaW5pQnJvd3NlciB3cmFwcGVyIGVudiB2YXJzIGFuZCB3aGl0ZS1saXN0IE1FU0EgZW52 IHZhcnMgaW4gZmxhdHBhawpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9UZXh0TWFuaXB1bGF0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1bGF0aW9uLm1tCmluZGV4IDM4YzZhNWFlYjM0M2ZiY2Jm MjVmNWVjNzQ1OTU0NTA0NDgyMjgwZjEuLmQ0ZTIxNWQ0OTVkNzc1ODBmZTQ2ZDEyM2JiYjdjNThj YjNkYzg0ZmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvVGV4dE1hbmlwdWxhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW0KQEAgLTMwODIsNiArMzA4Miw0OCBAQCBURVNU KFRleHRNYW5pcHVsYXRpb24sIENvbXBsZXRlVGV4dE1hbmlwdWxhdGlvblBhcmFncmFwaHNDb250 YWluQ29sbGFwc2VkU3BhY2VzKQogICAgIEVYUEVDVF9XS19TVFJFUSgiPHNwYW4+SGVsbG88L3Nw YW4+PHNwYW4+V29ybGQ8L3NwYW4+IiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNj cmlwdDpAImRvY3VtZW50LmJvZHkuaW5uZXJIVE1MIl0pOwogfQogCitURVNUKFRleHRNYW5pcHVs YXRpb24sIENvbXBsZXRlVGV4dE1hbmlwdWxhdGlvblNob3VsZFJlcGxhY2VDb250ZW50SWdub3Jl ZEJ5RWRpdGluZykKK3sKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW1RleHRNYW5pcHVs YXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMo W1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgNDAw LCA0MDApXSk7CisgICAgW3dlYlZpZXcgX3NldFRleHRNYW5pcHVsYXRpb25EZWxlZ2F0ZTpkZWxl Z2F0ZS5nZXQoKV07CisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAi PCFET0NUWVBFIGh0bWw+IgorICAgICAgICAiPGJvZHk+IgorICAgICAgICAiPGRpdiByb2xlPSdp bWcnPiIKKyAgICAgICAgICAgICJpbWFnZXMiCisgICAgICAgICAgICAiPGE+bGluazwvYT4iCisg ICAgICAgICAgICAiPGltZyBzcmM9J2hlbGxvLnBuZyc+IgorICAgICAgICAgICAgIjxpbWcgc3Jj PSd3ZWJraXQucG5nJz4iCisgICAgICAgICI8L2Rpdj4iCisgICAgICAgICI8L2JvZHk+Il07CisK KyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYlZpZXcgX3N0YXJ0VGV4dE1hbmlwdWxhdGlvbnNX aXRoQ29uZmlndXJhdGlvbjpuaWwgY29tcGxldGlvbjpeeworICAgICAgICBkb25lID0gdHJ1ZTsK KyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworCisgICAgYXV0 byBpdGVtcyA9IFtkZWxlZ2F0ZSBpdGVtc107CisgICAgRVhQRUNUX0VRKGl0ZW1zLmNvdW50LCAx VUwpOworICAgIEVYUEVDVF9FUShpdGVtc1swXS50b2tlbnMuY291bnQsIDJVTCk7CisgICAgRVhQ RUNUX1dLX1NUUkVRKCJpbWFnZXMiLCBpdGVtc1swXS50b2tlbnNbMF0uY29udGVudCk7CisgICAg RVhQRUNUX1dLX1NUUkVRKCJsaW5rIiwgaXRlbXNbMF0udG9rZW5zWzFdLmNvbnRlbnQpOworCisg ICAgZG9uZSA9IGZhbHNlOworICAgIFt3ZWJWaWV3IF9jb21wbGV0ZVRleHRNYW5pcHVsYXRpb25G b3JJdGVtczpAWworICAgICAgICBjcmVhdGVJdGVtKGl0ZW1zWzBdLmlkZW50aWZpZXIsIHsKKyAg ICAgICAgICAgIHsgaXRlbXNbMF0udG9rZW5zWzBdLmlkZW50aWZpZXIsIEAiSW1hZ2VzIiB9LAor ICAgICAgICAgICAgeyBpdGVtc1swXS50b2tlbnNbMV0uaWRlbnRpZmllciwgQCJMaW5rIiB9Cisg ICAgfSkuZ2V0KCksCisgICAgXSBjb21wbGV0aW9uOl4oTlNBcnJheTxOU0Vycm9yICo+ICplcnJv cnMpIHsKKyAgICAgICAgRVhQRUNUX0VRKGVycm9ycywgbmlsKTsKKyAgICAgICAgZG9uZSA9IHRy dWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKworICAg IEVYUEVDVF9XS19TVFJFUSgiPGRpdiByb2xlPVwiaW1nXCI+SW1hZ2VzPGE+TGluazwvYT48aW1n IHNyYz1cImhlbGxvLnBuZ1wiPjxpbWcgc3JjPVwid2Via2l0LnBuZ1wiPjwvZGl2PiIsIFt3ZWJW aWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5ib2R5LmlubmVySFRN TCJdKTsKK30KKwogVEVTVChUZXh0TWFuaXB1bGF0aW9uLCBUZXh0TWFuaXB1bGF0aW9uVG9rZW5E ZWJ1Z0Rlc2NyaXB0aW9uKQogewogICAgIGF1dG8gdG9rZW4gPSBhZG9wdE5TKFtbX1dLVGV4dE1h bmlwdWxhdGlvblRva2VuIGFsbG9jXSBpbml0XSk7Cg== 406393 2020-08-11 10:48:59 -0700 2020-08-11 11:14:32 -0700 Patch for landing bug-215344-20200811104859.patch text/plain 7152 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRmZWE2MjZhNTNiMDQ0 MTJiYTVhZDRlNDEyNGQzMTliZjE4Y2U0NS4uZDg5YmM2NzQ4OWM0OGQ0ZmNkMjczNjZiYTZmMTQ1 ZTNlZmQ1ZmE0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA4LTExICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFRleHQgbWFuaXB1bGF0aW9u IGNyYXNoZXMgd2hlbiByZXBsYWNpbmcgZWxlbWVudCB3aXRoIGltZyByb2xlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUzNDQKKworICAgICAgICBS ZXZpZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgcG9zaXRpb25JblBhcmVudEFmdGVy Tm9kZSBhbmQgcG9zaXRpb25JblBhcmVudEJlZm9yZU5vZGUgZG8gbm90IHJldHVybiBQb3NpdGlv biB3aXRoIE5vZGVzIHRoYXQgYXJlIGlnbm9yZWQgYnkgCisgICAgICAgIGVkaXRpbmcuIEVsZW1l bnQgd2l0aCBpbWcgcm9sZSBpcyBvbmUgb2Ygc3VjaCBOb2Rlcy4gSG93ZXZlciwgVGV4dE1hbmlw dWxhdGlvbkNvbnRyb2xsZXIgY2FuIG1hbmlwdWxhdGUgY29udGVudCAKKyAgICAgICAgb2YgY2hp bGRyZW4gb2YgdGhlIGlnbm9yZWQgTm9kZXMgKHNlZSB0aGUgbmV3bHkgYWRkZWQgdGVzdCkuIFRo ZXJlZm9yZSwgd2UnZCBiZXR0ZXIgbm90IHVzZSAKKyAgICAgICAgcG9zaXRpb25JblBhcmVudEJl Zm9yZU5vZGUgb3IgcG9zaXRpb25JblBhcmVudEJlZm9yZU5vZGUgaW4gVGV4dE1hbmlwdWxhdGlv bkNvbnRyb2xsZXI6OnJlcGxhY2UsIGJlY2F1c2UKKyAgICAgICAgaW5zZXJ0aW9uIHBvc2l0aW9u IGNhbiBiZSBpbnNpZGUgYSBpZ25vcmVkIE5vZGUuCisKKyAgICAgICAgQVBJIFRlc3Q6IFRleHRN YW5pcHVsYXRpb24uQ29tcGxldGVUZXh0TWFuaXB1bGF0aW9uU2hvdWxkUmVwbGFjZUNvbnRlbnRJ Z25vcmVkQnlFZGl0aW5nCisKKyAgICAgICAgKiBlZGl0aW5nL1RleHRNYW5pcHVsYXRpb25Db250 cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRNYW5pcHVsYXRpb25Db250cm9sbGVy OjpyZXBsYWNlKToKKwogMjAyMC0wOC0xMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtBdXRvVGFibGVMYXlvdXRdIFJFR1JFU1NJT04ocjI2Mzg1NSkgUGF5cGFs IGVtYWlsIGlzIHJlbmRlcmVkIHJpZ2h0IGFsaWduZWQgb24gU2FmYXJpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRNYW5pcHVsYXRpb25Db250cm9sbGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIuY3BwCmluZGV4 IDRlZTVlNmM5NmIxMTk4OGJkMzhkZWE2ZDY1ZDA0OGI3ZjhmODVkZDUuLmY1YjMwOWI4ZWE1ZmJh ODRjYTVhMDI3NDFmNGMxMmQ2NTk3OTMyNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIuY3BwCkBAIC04NjEsMTQgKzg2MSwx MiBAQCBhdXRvIFRleHRNYW5pcHVsYXRpb25Db250cm9sbGVyOjpyZXBsYWNlKGNvbnN0IE1hbmlw dWxhdGlvbkl0ZW1EYXRhJiBpdGVtLCBjb25zdAogICAgICAgICB1cGRhdGVJbnNlcnRpb25zKGxh c3RUb3BEb3duUGF0aCwgdG9wRG93blBhdGgsIHJlcGxhY2VtZW50Tm9kZS5nZXQoKSwgcmV1c2Vk T3JpZ2luYWxOb2RlcywgaW5zZXJ0aW9ucyk7CiAgICAgfQogCi0gICAgYXV0byBlbmQgPSBsYXN0 Q2hpbGRPZkNvbW1vbkFuY2VzdG9ySW5SYW5nZSA/IHBvc2l0aW9uSW5QYXJlbnRBZnRlck5vZGUo bGFzdENoaWxkT2ZDb21tb25BbmNlc3RvckluUmFuZ2UuZ2V0KCkpIDogcG9zaXRpb25BZnRlck5v ZGUoY29tbW9uQW5jZXN0b3IuZ2V0KCkpOwogICAgIFJlZlB0cjxOb2RlPiBub2RlID0gaXRlbS5l bmQuZmlyc3ROb2RlKCk7Ci0gICAgUmVmUHRyPE5vZGU+IGVuZE5vZGUgPSBlbmQuZmlyc3ROb2Rl KCk7Ci0gICAgaWYgKG5vZGUgJiYgbm9kZSAhPSBlbmROb2RlKSB7CisgICAgaWYgKG5vZGUgJiYg bGFzdENoaWxkT2ZDb21tb25BbmNlc3RvckluUmFuZ2UtPmNvbnRhaW5zKG5vZGUuZ2V0KCkpKSB7 CiAgICAgICAgIGF1dG8gdG9wRG93blBhdGggPSBnZXRQYXRoKGNvbW1vbkFuY2VzdG9yLmdldCgp LCBub2RlLT5wYXJlbnROb2RlKCkpOwogICAgICAgICB1cGRhdGVJbnNlcnRpb25zKGxhc3RUb3BE b3duUGF0aCwgdG9wRG93blBhdGgsIG51bGxwdHIsIHJldXNlZE9yaWdpbmFsTm9kZXMsIGluc2Vy dGlvbnMpOwogICAgIH0KLSAgICB3aGlsZSAobm9kZSAhPSBlbmROb2RlKSB7CisgICAgd2hpbGUg KGxhc3RDaGlsZE9mQ29tbW9uQW5jZXN0b3JJblJhbmdlLT5jb250YWlucyhub2RlLmdldCgpKSkg ewogICAgICAgICBSZWY8Tm9kZT4gcGFyZW50Tm9kZSA9ICpub2RlLT5wYXJlbnROb2RlKCk7CiAg ICAgICAgIHdoaWxlICghbGFzdFRvcERvd25QYXRoLmlzRW1wdHkoKSAmJiBsYXN0VG9wRG93blBh dGgubGFzdCgpLmZpcnN0LnB0cigpICE9IHBhcmVudE5vZGUucHRyKCkpCiAgICAgICAgICAgICBs YXN0VG9wRG93blBhdGgucmVtb3ZlTGFzdCgpOwpAQCAtODc4LDIxICs4NzYsMTggQEAgYXV0byBU ZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlcjo6cmVwbGFjZShjb25zdCBNYW5pcHVsYXRpb25JdGVt RGF0YSYgaXRlbSwgY29uc3QKICAgICAgICAgbm9kZSA9IE5vZGVUcmF2ZXJzYWw6Om5leHQoKm5v ZGUpOwogICAgIH0KIAotICAgIFBvc2l0aW9uIGluc2VydGlvblBvaW50ID0gcG9zaXRpb25CZWZv cmVOb2RlKGZpcnN0Q29udGVudE5vZGUuZ2V0KCkpLnBhcmVudEFuY2hvcmVkRXF1aXZhbGVudCgp OwotICAgIHdoaWxlIChpbnNlcnRpb25Qb2ludC5jb250YWluZXJOb2RlKCkgIT0gY29tbW9uQW5j ZXN0b3IpCi0gICAgICAgIGluc2VydGlvblBvaW50ID0gcG9zaXRpb25JblBhcmVudEJlZm9yZU5v ZGUoaW5zZXJ0aW9uUG9pbnQuY29udGFpbmVyTm9kZSgpKTsKKyAgICBSZWZQdHI8Tm9kZT4gaW5z ZXJ0aW9uUG9pbnROb2RlID0gbGFzdENoaWxkT2ZDb21tb25BbmNlc3RvckluUmFuZ2UtPm5leHRT aWJsaW5nKCk7CiAKICAgICBmb3IgKGF1dG8mIG5vZGUgOiBub2Rlc1RvUmVtb3ZlKQogICAgICAg ICBub2RlLT5yZW1vdmUoKTsKIAogICAgIGZvciAoYXV0byYgaW5zZXJ0aW9uIDogaW5zZXJ0aW9u cykgewogICAgICAgICBhdXRvIHBhcmVudENvbnRhaW5lciA9IGluc2VydGlvbi5wYXJlbnRJZkRp ZmZlcmVudEZyb21Db21tb25BbmNlc3RvcjsKLSAgICAgICAgaWYgKCFpbnNlcnRpb24ucGFyZW50 SWZEaWZmZXJlbnRGcm9tQ29tbW9uQW5jZXN0b3IpIHsKLSAgICAgICAgICAgIHBhcmVudENvbnRh aW5lciA9IGluc2VydGlvblBvaW50LmNvbnRhaW5lck5vZGUoKTsKLSAgICAgICAgICAgIHBhcmVu dENvbnRhaW5lci0+aW5zZXJ0QmVmb3JlKGluc2VydGlvbi5jaGlsZCwgaW5zZXJ0aW9uUG9pbnQu Y29tcHV0ZU5vZGVBZnRlclBvc2l0aW9uKCkpOwotICAgICAgICAgICAgaW5zZXJ0aW9uUG9pbnQg PSBwb3NpdGlvbkluUGFyZW50QWZ0ZXJOb2RlKGluc2VydGlvbi5jaGlsZC5wdHIoKSk7CisgICAg ICAgIGlmICghcGFyZW50Q29udGFpbmVyKSB7CisgICAgICAgICAgICBwYXJlbnRDb250YWluZXIg PSBjb21tb25BbmNlc3RvcjsKKyAgICAgICAgICAgIHBhcmVudENvbnRhaW5lci0+aW5zZXJ0QmVm b3JlKGluc2VydGlvbi5jaGlsZCwgaW5zZXJ0aW9uUG9pbnROb2RlLmdldCgpKTsKICAgICAgICAg fSBlbHNlCi0gICAgICAgICAgICBpbnNlcnRpb24ucGFyZW50SWZEaWZmZXJlbnRGcm9tQ29tbW9u QW5jZXN0b3ItPmFwcGVuZENoaWxkKGluc2VydGlvbi5jaGlsZCk7CisgICAgICAgICAgICBwYXJl bnRDb250YWluZXItPmFwcGVuZENoaWxkKGluc2VydGlvbi5jaGlsZCk7CiAKICAgICAgICAgaWYg KGF1dG8qIGJveCA9IHBhcmVudENvbnRhaW5lci0+cmVuZGVyQm94KCkpIHsKICAgICAgICAgICAg IGlmICghYm94LT5oYXNWaXN1YWxPdmVyZmxvdygpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGRhNzMyOTk4NTBjMDA1ZjM2MDZhY2Y4NDJmNGU4 MTQyMGQ4NjVmMWQuLjdmMjhlMDA1OGIzZDc0ZGJiMGU1NTRiY2IyNDRmOWQ3YTgyMmJiOTYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAyMC0wOC0xMSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KKwor ICAgICAgICBUZXh0IG1hbmlwdWxhdGlvbiBjcmFzaGVzIHdoZW4gcmVwbGFjaW5nIGVsZW1lbnQg d2l0aCBpbWcgcm9sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE1MzQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgorCisgICAg ICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1bGF0aW9uLm1t OgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjAtMDgtMTEgIFBoaWxpcHBl IE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gQWRk IE1pbmlCcm93c2VyIHdyYXBwZXIgZW52IHZhcnMgYW5kIHdoaXRlLWxpc3QgTUVTQSBlbnYgdmFy cyBpbiBmbGF0cGFrCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL1RleHRNYW5pcHVsYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW0KaW5kZXggMzhjNmE1YWViMzQzZmJjYmYyNWY1 ZWM3NDU5NTQ1MDQ0ODIyODBmMS4uZDRlMjE1ZDQ5NWQ3NzU4MGZlNDZkMTIzYmJiN2M1OGNiM2Rj ODRmZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9U ZXh0TWFuaXB1bGF0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5tbQpAQCAtMzA4Miw2ICszMDgyLDQ4IEBAIFRFU1QoVGV4 dE1hbmlwdWxhdGlvbiwgQ29tcGxldGVUZXh0TWFuaXB1bGF0aW9uUGFyYWdyYXBoc0NvbnRhaW5D b2xsYXBzZWRTcGFjZXMpCiAgICAgRVhQRUNUX1dLX1NUUkVRKCI8c3Bhbj5IZWxsbzwvc3Bhbj48 c3Bhbj5Xb3JsZDwvc3Bhbj4iLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0 OkAiZG9jdW1lbnQuYm9keS5pbm5lckhUTUwiXSk7CiB9CiAKK1RFU1QoVGV4dE1hbmlwdWxhdGlv biwgQ29tcGxldGVUZXh0TWFuaXB1bGF0aW9uU2hvdWxkUmVwbGFjZUNvbnRlbnRJZ25vcmVkQnlF ZGl0aW5nKQoreworICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbVGV4dE1hbmlwdWxhdGlv bkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rl c3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA0MDAsIDQw MCldKTsKKyAgICBbd2ViVmlldyBfc2V0VGV4dE1hbmlwdWxhdGlvbkRlbGVnYXRlOmRlbGVnYXRl LmdldCgpXTsKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6QCI8IURP Q1RZUEUgaHRtbD4iCisgICAgICAgICI8Ym9keT4iCisgICAgICAgICI8ZGl2IHJvbGU9J2ltZyc+ IgorICAgICAgICAgICAgImltYWdlcyIKKyAgICAgICAgICAgICI8YT5saW5rPC9hPiIKKyAgICAg ICAgICAgICI8aW1nIHNyYz0naGVsbG8ucG5nJz4iCisgICAgICAgICAgICAiPGltZyBzcmM9J3dl YmtpdC5wbmcnPiIKKyAgICAgICAgIjwvZGl2PiIKKyAgICAgICAgIjwvYm9keT4iXTsKKworICAg IGRvbmUgPSBmYWxzZTsKKyAgICBbd2ViVmlldyBfc3RhcnRUZXh0TWFuaXB1bGF0aW9uc1dpdGhD b25maWd1cmF0aW9uOm5pbCBjb21wbGV0aW9uOl57CisgICAgICAgIGRvbmUgPSB0cnVlOworICAg IH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisKKyAgICBhdXRvIGl0 ZW1zID0gW2RlbGVnYXRlIGl0ZW1zXTsKKyAgICBFWFBFQ1RfRVEoaXRlbXMuY291bnQsIDFVTCk7 CisgICAgRVhQRUNUX0VRKGl0ZW1zWzBdLnRva2Vucy5jb3VudCwgMlVMKTsKKyAgICBFWFBFQ1Rf V0tfU1RSRVEoImltYWdlcyIsIGl0ZW1zWzBdLnRva2Vuc1swXS5jb250ZW50KTsKKyAgICBFWFBF Q1RfV0tfU1RSRVEoImxpbmsiLCBpdGVtc1swXS50b2tlbnNbMV0uY29udGVudCk7CisKKyAgICBk b25lID0gZmFsc2U7CisgICAgW3dlYlZpZXcgX2NvbXBsZXRlVGV4dE1hbmlwdWxhdGlvbkZvckl0 ZW1zOkBbCisgICAgICAgIGNyZWF0ZUl0ZW0oaXRlbXNbMF0uaWRlbnRpZmllciwgeworICAgICAg ICAgICAgeyBpdGVtc1swXS50b2tlbnNbMF0uaWRlbnRpZmllciwgQCJJbWFnZXMiIH0sCisgICAg ICAgICAgICB7IGl0ZW1zWzBdLnRva2Vuc1sxXS5pZGVudGlmaWVyLCBAIkxpbmsiIH0KKyAgICB9 KS5nZXQoKSwKKyAgICBdIGNvbXBsZXRpb246XihOU0FycmF5PE5TRXJyb3IgKj4gKmVycm9ycykg eworICAgICAgICBFWFBFQ1RfRVEoZXJyb3JzLCBuaWwpOworICAgICAgICBkb25lID0gdHJ1ZTsK KyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworCisgICAgRVhQ RUNUX1dLX1NUUkVRKCI8ZGl2IHJvbGU9XCJpbWdcIj5JbWFnZXM8YT5MaW5rPC9hPjxpbWcgc3Jj PVwiaGVsbG8ucG5nXCI+PGltZyBzcmM9XCJ3ZWJraXQucG5nXCI+PC9kaXY+IiwgW3dlYlZpZXcg c3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3VtZW50LmJvZHkuaW5uZXJIVE1MIl0p OworfQorCiBURVNUKFRleHRNYW5pcHVsYXRpb24sIFRleHRNYW5pcHVsYXRpb25Ub2tlbkRlYnVn RGVzY3JpcHRpb24pCiB7CiAgICAgYXV0byB0b2tlbiA9IGFkb3B0TlMoW1tfV0tUZXh0TWFuaXB1 bGF0aW9uVG9rZW4gYWxsb2NdIGluaXRdKTsK