214992 2020-07-30 15:27:05 -0700 Drop some unnecessary code in SQLiteIDBBackingStore and IDBServer 2020-10-01 00:53:36 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu alecflett beidson ews-watchlist jsbell webkit-bug-importer oldest_to_newest 1676592 0 sihui_liu 2020-07-30 15:27:05 -0700 ... 1676597 1 405630 sihui_liu 2020-07-30 15:29:12 -0700 Created attachment 405630 Patch 1678433 2 webkit-bug-importer 2020-08-06 15:28:24 -0700 <rdar://problem/66648514> 1687458 3 408460 sihui_liu 2020-09-10 10:47:54 -0700 Created attachment 408460 Patch 1693650 4 410199 sihui_liu 2020-09-30 22:50:49 -0700 Created attachment 410199 Patch for landing 1693668 5 ews-feeder 2020-10-01 00:53:36 -0700 Committed r267823: <https://trac.webkit.org/changeset/267823> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410199. 405630 2020-07-30 15:29:12 -0700 2020-07-30 22:01:32 -0700 Patch bug-214992-20200730152911.patch text/plain 5408 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTM2ZjQ3ZmNmNjM3ODg4 NTgzNTkwOWFmMzU2ZmRiZWMxNmQyOWZlMi4uZDk5NzA2NTMyMjRhYzdlZWI1ODQ4N2I5OTQ0ZDUx MDMzYmRkNWNmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA3LTMwICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwZS5jb20+CisKKyAgICAgICAgRHJvcCBzb21lIHVudXNlZCBj b2RlIGluIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0OTkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogTW9k dWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6ZnVsbERhdGFiYXNl RGlyZWN0b3J5V2l0aFVwZ3JhZGUpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxp dGVJREJCYWNraW5nU3RvcmU6OmRlbGV0ZUJhY2tpbmdTdG9yZSk6CisgICAgICAgIChXZWJDb3Jl OjpJREJTZXJ2ZXI6OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6ZGF0YWJhc2VOYW1lRnJvbUVuY29k ZWRGaWxlbmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0 ZUlEQkJhY2tpbmdTdG9yZTo6ZnVsbERhdGFiYXNlUGF0aCBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5oOgor ICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJCYWNraW5nU3RvcmU6OmRhdGFi YXNlUm9vdERpcmVjdG9yeUlzb2xhdGVkQ29weSBjb25zdCk6IERlbGV0ZWQuCisKIDIwMjAtMDct MzAgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBN YWtlIERlY29kZXJUZXN0IHJ1biBhZ2FpbnN0IC5tcDQgZmlsZXM7IGFkZCByYXRlLWxpbWl0aW5n LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NR TGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcAppbmRleCA0Zjk3ZGU3MjEzZDA2ODEx NDUxNjlkMzBhYzQ3MWMxODc0MWY1M2RhLi40YzU3ZDk3ZWI0MGE5YzBmZjhjNDhhOTU3NzViODZk YzRmYjdmNmY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9z ZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcApAQCAtODc4LDE3 ICs4NzgsNiBAQCBzdGQ6OnVuaXF1ZV9wdHI8SURCRGF0YWJhc2VJbmZvPiBTUUxpdGVJREJCYWNr aW5nU3RvcmU6OmV4dHJhY3RFeGlzdGluZ0RhdGFiYXNlSQogICAgIHJldHVybiBkYXRhYmFzZUlu Zm87CiB9CiAKLVN0cmluZyBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmRhdGFiYXNlTmFtZUZyb21F bmNvZGVkRmlsZW5hbWUoY29uc3QgU3RyaW5nJiBlbmNvZGVkTmFtZSkKLXsKLSAgICBpZiAoZW5j b2RlZE5hbWUgPT0gIiUwMCJfcykKLSAgICAgICAgcmV0dXJuIHsgfTsKLQotICAgIFN0cmluZyBw YXJ0aWFsbHlEZWNvZGVkID0gZW5jb2RlZE5hbWU7Ci0gICAgcGFydGlhbGx5RGVjb2RlZC5yZXBs YWNlKCIlMkUiX3MsICIuIl9zKTsKLQotICAgIHJldHVybiBGaWxlU3lzdGVtOjpkZWNvZGVGcm9t RmlsZW5hbWUocGFydGlhbGx5RGVjb2RlZCk7Ci19Ci0KIFN0cmluZyBTUUxpdGVJREJCYWNraW5n U3RvcmU6OmZpbGVuYW1lRm9yRGF0YWJhc2VOYW1lKCkgY29uc3QKIHsKICAgICBBU1NFUlQoIW1f aWRlbnRpZmllci5kYXRhYmFzZU5hbWUoKS5pc051bGwoKSk7CkBAIC05MDcsMTEgKzg5Niw2IEBA IFN0cmluZyBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmZ1bGxEYXRhYmFzZVBhdGhGb3JEaXJlY3Rv cnkoY29uc3QgU3RyaW5nJiBmdWxsRGF0CiAgICAgcmV0dXJuIEZpbGVTeXN0ZW06OnBhdGhCeUFw cGVuZGluZ0NvbXBvbmVudChmdWxsRGF0YWJhc2VEaXJlY3RvcnksICJJbmRleGVkREIuc3FsaXRl MyIpOwogfQogCi1TdHJpbmcgU1FMaXRlSURCQmFja2luZ1N0b3JlOjpmdWxsRGF0YWJhc2VQYXRo KCkgY29uc3QKLXsKLSAgICByZXR1cm4gZnVsbERhdGFiYXNlUGF0aEZvckRpcmVjdG9yeShtX2Rh dGFiYXNlRGlyZWN0b3J5KTsKLX0KLQogT3B0aW9uYWw8SURCRGF0YWJhc2VOYW1lQW5kVmVyc2lv bj4gU1FMaXRlSURCQmFja2luZ1N0b3JlOjpkYXRhYmFzZU5hbWVBbmRWZXJzaW9uRnJvbUZpbGUo Y29uc3QgU3RyaW5nJiBkYXRhYmFzZVBhdGgpCiB7CiAgICAgU1FMaXRlRGF0YWJhc2UgZGF0YWJh c2U7CkBAIC05NDEsMTAgKzkyNSw5IEBAIE9wdGlvbmFsPElEQkRhdGFiYXNlTmFtZUFuZFZlcnNp b24+IFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6ZGF0YWJhc2VOYW1lQW5kVmVyc2lvCiAKIFN0cmlu ZyBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmZ1bGxEYXRhYmFzZURpcmVjdG9yeVdpdGhVcGdyYWRl KCkKIHsKLSAgICBhdXRvIGRhdGFiYXNlUm9vdERpcmVjdG9yeSA9IHRoaXMtPmRhdGFiYXNlUm9v dERpcmVjdG9yeUlzb2xhdGVkQ29weSgpOwotICAgIFN0cmluZyBvbGRPcmlnaW5EaXJlY3Rvcnkg PSBtX2lkZW50aWZpZXIuZGF0YWJhc2VEaXJlY3RvcnlSZWxhdGl2ZVRvUm9vdChkYXRhYmFzZVJv b3REaXJlY3RvcnksICJ2MCIpOworICAgIFN0cmluZyBvbGRPcmlnaW5EaXJlY3RvcnkgPSBtX2lk ZW50aWZpZXIuZGF0YWJhc2VEaXJlY3RvcnlSZWxhdGl2ZVRvUm9vdChtX2RhdGFiYXNlUm9vdERp cmVjdG9yeSwgInYwIik7CiAgICAgU3RyaW5nIG9sZERhdGFiYXNlRGlyZWN0b3J5ID0gRmlsZVN5 c3RlbTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KG9sZE9yaWdpbkRpcmVjdG9yeSwgZmlsZW5h bWVGb3JEYXRhYmFzZU5hbWUoKSk7Ci0gICAgU3RyaW5nIG5ld09yaWdpbkRpcmVjdG9yeSA9IG1f aWRlbnRpZmllci5kYXRhYmFzZURpcmVjdG9yeVJlbGF0aXZlVG9Sb290KGRhdGFiYXNlUm9vdERp cmVjdG9yeSwgInYxIik7CisgICAgU3RyaW5nIG5ld09yaWdpbkRpcmVjdG9yeSA9IG1faWRlbnRp Zmllci5kYXRhYmFzZURpcmVjdG9yeVJlbGF0aXZlVG9Sb290KG1fZGF0YWJhc2VSb290RGlyZWN0 b3J5LCAidjEiKTsKICAgICBTdHJpbmcgZmlsZU5hbWVIYXNoID0gU1FMaXRlRmlsZVN5c3RlbTo6 Y29tcHV0ZUhhc2hGb3JGaWxlTmFtZShtX2lkZW50aWZpZXIuZGF0YWJhc2VOYW1lKCkpOwogICAg IFZlY3RvcjxTdHJpbmc+IGRpcmVjdG9yaWVzV2l0aFNhbWVIYXNoID0gRmlsZVN5c3RlbTo6bGlz dERpcmVjdG9yeShuZXdPcmlnaW5EaXJlY3RvcnksIGZpbGVOYW1lSGFzaCArICIqIik7CiAgICAg U3RyaW5nIG5ld0RhdGFiYXNlRGlyZWN0b3J5ID0gRmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5kaW5n Q29tcG9uZW50KG5ld09yaWdpbkRpcmVjdG9yeSwgZmlsZU5hbWVIYXNoKTsKQEAgLTI3OTQsNyAr Mjc3Nyw3IEBAIHZvaWQgU1FMaXRlSURCQmFja2luZ1N0b3JlOjpkZWxldGVCYWNraW5nU3RvcmUo KQogCiAgICAgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRGF0YWJhc2VGaWxlKGRiRmlsZW5hbWUp OwogICAgIFNRTGl0ZUZpbGVTeXN0ZW06OmRlbGV0ZUVtcHR5RGF0YWJhc2VEaXJlY3RvcnkobV9k YXRhYmFzZURpcmVjdG9yeSk7Ci0gICAgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRW1wdHlEYXRh YmFzZURpcmVjdG9yeShtX2lkZW50aWZpZXIuZGF0YWJhc2VEaXJlY3RvcnlSZWxhdGl2ZVRvUm9v dChkYXRhYmFzZVJvb3REaXJlY3RvcnlJc29sYXRlZENvcHkoKSkpOworICAgIFNRTGl0ZUZpbGVT eXN0ZW06OmRlbGV0ZUVtcHR5RGF0YWJhc2VEaXJlY3RvcnkobV9pZGVudGlmaWVyLmRhdGFiYXNl RGlyZWN0b3J5UmVsYXRpdmVUb1Jvb3QobV9kYXRhYmFzZVJvb3REaXJlY3RvcnkpKTsKIH0KIAog dm9pZCBTUUxpdGVJREJCYWNraW5nU3RvcmU6OnVucmVnaXN0ZXJDdXJzb3IoU1FMaXRlSURCQ3Vy c29yJiBjdXJzb3IpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmgKaW5kZXggNzNmOGZjZmIz OTYwOWJjNTdiY2VjNTlhM2ZiNWVjMmM5OWYyZDdmNi4uOWJjZDI3MTI3OWMyNzMwNjQ3ZDQxMmM4 MjY2MDE2ZDA3N2I5OWZmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuaApAQCAtOTcs NyArOTcsNiBAQCBwdWJsaWM6CiAKICAgICBJREJFcnJvciBnZXRCbG9iUmVjb3Jkc0Zvck9iamVj dFN0b3JlUmVjb3JkKGludDY0X3Qgb2JqZWN0U3RvcmVSZWNvcmQsIFZlY3RvcjxTdHJpbmc+JiBi bG9iVVJMcywgVmVjdG9yPFN0cmluZz4mIGJsb2JGaWxlUGF0aHMpOwogCi0gICAgc3RhdGljIFN0 cmluZyBkYXRhYmFzZU5hbWVGcm9tRW5jb2RlZEZpbGVuYW1lKGNvbnN0IFN0cmluZyYpOwogICAg IHN0YXRpYyB1aW50NjRfdCBkYXRhYmFzZXNTaXplRm9yRGlyZWN0b3J5KGNvbnN0IFN0cmluZyYg ZGlyZWN0b3J5KTsKIAogICAgIFN0cmluZyBkYXRhYmFzZURpcmVjdG9yeSgpIGNvbnN0IHsgcmV0 dXJuIG1fZGF0YWJhc2VEaXJlY3Rvcnk7IH07CkBAIC0xMDgsMTAgKzEwNyw3IEBAIHB1YmxpYzoK IAogcHJpdmF0ZToKICAgICBTdHJpbmcgZmlsZW5hbWVGb3JEYXRhYmFzZU5hbWUoKSBjb25zdDsK LSAgICBTdHJpbmcgZnVsbERhdGFiYXNlUGF0aCgpIGNvbnN0OwogICAgIFN0cmluZyBmdWxsRGF0 YWJhc2VEaXJlY3RvcnlXaXRoVXBncmFkZSgpOwotICAgIAotICAgIFN0cmluZyBkYXRhYmFzZVJv b3REaXJlY3RvcnlJc29sYXRlZENvcHkoKSBjb25zdCB7IHJldHVybiBtX2RhdGFiYXNlUm9vdERp cmVjdG9yeS5pc29sYXRlZENvcHkoKTsgfQogCiAgICAgYm9vbCBlbnN1cmVWYWxpZFJlY29yZHNU YWJsZSgpOwogICAgIGJvb2wgZW5zdXJlVmFsaWRJbmRleFJlY29yZHNUYWJsZSgpOwo= 408460 2020-09-10 10:47:54 -0700 2020-09-30 22:50:48 -0700 Patch bug-214992-20200910104753.patch text/plain 11623 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRhODMxNzQ4MDdkNmE4 ZDk0N2VmZmFkOWI3OGNhNTBiODYxZTBhNC4uNWZkM2Q4Mzc3NDM0OGUxODIxMGVjOTFiMzgyMWVh NjZjYjA2ZjMyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA5LTEwICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIERyb3Agc29tZSB1bm5lY2Vz c2FyeSBjb2RlIGluIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZSBhbmQgSURCU2VydmVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ5OTIKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzY2NjQ4NTE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZS4gUGF0aHMgb2YgU1FMaXRlSURC QmFja2luZ1N0b3JlIGFuZCBJREJTZXJ2ZXIgYXJlIG9ubHkgYWNjZXNzZWQgZnJvbSBvbmUgdGhy ZWFkIG5vdywgc28gd2UgCisgICAgICAgIGRvbid0IG5lZWQgdG8gbWFrZSBpc29sYXRlZCBjb3B5 LgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNlcnZlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OklEQlNlcnZlcjo6Y3JlYXRlQmFja2luZ1N0b3Jl KToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6SURCU2VydmVyOjpnZXRBbGxEYXRhYmFz ZU5hbWVzQW5kVmVyc2lvbnMpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpJREJTZXJ2 ZXI6OnJlbW92ZURhdGFiYXNlc01vZGlmaWVkU2luY2VGb3JWZXJzaW9uKToKKyAgICAgICAgKFdl YkNvcmU6OklEQlNlcnZlcjo6SURCU2VydmVyOjpyZW1vdmVEYXRhYmFzZXNXaXRoT3JpZ2luc0Zv clZlcnNpb24pOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpJREJTZXJ2ZXI6OnJlbmFt ZU9yaWdpbik6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OklEQlNlcnZlcjo6dXBncmFk ZUZpbGVzSWZOZWNlc3NhcnkpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9J REJTZXJ2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6SURCU2VydmVyOjpkYXRh YmFzZURpcmVjdG9yeVBhdGhJc29sYXRlZENvcHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAq IE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJCYWNraW5nU3RvcmU6OmZ1bGxEYXRh YmFzZURpcmVjdG9yeVdpdGhVcGdyYWRlKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6 U1FMaXRlSURCQmFja2luZ1N0b3JlOjpkZWxldGVCYWNraW5nU3RvcmUpOgorICAgICAgICAoV2Vi Q29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJCYWNraW5nU3RvcmU6OmRhdGFiYXNlTmFtZUZyb21F bmNvZGVkRmlsZW5hbWUpOiBEZWxldGVkLgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuaDoKKwogMjAyMC0wOS0xMCAgU2FpZCBBYm91LUhh bGxhd2EgIDxzYWJvdWhhbGxhd2FAYXBwbGUuY29tPgogCiAgICAgICAgIFtDR10gUkVHUkVTU0lP TiAoQmlnIFN1cik6IEEgR0lGIGltYWdlIHdpdGggYSBmaW5pdGUgbG9vcENvdW50IGxvb3BzIGFu IGV4dHJhIGN5Y2xlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9zZXJ2ZXIvSURCU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L3NlcnZlci9JREJTZXJ2ZXIuY3BwCmluZGV4IDdiNWQ0ZDU3ZjEwOGI1MGQ2ZDc5NTQzMWI2NjRk M2FhNWJiNjUxODYuLjRkMGRlMWY0NmVjZGNhZmM1MGE5NDdmMTIxMWJmMmFjOWMzY2VkNzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2 ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJT ZXJ2ZXIuY3BwCkBAIC0xMjgsMTYgKzEyOCwxNCBAQCBVbmlxdWVJREJEYXRhYmFzZSYgSURCU2Vy dmVyOjpnZXRPckNyZWF0ZVVuaXF1ZUlEQkRhdGFiYXNlKGNvbnN0IElEQkRhdGFiYXNlSWRlbgog c3RkOjp1bmlxdWVfcHRyPElEQkJhY2tpbmdTdG9yZT4gSURCU2VydmVyOjpjcmVhdGVCYWNraW5n U3RvcmUoY29uc3QgSURCRGF0YWJhc2VJZGVudGlmaWVyJiBpZGVudGlmaWVyKQogewogICAgIEFT U0VSVCghaXNNYWluVGhyZWFkKCkpOwotCi0gICAgYXV0byBkYXRhYmFzZURpcmVjdG9yeVBhdGgg PSB0aGlzLT5kYXRhYmFzZURpcmVjdG9yeVBhdGhJc29sYXRlZENvcHkoKTsKLSAgICBpZiAoZGF0 YWJhc2VEaXJlY3RvcnlQYXRoLmlzRW1wdHkoKSkKKyAgICBpZiAobV9kYXRhYmFzZURpcmVjdG9y eVBhdGguaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxNZW1vcnlJREJCYWNr aW5nU3RvcmU+KG1fc2Vzc2lvbklELCBpZGVudGlmaWVyKTsKIAogICAgIEFTU0VSVCghbV9zZXNz aW9uSUQuaXNFcGhlbWVyYWwoKSk7CiAgICAgaWYgKGlkZW50aWZpZXIuaXNUcmFuc2llbnQoKSkK ICAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWU8TWVtb3J5SURCQmFja2luZ1N0b3JlPihtX3Nlc3Np b25JRCwgaWRlbnRpZmllcik7CiAKLSAgICByZXR1cm4gbWFrZVVuaXF1ZTxTUUxpdGVJREJCYWNr aW5nU3RvcmU+KG1fc2Vzc2lvbklELCBpZGVudGlmaWVyLCBkYXRhYmFzZURpcmVjdG9yeVBhdGgp OworICAgIHJldHVybiBtYWtlVW5pcXVlPFNRTGl0ZUlEQkJhY2tpbmdTdG9yZT4obV9zZXNzaW9u SUQsIGlkZW50aWZpZXIsIG1fZGF0YWJhc2VEaXJlY3RvcnlQYXRoKTsKIH0KIAogdm9pZCBJREJT ZXJ2ZXI6Om9wZW5EYXRhYmFzZShjb25zdCBJREJSZXF1ZXN0RGF0YSYgcmVxdWVzdERhdGEpCkBA IC01MTYsOCArNTE0LDcgQEAgdm9pZCBJREJTZXJ2ZXI6OmdldEFsbERhdGFiYXNlTmFtZXNBbmRW ZXJzaW9ucyhJREJDb25uZWN0aW9uSWRlbnRpZmllciBzZXJ2ZXJDb24KICAgICBBU1NFUlQoIWlz TWFpblRocmVhZCgpKTsKICAgICBBU1NFUlQobV9sb2NrLmlzSGVsZCgpKTsKIAotICAgIGF1dG8g ZGF0YWJhc2VEaXJlY3RvcnlQYXRoID0gdGhpcy0+ZGF0YWJhc2VEaXJlY3RvcnlQYXRoSXNvbGF0 ZWRDb3B5KCk7Ci0gICAgU3RyaW5nIG9sZERpcmVjdG9yeSA9IElEQkRhdGFiYXNlSWRlbnRpZmll cjo6ZGF0YWJhc2VEaXJlY3RvcnlSZWxhdGl2ZVRvUm9vdChvcmlnaW4udG9wT3JpZ2luLCBvcmln aW4uY2xpZW50T3JpZ2luLCBkYXRhYmFzZURpcmVjdG9yeVBhdGgsICJ2MCIpOworICAgIFN0cmlu ZyBvbGREaXJlY3RvcnkgPSBJREJEYXRhYmFzZUlkZW50aWZpZXI6OmRhdGFiYXNlRGlyZWN0b3J5 UmVsYXRpdmVUb1Jvb3Qob3JpZ2luLnRvcE9yaWdpbiwgb3JpZ2luLmNsaWVudE9yaWdpbiwgbV9k YXRhYmFzZURpcmVjdG9yeVBhdGgsICJ2MCIpOwogICAgIFZlY3RvcjxTdHJpbmc+IGZpbGVzID0g RmlsZVN5c3RlbTo6bGlzdERpcmVjdG9yeShvbGREaXJlY3RvcnksICIqIl9zKTsKICAgICBWZWN0 b3I8SURCRGF0YWJhc2VOYW1lQW5kVmVyc2lvbj4gZGF0YWJhc2VzOwogICAgIGZvciAoYXV0byYg ZmlsZSA6IGZpbGVzKSB7CkBAIC01MjYsNyArNTIzLDcgQEAgdm9pZCBJREJTZXJ2ZXI6OmdldEFs bERhdGFiYXNlTmFtZXNBbmRWZXJzaW9ucyhJREJDb25uZWN0aW9uSWRlbnRpZmllciBzZXJ2ZXJD b24KICAgICAgICAgICAgIGRhdGFiYXNlcy5hcHBlbmQoV1RGTW92ZSgqZGF0YWJhc2VUdXBsZSkp OwogICAgIH0KIAotICAgIFN0cmluZyBkaXJlY3RvcnkgPSBJREJEYXRhYmFzZUlkZW50aWZpZXI6 OmRhdGFiYXNlRGlyZWN0b3J5UmVsYXRpdmVUb1Jvb3Qob3JpZ2luLnRvcE9yaWdpbiwgb3JpZ2lu LmNsaWVudE9yaWdpbiwgZGF0YWJhc2VEaXJlY3RvcnlQYXRoLCAidjEiKTsKKyAgICBTdHJpbmcg ZGlyZWN0b3J5ID0gSURCRGF0YWJhc2VJZGVudGlmaWVyOjpkYXRhYmFzZURpcmVjdG9yeVJlbGF0 aXZlVG9Sb290KG9yaWdpbi50b3BPcmlnaW4sIG9yaWdpbi5jbGllbnRPcmlnaW4sIG1fZGF0YWJh c2VEaXJlY3RvcnlQYXRoLCAidjEiKTsKICAgICBmaWxlcyA9IEZpbGVTeXN0ZW06Omxpc3REaXJl Y3RvcnkoZGlyZWN0b3J5LCAiKiJfcyk7CiAgICAgZm9yIChhdXRvJiBmaWxlIDogZmlsZXMpIHsK ICAgICAgICAgYXV0byBkYXRhYmFzZVR1cGxlID0gU1FMaXRlSURCQmFja2luZ1N0b3JlOjpkYXRh YmFzZU5hbWVBbmRWZXJzaW9uRnJvbUZpbGUoU1FMaXRlSURCQmFja2luZ1N0b3JlOjpmdWxsRGF0 YWJhc2VQYXRoRm9yRGlyZWN0b3J5KGZpbGUpKTsKQEAgLTcxMiw3ICs3MDksNyBAQCBzdGF0aWMg dm9pZCByZW1vdmVBbGxEYXRhYmFzZXNGb3JPcmlnaW5QYXRoKGNvbnN0IFN0cmluZyYgb3JpZ2lu UGF0aCwgV2FsbFRpbWUgbQogCiB2b2lkIElEQlNlcnZlcjo6cmVtb3ZlRGF0YWJhc2VzTW9kaWZp ZWRTaW5jZUZvclZlcnNpb24oV2FsbFRpbWUgbW9kaWZpZWRTaW5jZSwgY29uc3QgU3RyaW5nJiB2 ZXJzaW9uKQogewotICAgIFN0cmluZyB2ZXJzaW9uUGF0aCA9IEZpbGVTeXN0ZW06OnBhdGhCeUFw cGVuZGluZ0NvbXBvbmVudChkYXRhYmFzZURpcmVjdG9yeVBhdGhJc29sYXRlZENvcHkoKSwgdmVy c2lvbik7CisgICAgU3RyaW5nIHZlcnNpb25QYXRoID0gRmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5k aW5nQ29tcG9uZW50KG1fZGF0YWJhc2VEaXJlY3RvcnlQYXRoLCB2ZXJzaW9uKTsKICAgICBmb3Ig KGF1dG8mIG9yaWdpblBhdGggOiBGaWxlU3lzdGVtOjpsaXN0RGlyZWN0b3J5KHZlcnNpb25QYXRo LCAiKiIpKSB7CiAgICAgICAgIFN0cmluZyBkYXRhYmFzZUlkZW50aWZpZXIgPSBGaWxlU3lzdGVt OjpsYXN0Q29tcG9uZW50T2ZQYXRoSWdub3JpbmdUcmFpbGluZ1NsYXNoKG9yaWdpblBhdGgpOwog ICAgICAgICBpZiAoYXV0byBzZWN1cml0eU9yaWdpbiA9IFNlY3VyaXR5T3JpZ2luRGF0YTo6ZnJv bURhdGFiYXNlSWRlbnRpZmllcihkYXRhYmFzZUlkZW50aWZpZXIpKQpAQCAtNzIyLDcgKzcxOSw3 IEBAIHZvaWQgSURCU2VydmVyOjpyZW1vdmVEYXRhYmFzZXNNb2RpZmllZFNpbmNlRm9yVmVyc2lv bihXYWxsVGltZSBtb2RpZmllZFNpbmNlLCBjCiAKIHZvaWQgSURCU2VydmVyOjpyZW1vdmVEYXRh YmFzZXNXaXRoT3JpZ2luc0ZvclZlcnNpb24oY29uc3QgVmVjdG9yPFNlY3VyaXR5T3JpZ2luRGF0 YT4gJm9yaWdpbnMsIGNvbnN0IFN0cmluZyYgdmVyc2lvbikKIHsKLSAgICBTdHJpbmcgdmVyc2lv blBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoZGF0YWJhc2VEaXJl Y3RvcnlQYXRoSXNvbGF0ZWRDb3B5KCksIHZlcnNpb24pOworICAgIFN0cmluZyB2ZXJzaW9uUGF0 aCA9IEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChtX2RhdGFiYXNlRGlyZWN0 b3J5UGF0aCwgdmVyc2lvbik7CiAgICAgZm9yIChjb25zdCBhdXRvJiBvcmlnaW4gOiBvcmlnaW5z KSB7CiAgICAgICAgIFN0cmluZyBvcmlnaW5QYXRoID0gRmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5k aW5nQ29tcG9uZW50KHZlcnNpb25QYXRoLCBvcmlnaW4uZGF0YWJhc2VJZGVudGlmaWVyKCkpOwog ICAgICAgICByZW1vdmVBbGxEYXRhYmFzZXNGb3JPcmlnaW5QYXRoKG9yaWdpblBhdGgsIC1XYWxs VGltZTo6aW5maW5pdHkoKSk7CkBAIC03NDEsNyArNzM4LDcgQEAgdm9pZCBJREJTZXJ2ZXI6OnJl bmFtZU9yaWdpbihjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIG9sZE9yaWdpbiwg Y29uc3QKICAgICAgICAgcmV0dXJuIGRhdGFiYXNlT3JpZ2luLnRvcE9yaWdpbiA9PSB0YXJnZXRP cmlnaW47CiAgICAgfSk7CiAKLSAgICBhdXRvIHZlcnNpb25QYXRoID0gRmlsZVN5c3RlbTo6cGF0 aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGRhdGFiYXNlRGlyZWN0b3J5UGF0aElzb2xhdGVkQ29weSgp LCAidjEiKTsKKyAgICBhdXRvIHZlcnNpb25QYXRoID0gRmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5k aW5nQ29tcG9uZW50KG1fZGF0YWJhc2VEaXJlY3RvcnlQYXRoLCAidjEiKTsKICAgICBhdXRvIG9s ZE9yaWdpblBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQodmVyc2lv blBhdGgsIG9sZE9yaWdpbi5kYXRhYmFzZUlkZW50aWZpZXIoKSk7CiAgICAgYXV0byBuZXdPcmln aW5QYXRoID0gRmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KHZlcnNpb25QYXRo LCBuZXdPcmlnaW4uZGF0YWJhc2VJZGVudGlmaWVyKCkpOwogICAgIGlmIChGaWxlU3lzdGVtOjpm aWxlRXhpc3RzKG9sZE9yaWdpblBhdGgpKQpAQCAtNzc0LDExICs3NzEsMTAgQEAgdWludDY0X3Qg SURCU2VydmVyOjpkaXNrVXNhZ2UoY29uc3QgU3RyaW5nJiByb290RGlyZWN0b3J5LCBjb25zdCBD bGllbnRPcmlnaW4mIG8KIAogdm9pZCBJREJTZXJ2ZXI6OnVwZ3JhZGVGaWxlc0lmTmVjZXNzYXJ5 KCkKIHsKLSAgICBhdXRvIGRhdGFiYXNlRGlyZWN0b3J5UGF0aCA9IHRoaXMtPmRhdGFiYXNlRGly ZWN0b3J5UGF0aElzb2xhdGVkQ29weSgpOwotICAgIGlmIChkYXRhYmFzZURpcmVjdG9yeVBhdGgu aXNFbXB0eSgpIHx8ICFGaWxlU3lzdGVtOjpmaWxlRXhpc3RzKGRhdGFiYXNlRGlyZWN0b3J5UGF0 aCkpCisgICAgaWYgKG1fZGF0YWJhc2VEaXJlY3RvcnlQYXRoLmlzRW1wdHkoKSB8fCAhRmlsZVN5 c3RlbTo6ZmlsZUV4aXN0cyhtX2RhdGFiYXNlRGlyZWN0b3J5UGF0aCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIFN0cmluZyBuZXdWZXJzaW9uRGlyZWN0b3J5ID0gRmlsZVN5c3RlbTo6cGF0aEJ5 QXBwZW5kaW5nQ29tcG9uZW50KGRhdGFiYXNlRGlyZWN0b3J5UGF0aCwgInYxIik7CisgICAgU3Ry aW5nIG5ld1ZlcnNpb25EaXJlY3RvcnkgPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21w b25lbnQobV9kYXRhYmFzZURpcmVjdG9yeVBhdGgsICJ2MSIpOwogICAgIGlmICghRmlsZVN5c3Rl bTo6ZmlsZUV4aXN0cyhuZXdWZXJzaW9uRGlyZWN0b3J5KSkKICAgICAgICAgRmlsZVN5c3RlbTo6 bWFrZUFsbERpcmVjdG9yaWVzKG5ld1ZlcnNpb25EaXJlY3RvcnkpOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNlcnZlci5oIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNlcnZlci5oCmluZGV4IDNm MWYzYTRmZWI2ZWQzYzA2NDM0ZGI3OTA1ZmZkZTVlZWFkMWZhMmQuLjM3MGU2ZTM0YTRmNjQ5ZjY5 MGI2MTc5MGRiMmU4N2EyY2FhYjYyNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVyLmgKQEAgLTExNiw4ICsxMTYsNiBAQCBwdWJs aWM6CiAKIHByaXZhdGU6CiAgICAgVW5pcXVlSURCRGF0YWJhc2UmIGdldE9yQ3JlYXRlVW5pcXVl SURCRGF0YWJhc2UoY29uc3QgSURCRGF0YWJhc2VJZGVudGlmaWVyJik7Ci0gICAgCi0gICAgU3Ry aW5nIGRhdGFiYXNlRGlyZWN0b3J5UGF0aElzb2xhdGVkQ29weSgpIGNvbnN0IHsgcmV0dXJuIG1f ZGF0YWJhc2VEaXJlY3RvcnlQYXRoLmlzb2xhdGVkQ29weSgpOyB9CiAKICAgICB2b2lkIHVwZ3Jh ZGVGaWxlc0lmTmVjZXNzYXJ5KCk7CiAgICAgdm9pZCByZW1vdmVEYXRhYmFzZXNNb2RpZmllZFNp bmNlRm9yVmVyc2lvbihXYWxsVGltZSwgY29uc3QgU3RyaW5nJik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3Jl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJC YWNraW5nU3RvcmUuY3BwCmluZGV4IDRmOTdkZTcyMTNkMDY4MTE0NTE2OWQzMGFjNDcxYzE4NzQx ZjUzZGEuLmI4MWFmOGQzMmU3Nzk5MzY3NGJjNmE0NzdmMmQ0MTQ1YTZhZTVhYTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNr aW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZl ci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCkBAIC04NzgsMTcgKzg3OCw2IEBAIHN0ZDo6dW5p cXVlX3B0cjxJREJEYXRhYmFzZUluZm8+IFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6ZXh0cmFjdEV4 aXN0aW5nRGF0YWJhc2VJCiAgICAgcmV0dXJuIGRhdGFiYXNlSW5mbzsKIH0KIAotU3RyaW5nIFNR TGl0ZUlEQkJhY2tpbmdTdG9yZTo6ZGF0YWJhc2VOYW1lRnJvbUVuY29kZWRGaWxlbmFtZShjb25z dCBTdHJpbmcmIGVuY29kZWROYW1lKQotewotICAgIGlmIChlbmNvZGVkTmFtZSA9PSAiJTAwIl9z KQotICAgICAgICByZXR1cm4geyB9OwotCi0gICAgU3RyaW5nIHBhcnRpYWxseURlY29kZWQgPSBl bmNvZGVkTmFtZTsKLSAgICBwYXJ0aWFsbHlEZWNvZGVkLnJlcGxhY2UoIiUyRSJfcywgIi4iX3Mp OwotCi0gICAgcmV0dXJuIEZpbGVTeXN0ZW06OmRlY29kZUZyb21GaWxlbmFtZShwYXJ0aWFsbHlE ZWNvZGVkKTsKLX0KLQogU3RyaW5nIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6ZmlsZW5hbWVGb3JE YXRhYmFzZU5hbWUoKSBjb25zdAogewogICAgIEFTU0VSVCghbV9pZGVudGlmaWVyLmRhdGFiYXNl TmFtZSgpLmlzTnVsbCgpKTsKQEAgLTk0MSwxMCArOTMwLDkgQEAgT3B0aW9uYWw8SURCRGF0YWJh c2VOYW1lQW5kVmVyc2lvbj4gU1FMaXRlSURCQmFja2luZ1N0b3JlOjpkYXRhYmFzZU5hbWVBbmRW ZXJzaW8KIAogU3RyaW5nIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6ZnVsbERhdGFiYXNlRGlyZWN0 b3J5V2l0aFVwZ3JhZGUoKQogewotICAgIGF1dG8gZGF0YWJhc2VSb290RGlyZWN0b3J5ID0gdGhp cy0+ZGF0YWJhc2VSb290RGlyZWN0b3J5SXNvbGF0ZWRDb3B5KCk7Ci0gICAgU3RyaW5nIG9sZE9y aWdpbkRpcmVjdG9yeSA9IG1faWRlbnRpZmllci5kYXRhYmFzZURpcmVjdG9yeVJlbGF0aXZlVG9S b290KGRhdGFiYXNlUm9vdERpcmVjdG9yeSwgInYwIik7CisgICAgU3RyaW5nIG9sZE9yaWdpbkRp cmVjdG9yeSA9IG1faWRlbnRpZmllci5kYXRhYmFzZURpcmVjdG9yeVJlbGF0aXZlVG9Sb290KG1f ZGF0YWJhc2VSb290RGlyZWN0b3J5LCAidjAiKTsKICAgICBTdHJpbmcgb2xkRGF0YWJhc2VEaXJl Y3RvcnkgPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQob2xkT3JpZ2luRGly ZWN0b3J5LCBmaWxlbmFtZUZvckRhdGFiYXNlTmFtZSgpKTsKLSAgICBTdHJpbmcgbmV3T3JpZ2lu RGlyZWN0b3J5ID0gbV9pZGVudGlmaWVyLmRhdGFiYXNlRGlyZWN0b3J5UmVsYXRpdmVUb1Jvb3Qo ZGF0YWJhc2VSb290RGlyZWN0b3J5LCAidjEiKTsKKyAgICBTdHJpbmcgbmV3T3JpZ2luRGlyZWN0 b3J5ID0gbV9pZGVudGlmaWVyLmRhdGFiYXNlRGlyZWN0b3J5UmVsYXRpdmVUb1Jvb3QobV9kYXRh YmFzZVJvb3REaXJlY3RvcnksICJ2MSIpOwogICAgIFN0cmluZyBmaWxlTmFtZUhhc2ggPSBTUUxp dGVGaWxlU3lzdGVtOjpjb21wdXRlSGFzaEZvckZpbGVOYW1lKG1faWRlbnRpZmllci5kYXRhYmFz ZU5hbWUoKSk7CiAgICAgVmVjdG9yPFN0cmluZz4gZGlyZWN0b3JpZXNXaXRoU2FtZUhhc2ggPSBG aWxlU3lzdGVtOjpsaXN0RGlyZWN0b3J5KG5ld09yaWdpbkRpcmVjdG9yeSwgZmlsZU5hbWVIYXNo ICsgIioiKTsKICAgICBTdHJpbmcgbmV3RGF0YWJhc2VEaXJlY3RvcnkgPSBGaWxlU3lzdGVtOjpw YXRoQnlBcHBlbmRpbmdDb21wb25lbnQobmV3T3JpZ2luRGlyZWN0b3J5LCBmaWxlTmFtZUhhc2gp OwpAQCAtMjc5NCw3ICsyNzgyLDcgQEAgdm9pZCBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmRlbGV0 ZUJhY2tpbmdTdG9yZSgpCiAKICAgICBTUUxpdGVGaWxlU3lzdGVtOjpkZWxldGVEYXRhYmFzZUZp bGUoZGJGaWxlbmFtZSk7CiAgICAgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRW1wdHlEYXRhYmFz ZURpcmVjdG9yeShtX2RhdGFiYXNlRGlyZWN0b3J5KTsKLSAgICBTUUxpdGVGaWxlU3lzdGVtOjpk ZWxldGVFbXB0eURhdGFiYXNlRGlyZWN0b3J5KG1faWRlbnRpZmllci5kYXRhYmFzZURpcmVjdG9y eVJlbGF0aXZlVG9Sb290KGRhdGFiYXNlUm9vdERpcmVjdG9yeUlzb2xhdGVkQ29weSgpKSk7Cisg ICAgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRW1wdHlEYXRhYmFzZURpcmVjdG9yeShtX2lkZW50 aWZpZXIuZGF0YWJhc2VEaXJlY3RvcnlSZWxhdGl2ZVRvUm9vdChtX2RhdGFiYXNlUm9vdERpcmVj dG9yeSkpOwogfQogCiB2b2lkIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6dW5yZWdpc3RlckN1cnNv cihTUUxpdGVJREJDdXJzb3ImIGN1cnNvcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuaCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuaApp bmRleCAwZTQ3N2JmYmFjZTI1ZmVlZTcyMDAzZjQ4N2FlMWVlZjU2YzUxNmVhLi4wNjU5YjBhYzhi YmUwNjZhMWRkNWZiNzc5YTVkZjQyNDY3MWU5ZjBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdT dG9yZS5oCkBAIC05Nyw3ICs5Nyw2IEBAIHB1YmxpYzoKIAogICAgIElEQkVycm9yIGdldEJsb2JS ZWNvcmRzRm9yT2JqZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBvYmplY3RTdG9yZVJlY29yZCwgVmVj dG9yPFN0cmluZz4mIGJsb2JVUkxzLCBWZWN0b3I8U3RyaW5nPiYgYmxvYkZpbGVQYXRocyk7CiAK LSAgICBzdGF0aWMgU3RyaW5nIGRhdGFiYXNlTmFtZUZyb21FbmNvZGVkRmlsZW5hbWUoY29uc3Qg U3RyaW5nJik7CiAgICAgc3RhdGljIHVpbnQ2NF90IGRhdGFiYXNlc1NpemVGb3JEaXJlY3Rvcnko Y29uc3QgU3RyaW5nJiBkaXJlY3RvcnkpOwogCiAgICAgU3RyaW5nIGRhdGFiYXNlRGlyZWN0b3J5 KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhYmFzZURpcmVjdG9yeTsgfTsKQEAgLTExMCw4ICsxMDks NiBAQCBwcml2YXRlOgogICAgIFN0cmluZyBmaWxlbmFtZUZvckRhdGFiYXNlTmFtZSgpIGNvbnN0 OwogICAgIFN0cmluZyBmdWxsRGF0YWJhc2VQYXRoKCkgY29uc3Q7CiAgICAgU3RyaW5nIGZ1bGxE YXRhYmFzZURpcmVjdG9yeVdpdGhVcGdyYWRlKCk7Ci0gICAgCi0gICAgU3RyaW5nIGRhdGFiYXNl Um9vdERpcmVjdG9yeUlzb2xhdGVkQ29weSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YWJhc2VSb290 RGlyZWN0b3J5Lmlzb2xhdGVkQ29weSgpOyB9CiAKICAgICBib29sIGVuc3VyZVZhbGlkUmVjb3Jk c1RhYmxlKCk7CiAgICAgYm9vbCBlbnN1cmVWYWxpZEluZGV4UmVjb3Jkc1RhYmxlKCk7Cg== 410199 2020-09-30 22:50:49 -0700 2020-10-01 00:53:36 -0700 Patch for landing bug-214992-20200930225048.patch text/plain 11611 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQxY2Y3ZjY0NWZmZGM2 MzM0NmJmNTAzOWQwZGQ5YjcxMGE5MDRjZS4uZGU0NTZmMTYyNzJmY2IxMmFiMDc4ODAzZmZjNWFh NmEwMjg0OTY1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA5LTMwICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIERyb3Agc29tZSB1bm5lY2Vz c2FyeSBjb2RlIGluIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZSBhbmQgSURCU2VydmVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ5OTIKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzY2NjQ4NTE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IEJyYWR5IEVp ZHNvbi4KKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UuIFBhdGhzIG9mIFNRTGl0ZUlEQkJh Y2tpbmdTdG9yZSBhbmQgSURCU2VydmVyIGFyZSBvbmx5IGFjY2Vzc2VkIGZyb20gb25lIHRocmVh ZCBub3csIHNvIHdlIAorICAgICAgICBkb24ndCBuZWVkIHRvIG1ha2UgaXNvbGF0ZWQgY29weS4K KworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpJREJTZXJ2ZXI6OmNyZWF0ZUJhY2tpbmdTdG9yZSk6 CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OklEQlNlcnZlcjo6Z2V0QWxsRGF0YWJhc2VO YW1lc0FuZFZlcnNpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6SURCU2VydmVy OjpyZW1vdmVEYXRhYmFzZXNNb2RpZmllZFNpbmNlRm9yVmVyc2lvbik6CisgICAgICAgIChXZWJD b3JlOjpJREJTZXJ2ZXI6OklEQlNlcnZlcjo6cmVtb3ZlRGF0YWJhc2VzV2l0aE9yaWdpbnNGb3JW ZXJzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6SURCU2VydmVyOjpyZW5hbWVP cmlnaW4pOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpJREJTZXJ2ZXI6OnVwZ3JhZGVG aWxlc0lmTmVjZXNzYXJ5KToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURC U2VydmVyLmg6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OklEQlNlcnZlcjo6ZGF0YWJh c2VEaXJlY3RvcnlQYXRoSXNvbGF0ZWRDb3B5IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBN b2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0b3JlOjpmdWxsRGF0YWJh c2VEaXJlY3RvcnlXaXRoVXBncmFkZSk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNR TGl0ZUlEQkJhY2tpbmdTdG9yZTo6ZGVsZXRlQmFja2luZ1N0b3JlKToKKyAgICAgICAgKFdlYkNv cmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0b3JlOjpkYXRhYmFzZU5hbWVGcm9tRW5j b2RlZEZpbGVuYW1lKTogRGVsZXRlZC4KKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2 ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmg6CisKIDIwMjAtMDktMzAgIEpvaG4gV2lsYW5kZXIg IDx3aWxhbmRlckBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcmFnZSBBY2Nlc3MgQVBJOiBFbmFi bGUgcGVyLXBhZ2Ugc3RvcmFnZSBhY2Nlc3Mgc2NvcGUgYW5kIGFsaWduIHRlc3QgY2FzZXMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJTZXJ2 ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNlcnZl ci5jcHAKaW5kZXggN2I1ZDRkNTdmMTA4YjUwZDZkNzk1NDMxYjY2NGQzYWE1YmI2NTE4Ni4uNGQw ZGUxZjQ2ZWNkY2FmYzUwYTk0N2YxMjExYmYyYWM5YzNjZWQ3NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNlcnZlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQlNlcnZlci5jcHAKQEAgLTEy OCwxNiArMTI4LDE0IEBAIFVuaXF1ZUlEQkRhdGFiYXNlJiBJREJTZXJ2ZXI6OmdldE9yQ3JlYXRl VW5pcXVlSURCRGF0YWJhc2UoY29uc3QgSURCRGF0YWJhc2VJZGVuCiBzdGQ6OnVuaXF1ZV9wdHI8 SURCQmFja2luZ1N0b3JlPiBJREJTZXJ2ZXI6OmNyZWF0ZUJhY2tpbmdTdG9yZShjb25zdCBJREJE YXRhYmFzZUlkZW50aWZpZXImIGlkZW50aWZpZXIpCiB7CiAgICAgQVNTRVJUKCFpc01haW5UaHJl YWQoKSk7Ci0KLSAgICBhdXRvIGRhdGFiYXNlRGlyZWN0b3J5UGF0aCA9IHRoaXMtPmRhdGFiYXNl RGlyZWN0b3J5UGF0aElzb2xhdGVkQ29weSgpOwotICAgIGlmIChkYXRhYmFzZURpcmVjdG9yeVBh dGguaXNFbXB0eSgpKQorICAgIGlmIChtX2RhdGFiYXNlRGlyZWN0b3J5UGF0aC5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybiBtYWtlVW5pcXVlPE1lbW9yeUlEQkJhY2tpbmdTdG9yZT4obV9zZXNz aW9uSUQsIGlkZW50aWZpZXIpOwogCiAgICAgQVNTRVJUKCFtX3Nlc3Npb25JRC5pc0VwaGVtZXJh bCgpKTsKICAgICBpZiAoaWRlbnRpZmllci5pc1RyYW5zaWVudCgpKQogICAgICAgICByZXR1cm4g bWFrZVVuaXF1ZTxNZW1vcnlJREJCYWNraW5nU3RvcmU+KG1fc2Vzc2lvbklELCBpZGVudGlmaWVy KTsKIAotICAgIHJldHVybiBtYWtlVW5pcXVlPFNRTGl0ZUlEQkJhY2tpbmdTdG9yZT4obV9zZXNz aW9uSUQsIGlkZW50aWZpZXIsIGRhdGFiYXNlRGlyZWN0b3J5UGF0aCk7CisgICAgcmV0dXJuIG1h a2VVbmlxdWU8U1FMaXRlSURCQmFja2luZ1N0b3JlPihtX3Nlc3Npb25JRCwgaWRlbnRpZmllciwg bV9kYXRhYmFzZURpcmVjdG9yeVBhdGgpOwogfQogCiB2b2lkIElEQlNlcnZlcjo6b3BlbkRhdGFi YXNlKGNvbnN0IElEQlJlcXVlc3REYXRhJiByZXF1ZXN0RGF0YSkKQEAgLTUxNiw4ICs1MTQsNyBA QCB2b2lkIElEQlNlcnZlcjo6Z2V0QWxsRGF0YWJhc2VOYW1lc0FuZFZlcnNpb25zKElEQkNvbm5l Y3Rpb25JZGVudGlmaWVyIHNlcnZlckNvbgogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwog ICAgIEFTU0VSVChtX2xvY2suaXNIZWxkKCkpOwogCi0gICAgYXV0byBkYXRhYmFzZURpcmVjdG9y eVBhdGggPSB0aGlzLT5kYXRhYmFzZURpcmVjdG9yeVBhdGhJc29sYXRlZENvcHkoKTsKLSAgICBT dHJpbmcgb2xkRGlyZWN0b3J5ID0gSURCRGF0YWJhc2VJZGVudGlmaWVyOjpkYXRhYmFzZURpcmVj dG9yeVJlbGF0aXZlVG9Sb290KG9yaWdpbi50b3BPcmlnaW4sIG9yaWdpbi5jbGllbnRPcmlnaW4s IGRhdGFiYXNlRGlyZWN0b3J5UGF0aCwgInYwIik7CisgICAgU3RyaW5nIG9sZERpcmVjdG9yeSA9 IElEQkRhdGFiYXNlSWRlbnRpZmllcjo6ZGF0YWJhc2VEaXJlY3RvcnlSZWxhdGl2ZVRvUm9vdChv cmlnaW4udG9wT3JpZ2luLCBvcmlnaW4uY2xpZW50T3JpZ2luLCBtX2RhdGFiYXNlRGlyZWN0b3J5 UGF0aCwgInYwIik7CiAgICAgVmVjdG9yPFN0cmluZz4gZmlsZXMgPSBGaWxlU3lzdGVtOjpsaXN0 RGlyZWN0b3J5KG9sZERpcmVjdG9yeSwgIioiX3MpOwogICAgIFZlY3RvcjxJREJEYXRhYmFzZU5h bWVBbmRWZXJzaW9uPiBkYXRhYmFzZXM7CiAgICAgZm9yIChhdXRvJiBmaWxlIDogZmlsZXMpIHsK QEAgLTUyNiw3ICs1MjMsNyBAQCB2b2lkIElEQlNlcnZlcjo6Z2V0QWxsRGF0YWJhc2VOYW1lc0Fu ZFZlcnNpb25zKElEQkNvbm5lY3Rpb25JZGVudGlmaWVyIHNlcnZlckNvbgogICAgICAgICAgICAg ZGF0YWJhc2VzLmFwcGVuZChXVEZNb3ZlKCpkYXRhYmFzZVR1cGxlKSk7CiAgICAgfQogCi0gICAg U3RyaW5nIGRpcmVjdG9yeSA9IElEQkRhdGFiYXNlSWRlbnRpZmllcjo6ZGF0YWJhc2VEaXJlY3Rv cnlSZWxhdGl2ZVRvUm9vdChvcmlnaW4udG9wT3JpZ2luLCBvcmlnaW4uY2xpZW50T3JpZ2luLCBk YXRhYmFzZURpcmVjdG9yeVBhdGgsICJ2MSIpOworICAgIFN0cmluZyBkaXJlY3RvcnkgPSBJREJE YXRhYmFzZUlkZW50aWZpZXI6OmRhdGFiYXNlRGlyZWN0b3J5UmVsYXRpdmVUb1Jvb3Qob3JpZ2lu LnRvcE9yaWdpbiwgb3JpZ2luLmNsaWVudE9yaWdpbiwgbV9kYXRhYmFzZURpcmVjdG9yeVBhdGgs ICJ2MSIpOwogICAgIGZpbGVzID0gRmlsZVN5c3RlbTo6bGlzdERpcmVjdG9yeShkaXJlY3Rvcnks ICIqIl9zKTsKICAgICBmb3IgKGF1dG8mIGZpbGUgOiBmaWxlcykgewogICAgICAgICBhdXRvIGRh dGFiYXNlVHVwbGUgPSBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmRhdGFiYXNlTmFtZUFuZFZlcnNp b25Gcm9tRmlsZShTUUxpdGVJREJCYWNraW5nU3RvcmU6OmZ1bGxEYXRhYmFzZVBhdGhGb3JEaXJl Y3RvcnkoZmlsZSkpOwpAQCAtNzEyLDcgKzcwOSw3IEBAIHN0YXRpYyB2b2lkIHJlbW92ZUFsbERh dGFiYXNlc0Zvck9yaWdpblBhdGgoY29uc3QgU3RyaW5nJiBvcmlnaW5QYXRoLCBXYWxsVGltZSBt CiAKIHZvaWQgSURCU2VydmVyOjpyZW1vdmVEYXRhYmFzZXNNb2RpZmllZFNpbmNlRm9yVmVyc2lv bihXYWxsVGltZSBtb2RpZmllZFNpbmNlLCBjb25zdCBTdHJpbmcmIHZlcnNpb24pCiB7Ci0gICAg U3RyaW5nIHZlcnNpb25QYXRoID0gRmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50 KGRhdGFiYXNlRGlyZWN0b3J5UGF0aElzb2xhdGVkQ29weSgpLCB2ZXJzaW9uKTsKKyAgICBTdHJp bmcgdmVyc2lvblBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQobV9k YXRhYmFzZURpcmVjdG9yeVBhdGgsIHZlcnNpb24pOwogICAgIGZvciAoYXV0byYgb3JpZ2luUGF0 aCA6IEZpbGVTeXN0ZW06Omxpc3REaXJlY3RvcnkodmVyc2lvblBhdGgsICIqIikpIHsKICAgICAg ICAgU3RyaW5nIGRhdGFiYXNlSWRlbnRpZmllciA9IEZpbGVTeXN0ZW06Omxhc3RDb21wb25lbnRP ZlBhdGhJZ25vcmluZ1RyYWlsaW5nU2xhc2gob3JpZ2luUGF0aCk7CiAgICAgICAgIGlmIChhdXRv IHNlY3VyaXR5T3JpZ2luID0gU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tRGF0YWJhc2VJZGVudGlm aWVyKGRhdGFiYXNlSWRlbnRpZmllcikpCkBAIC03MjIsNyArNzE5LDcgQEAgdm9pZCBJREJTZXJ2 ZXI6OnJlbW92ZURhdGFiYXNlc01vZGlmaWVkU2luY2VGb3JWZXJzaW9uKFdhbGxUaW1lIG1vZGlm aWVkU2luY2UsIGMKIAogdm9pZCBJREJTZXJ2ZXI6OnJlbW92ZURhdGFiYXNlc1dpdGhPcmlnaW5z Rm9yVmVyc2lvbihjb25zdCBWZWN0b3I8U2VjdXJpdHlPcmlnaW5EYXRhPiAmb3JpZ2lucywgY29u c3QgU3RyaW5nJiB2ZXJzaW9uKQogewotICAgIFN0cmluZyB2ZXJzaW9uUGF0aCA9IEZpbGVTeXN0 ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChkYXRhYmFzZURpcmVjdG9yeVBhdGhJc29sYXRl ZENvcHkoKSwgdmVyc2lvbik7CisgICAgU3RyaW5nIHZlcnNpb25QYXRoID0gRmlsZVN5c3RlbTo6 cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KG1fZGF0YWJhc2VEaXJlY3RvcnlQYXRoLCB2ZXJzaW9u KTsKICAgICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbiA6IG9yaWdpbnMpIHsKICAgICAgICAgU3Ry aW5nIG9yaWdpblBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQodmVy c2lvblBhdGgsIG9yaWdpbi5kYXRhYmFzZUlkZW50aWZpZXIoKSk7CiAgICAgICAgIHJlbW92ZUFs bERhdGFiYXNlc0Zvck9yaWdpblBhdGgob3JpZ2luUGF0aCwgLVdhbGxUaW1lOjppbmZpbml0eSgp KTsKQEAgLTc0MSw3ICs3MzgsNyBAQCB2b2lkIElEQlNlcnZlcjo6cmVuYW1lT3JpZ2luKGNvbnN0 IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgb2xkT3JpZ2luLCBjb25zdAogICAgICAgICBy ZXR1cm4gZGF0YWJhc2VPcmlnaW4udG9wT3JpZ2luID09IHRhcmdldE9yaWdpbjsKICAgICB9KTsK IAotICAgIGF1dG8gdmVyc2lvblBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21w b25lbnQoZGF0YWJhc2VEaXJlY3RvcnlQYXRoSXNvbGF0ZWRDb3B5KCksICJ2MSIpOworICAgIGF1 dG8gdmVyc2lvblBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQobV9k YXRhYmFzZURpcmVjdG9yeVBhdGgsICJ2MSIpOwogICAgIGF1dG8gb2xkT3JpZ2luUGF0aCA9IEZp bGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudCh2ZXJzaW9uUGF0aCwgb2xkT3JpZ2lu LmRhdGFiYXNlSWRlbnRpZmllcigpKTsKICAgICBhdXRvIG5ld09yaWdpblBhdGggPSBGaWxlU3lz dGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQodmVyc2lvblBhdGgsIG5ld09yaWdpbi5kYXRh YmFzZUlkZW50aWZpZXIoKSk7CiAgICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMob2xkT3Jp Z2luUGF0aCkpCkBAIC03NzQsMTEgKzc3MSwxMCBAQCB1aW50NjRfdCBJREJTZXJ2ZXI6OmRpc2tV c2FnZShjb25zdCBTdHJpbmcmIHJvb3REaXJlY3RvcnksIGNvbnN0IENsaWVudE9yaWdpbiYgbwog CiB2b2lkIElEQlNlcnZlcjo6dXBncmFkZUZpbGVzSWZOZWNlc3NhcnkoKQogewotICAgIGF1dG8g ZGF0YWJhc2VEaXJlY3RvcnlQYXRoID0gdGhpcy0+ZGF0YWJhc2VEaXJlY3RvcnlQYXRoSXNvbGF0 ZWRDb3B5KCk7Ci0gICAgaWYgKGRhdGFiYXNlRGlyZWN0b3J5UGF0aC5pc0VtcHR5KCkgfHwgIUZp bGVTeXN0ZW06OmZpbGVFeGlzdHMoZGF0YWJhc2VEaXJlY3RvcnlQYXRoKSkKKyAgICBpZiAobV9k YXRhYmFzZURpcmVjdG9yeVBhdGguaXNFbXB0eSgpIHx8ICFGaWxlU3lzdGVtOjpmaWxlRXhpc3Rz KG1fZGF0YWJhc2VEaXJlY3RvcnlQYXRoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgU3RyaW5n IG5ld1ZlcnNpb25EaXJlY3RvcnkgPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25l bnQoZGF0YWJhc2VEaXJlY3RvcnlQYXRoLCAidjEiKTsKKyAgICBTdHJpbmcgbmV3VmVyc2lvbkRp cmVjdG9yeSA9IEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChtX2RhdGFiYXNl RGlyZWN0b3J5UGF0aCwgInYxIik7CiAgICAgaWYgKCFGaWxlU3lzdGVtOjpmaWxlRXhpc3RzKG5l d1ZlcnNpb25EaXJlY3RvcnkpKQogICAgICAgICBGaWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0b3Jp ZXMobmV3VmVyc2lvbkRpcmVjdG9yeSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCU2VydmVyLmgKaW5kZXggM2YxZjNhNGZlYjZlZDNjMDY0 MzRkYjc5MDVmZmRlNWVlYWQxZmEyZC4uMzcwZTZlMzRhNGY2NDlmNjkwYjYxNzkwZGIyZTg3YTJj YWFiNjI1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2Vy dmVyL0lEQlNlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9JREJTZXJ2ZXIuaApAQCAtMTE2LDggKzExNiw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToK ICAgICBVbmlxdWVJREJEYXRhYmFzZSYgZ2V0T3JDcmVhdGVVbmlxdWVJREJEYXRhYmFzZShjb25z dCBJREJEYXRhYmFzZUlkZW50aWZpZXImKTsKLSAgICAKLSAgICBTdHJpbmcgZGF0YWJhc2VEaXJl Y3RvcnlQYXRoSXNvbGF0ZWRDb3B5KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhYmFzZURpcmVjdG9y eVBhdGguaXNvbGF0ZWRDb3B5KCk7IH0KIAogICAgIHZvaWQgdXBncmFkZUZpbGVzSWZOZWNlc3Nh cnkoKTsKICAgICB2b2lkIHJlbW92ZURhdGFiYXNlc01vZGlmaWVkU2luY2VGb3JWZXJzaW9uKFdh bGxUaW1lLCBjb25zdCBTdHJpbmcmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAK aW5kZXggMTEyNzllMDFjN2I5ODI5N2I4YzI5Zjg5NDcxNWE0OWMwZGY5ODI4OS4uMTMzYmMwY2U3 MjRiZWU2MDUzNmFjYjYzYTAzYWJmMzI5ODE0M2ZjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tp bmdTdG9yZS5jcHAKQEAgLTExMjgsMTcgKzExMjgsNiBAQCBzdGQ6OnVuaXF1ZV9wdHI8SURCRGF0 YWJhc2VJbmZvPiBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmV4dHJhY3RFeGlzdGluZ0RhdGFiYXNl SQogICAgIHJldHVybiBkYXRhYmFzZUluZm87CiB9CiAKLVN0cmluZyBTUUxpdGVJREJCYWNraW5n U3RvcmU6OmRhdGFiYXNlTmFtZUZyb21FbmNvZGVkRmlsZW5hbWUoY29uc3QgU3RyaW5nJiBlbmNv ZGVkTmFtZSkKLXsKLSAgICBpZiAoZW5jb2RlZE5hbWUgPT0gIiUwMCJfcykKLSAgICAgICAgcmV0 dXJuIHsgfTsKLQotICAgIFN0cmluZyBwYXJ0aWFsbHlEZWNvZGVkID0gZW5jb2RlZE5hbWU7Ci0g ICAgcGFydGlhbGx5RGVjb2RlZC5yZXBsYWNlKCIlMkUiX3MsICIuIl9zKTsKLQotICAgIHJldHVy biBGaWxlU3lzdGVtOjpkZWNvZGVGcm9tRmlsZW5hbWUocGFydGlhbGx5RGVjb2RlZCk7Ci19Ci0K IFN0cmluZyBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmZpbGVuYW1lRm9yRGF0YWJhc2VOYW1lKCkg Y29uc3QKIHsKICAgICBBU1NFUlQoIW1faWRlbnRpZmllci5kYXRhYmFzZU5hbWUoKS5pc051bGwo KSk7CkBAIC0xMTkxLDEwICsxMTgwLDkgQEAgT3B0aW9uYWw8SURCRGF0YWJhc2VOYW1lQW5kVmVy c2lvbj4gU1FMaXRlSURCQmFja2luZ1N0b3JlOjpkYXRhYmFzZU5hbWVBbmRWZXJzaW8KIAogU3Ry aW5nIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6ZnVsbERhdGFiYXNlRGlyZWN0b3J5V2l0aFVwZ3Jh ZGUoKQogewotICAgIGF1dG8gZGF0YWJhc2VSb290RGlyZWN0b3J5ID0gdGhpcy0+ZGF0YWJhc2VS b290RGlyZWN0b3J5SXNvbGF0ZWRDb3B5KCk7Ci0gICAgU3RyaW5nIG9sZE9yaWdpbkRpcmVjdG9y eSA9IG1faWRlbnRpZmllci5kYXRhYmFzZURpcmVjdG9yeVJlbGF0aXZlVG9Sb290KGRhdGFiYXNl Um9vdERpcmVjdG9yeSwgInYwIik7CisgICAgU3RyaW5nIG9sZE9yaWdpbkRpcmVjdG9yeSA9IG1f aWRlbnRpZmllci5kYXRhYmFzZURpcmVjdG9yeVJlbGF0aXZlVG9Sb290KG1fZGF0YWJhc2VSb290 RGlyZWN0b3J5LCAidjAiKTsKICAgICBTdHJpbmcgb2xkRGF0YWJhc2VEaXJlY3RvcnkgPSBGaWxl U3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQob2xkT3JpZ2luRGlyZWN0b3J5LCBmaWxl bmFtZUZvckRhdGFiYXNlTmFtZSgpKTsKLSAgICBTdHJpbmcgbmV3T3JpZ2luRGlyZWN0b3J5ID0g bV9pZGVudGlmaWVyLmRhdGFiYXNlRGlyZWN0b3J5UmVsYXRpdmVUb1Jvb3QoZGF0YWJhc2VSb290 RGlyZWN0b3J5LCAidjEiKTsKKyAgICBTdHJpbmcgbmV3T3JpZ2luRGlyZWN0b3J5ID0gbV9pZGVu dGlmaWVyLmRhdGFiYXNlRGlyZWN0b3J5UmVsYXRpdmVUb1Jvb3QobV9kYXRhYmFzZVJvb3REaXJl Y3RvcnksICJ2MSIpOwogICAgIFN0cmluZyBmaWxlTmFtZUhhc2ggPSBTUUxpdGVGaWxlU3lzdGVt Ojpjb21wdXRlSGFzaEZvckZpbGVOYW1lKG1faWRlbnRpZmllci5kYXRhYmFzZU5hbWUoKSk7CiAg ICAgVmVjdG9yPFN0cmluZz4gZGlyZWN0b3JpZXNXaXRoU2FtZUhhc2ggPSBGaWxlU3lzdGVtOjps aXN0RGlyZWN0b3J5KG5ld09yaWdpbkRpcmVjdG9yeSwgZmlsZU5hbWVIYXNoICsgIioiKTsKICAg ICBTdHJpbmcgbmV3RGF0YWJhc2VEaXJlY3RvcnkgPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRp bmdDb21wb25lbnQobmV3T3JpZ2luRGlyZWN0b3J5LCBmaWxlTmFtZUhhc2gpOwpAQCAtMzA0NCw3 ICszMDMyLDcgQEAgdm9pZCBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmRlbGV0ZUJhY2tpbmdTdG9y ZSgpCiAKICAgICBTUUxpdGVGaWxlU3lzdGVtOjpkZWxldGVEYXRhYmFzZUZpbGUoZGJGaWxlbmFt ZSk7CiAgICAgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRW1wdHlEYXRhYmFzZURpcmVjdG9yeSht X2RhdGFiYXNlRGlyZWN0b3J5KTsKLSAgICBTUUxpdGVGaWxlU3lzdGVtOjpkZWxldGVFbXB0eURh dGFiYXNlRGlyZWN0b3J5KG1faWRlbnRpZmllci5kYXRhYmFzZURpcmVjdG9yeVJlbGF0aXZlVG9S b290KGRhdGFiYXNlUm9vdERpcmVjdG9yeUlzb2xhdGVkQ29weSgpKSk7CisgICAgU1FMaXRlRmls ZVN5c3RlbTo6ZGVsZXRlRW1wdHlEYXRhYmFzZURpcmVjdG9yeShtX2lkZW50aWZpZXIuZGF0YWJh c2VEaXJlY3RvcnlSZWxhdGl2ZVRvUm9vdChtX2RhdGFiYXNlUm9vdERpcmVjdG9yeSkpOwogfQog CiB2b2lkIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6dW5yZWdpc3RlckN1cnNvcihTUUxpdGVJREJD dXJzb3ImIGN1cnNvcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuaAppbmRleCBmNjAxYzZj YzBiNGEwZTdkNDkyYWFmYmQ2ZDVkM2VlOTU3Y2JiZTg4Li4wN2NjMGExMjE5YWVmYmJmZWVhY2Yx YTk1NDM2NTAyNzk3M2IzY2QyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5oCkBAIC05 Nyw3ICs5Nyw2IEBAIHB1YmxpYzoKIAogICAgIElEQkVycm9yIGdldEJsb2JSZWNvcmRzRm9yT2Jq ZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBvYmplY3RTdG9yZVJlY29yZCwgVmVjdG9yPFN0cmluZz4m IGJsb2JVUkxzLCBWZWN0b3I8U3RyaW5nPiYgYmxvYkZpbGVQYXRocyk7CiAKLSAgICBzdGF0aWMg U3RyaW5nIGRhdGFiYXNlTmFtZUZyb21FbmNvZGVkRmlsZW5hbWUoY29uc3QgU3RyaW5nJik7CiAg ICAgc3RhdGljIHVpbnQ2NF90IGRhdGFiYXNlc1NpemVGb3JEaXJlY3RvcnkoY29uc3QgU3RyaW5n JiBkaXJlY3RvcnkpOwogCiAgICAgU3RyaW5nIGRhdGFiYXNlRGlyZWN0b3J5KCkgY29uc3QgeyBy ZXR1cm4gbV9kYXRhYmFzZURpcmVjdG9yeTsgfTsKQEAgLTExMCw4ICsxMDksNiBAQCBwcml2YXRl OgogICAgIFN0cmluZyBmaWxlbmFtZUZvckRhdGFiYXNlTmFtZSgpIGNvbnN0OwogICAgIFN0cmlu ZyBmdWxsRGF0YWJhc2VQYXRoKCkgY29uc3Q7CiAgICAgU3RyaW5nIGZ1bGxEYXRhYmFzZURpcmVj dG9yeVdpdGhVcGdyYWRlKCk7Ci0gICAgCi0gICAgU3RyaW5nIGRhdGFiYXNlUm9vdERpcmVjdG9y eUlzb2xhdGVkQ29weSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YWJhc2VSb290RGlyZWN0b3J5Lmlz b2xhdGVkQ29weSgpOyB9CiAKICAgICBib29sIGVuc3VyZVZhbGlkUmVjb3Jkc1RhYmxlKCk7CiAg ICAgYm9vbCBlbnN1cmVWYWxpZEluZGV4UmVjb3Jkc1RhYmxlKCk7Cg==