211411 2020-05-04 16:31:15 -0700 Drop code path using the legacy CFNetwork cookie change notification SPI 2020-05-05 11:59:42 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen ggaren webkit-bug-importer wilander oldest_to_newest 1648816 0 cdumez 2020-05-04 16:31:15 -0700 Drop code path using the legacy CFNetwork cookie change notification SPI. 1648817 1 398432 cdumez 2020-05-04 16:32:16 -0700 Created attachment 398432 Patch 1648845 2 398432 wilander 2020-05-04 17:25:08 -0700 Comment on attachment 398432 Patch r=me Holding of cq to see what EWS has to say. 1648848 3 ews-feeder 2020-05-04 17:31:13 -0700 Committed r261130: <https://trac.webkit.org/changeset/261130> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398432. 1648850 4 webkit-bug-importer 2020-05-04 17:32:15 -0700 <rdar://problem/62869148> 1649218 5 cdumez 2020-05-05 09:04:02 -0700 Reverted r261130 for reason: Caused crashes on some of our bots Committed r261171: <https://trac.webkit.org/changeset/261171> 1649268 6 398528 cdumez 2020-05-05 11:03:57 -0700 Created attachment 398528 Patch 1649308 7 ews-feeder 2020-05-05 11:59:41 -0700 Committed r261188: <https://trac.webkit.org/changeset/261188> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398528. 398432 2020-05-04 16:32:16 -0700 2020-05-05 11:03:55 -0700 Patch bug-211411-20200504163216.patch text/plain 9391 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQ1ZjA4MzU3MTJlYzVk ZWU1MjZlYzc4ZWU3NWZiNjk1YzQxNjFkMC4uMWY3MWYxNmMyOGQwZWE3ZDEyNmQ3ZDY1Zjk4MDg0 ZWZlNGJlNWUyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA1LTA0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBjb2RlIHBhdGggdXNp bmcgdGhlIGxlZ2FjeSBDRk5ldHdvcmsgY29va2llIGNoYW5nZSBub3RpZmljYXRpb24gU1BJCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE0MTEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3Jt L25ldHdvcmsvY29jb2EvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ29jb2EubW06CisgICAgICAgIChX ZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb246OnJlZ2lzdGVyQ29va2llQ2hhbmdlTGlzdGVu ZXJzSWZOZWNlc3NhcnkpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9u Ojp1bnJlZ2lzdGVyQ29va2llQ2hhbmdlTGlzdGVuZXJzSWZOZWNlc3NhcnkpOgorCiAyMDIwLTA1 LTA0ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAg ICAgVGhyb3R0bGluZyByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgc2hvdWxkIGJlIGNvbnRyb2xsZWQg YnkgUmVuZGVyaW5nVXBkYXRlU2NoZWR1bGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBkNDBkMWJj NGVhMDk2YmIzZDNhNGM4NzlkNzlhNDVlNTlmODU5ZjE1Li42YmY4NmZmZWVhMmY4YTgxY2IyMTc2 MDI1YmYwMTRlNzcxOWRmZmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAyMC0wNS0wNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIERy b3AgY29kZSBwYXRoIHVzaW5nIHRoZSBsZWdhY3kgQ0ZOZXR3b3JrIGNvb2tpZSBjaGFuZ2Ugbm90 aWZpY2F0aW9uIFNQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjExNDExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oOgorCiAyMDIwLTA1LTA0ICBEYXJpbiBB ZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW5uZWVkZWQgVVNFKE1F RElBUkVNT1RFKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZO ZXR3b3JrU1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEku aAppbmRleCBhM2M5MWE5NmEzZjI2ZThjYTFlN2QyODliMGI3ZmE2ZmNmNWY5YWE0Li44ZWViNDA5 YjY5MWUwZTM3Y2FmMmJlNWZlZmExZDFkMzhhZjc3MGI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Q QUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaApAQCAtNDIzLDkgKzQyMyw2IEBAIFdURl9FWFRF Uk5fQ19FTkQKIC0gKE5TQXJyYXkqIF9fbnVsbGFibGUpX2dldENvb2tpZXNGb3JEb21haW46KE5T U3RyaW5nKilkb21haW47CiAtICh2b2lkKV9zZXRDb29raWVzQ2hhbmdlZEhhbmRsZXI6KHZvaWQo Xl9fbnVsbGFibGUpKE5TQXJyYXk8TlNIVFRQQ29va2llKj4qIGFkZGVkQ29va2llcywgTlNTdHJp bmcqIGRvbWFpbkZvckNoYW5nZWRDb29raWUpKWNvb2tpZXNDaGFuZ2VkSGFuZGxlciBvblF1ZXVl OihkaXNwYXRjaF9xdWV1ZV90IF9fbnVsbGFibGUpcXVldWU7CiAtICh2b2lkKV9zZXRDb29raWVz UmVtb3ZlZEhhbmRsZXI6KHZvaWQoXl9fbnVsbGFibGUpKE5TQXJyYXk8TlNIVFRQQ29va2llKj4q IF9fbnVsbGFibGUgcmVtb3ZlZENvb2tpZXMsIE5TU3RyaW5nKiBfX251bGxhYmxlIGRvbWFpbkZv clJlbW92ZWRDb29raWVzLCBib29sIHJlbW92ZUFsbENvb2tpZXMpKWNvb2tpZXNSZW1vdmVkSGFu ZGxlciBvblF1ZXVlOihkaXNwYXRjaF9xdWV1ZV90IF9fbnVsbGFibGUpcXVldWU7Ci0vLyBGSVhN RTogVGhlIGZvbGxvd2luZyAyIHNob3VsZCBiZSByZW1vdmVkIGFyZSBvbmx5IGtlcHQgdG8gZW5z dXJlIHNtb290aCB0cmFuc2l0aW9uIHRvIHRoZSBuZXcgX3NldENvb2tpZXNDaGFuZ2VkSGFuZGxl ciAvIF9zZXRDb29raWVzUmVtb3ZlZEhhbmRsZXIgU1BJLgotLSAodm9pZClfc2V0Q29va2llc0Fk ZGVkSGFuZGxlcjoodm9pZCheX19udWxsYWJsZSkoTlNBcnJheTxOU0hUVFBDb29raWUqPiogYWRk ZWRDb29raWVzLCBOU1VSTCogX19udWxsYWJsZSB1cmxGb3JBZGRlZENvb2tpZXMpKWNvb2tpZXNB ZGRlZEhhbmRsZXIgb25RdWV1ZTooZGlzcGF0Y2hfcXVldWVfdCBfX251bGxhYmxlKXF1ZXVlOwot LSAodm9pZClfc2V0Q29va2llc0RlbGV0ZWRIYW5kbGVyOih2b2lkKF5fX251bGxhYmxlKShOU0Fy cmF5PE5TSFRUUENvb2tpZSo+KiBfX251bGxhYmxlIGRlbGV0ZWRDb29raWVzLCBib29sIGRlbGV0 ZWRBbGxDb29raWVzKSljb29raWVzRGVsZXRlZEhhbmRsZXIgb25RdWV1ZTooZGlzcGF0Y2hfcXVl dWVfdCBfX251bGxhYmxlKXF1ZXVlOwogQGVuZAogCiBAaW50ZXJmYWNlIE5TVVJMUmVzcG9uc2Ug KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvTmV0 d29ya1N0b3JhZ2VTZXNzaW9uQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NvY29hL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNvY29hLm1tCmluZGV4IGU2NzU5MDBlNDEw YjM5ZDI3ZTkwODYyNjZkZTUzZTVmZGU0NmMxZmQuLjk1N2MzM2VmMmVkY2QzZTQ1ODFiMTVlMzJl NjM2ZjA3YmY4ZDE3YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY29jb2EvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9OZXR3b3JrU3RvcmFnZVNlc3Npb25Db2NvYS5tbQpA QCAtNjE3LDcxICs2MTcsMzkgQEAgdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnJlZ2lzdGVy Q29va2llQ2hhbmdlTGlzdGVuZXJzSWZOZWNlc3NhcnkoKQogCiAgICAgbV9kaWRSZWdpc3RlckNv b2tpZUxpc3RlbmVycyA9IHRydWU7CiAKLSAgICBpZiAoW25zQ29va2llU3RvcmFnZSgpIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3NldENvb2tpZXNDaGFuZ2VkSGFuZGxlcjpvblF1ZXVl OildKSB7Ci0gICAgICAgIFtuc0Nvb2tpZVN0b3JhZ2UoKSBfc2V0Q29va2llc0NoYW5nZWRIYW5k bGVyOl4oTlNBcnJheTxOU0hUVFBDb29raWUqPiogYWRkZWRDb29raWVzLCBOU1N0cmluZyogZG9t YWluRm9yQ2hhbmdlZENvb2tpZSkgewotICAgICAgICAgICAgU3RyaW5nIGhvc3QgPSBkb21haW5G b3JDaGFuZ2VkQ29va2llOwotICAgICAgICAgICAgYXV0byBpdCA9IG1fY29va2llQ2hhbmdlT2Jz ZXJ2ZXJzLmZpbmQoaG9zdCk7Ci0gICAgICAgICAgICBpZiAoaXQgPT0gbV9jb29raWVDaGFuZ2VP YnNlcnZlcnMuZW5kKCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgYXV0 byBjb29raWVzID0gbnNDb29raWVzVG9Db29raWVWZWN0b3IoYWRkZWRDb29raWVzLCBbXShOU0hU VFBDb29raWUgKmNvb2tpZSkgeyByZXR1cm4gIWNvb2tpZS5IVFRQT25seTsgfSk7Ci0gICAgICAg ICAgICBpZiAoY29va2llcy5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICAgICAgZm9yIChhdXRvKiBvYnNlcnZlciA6IGl0LT52YWx1ZSkKLSAgICAgICAgICAgICAg ICBvYnNlcnZlci0+Y29va2llc0FkZGVkKGhvc3QsIGNvb2tpZXMpOwotICAgICAgICB9IG9uUXVl dWU6ZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKV07Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgLy8g T2xkIFNQSS4KLSAgICAgICAgLy8gRklYTUU6IFRoaXMgY291bGQgY2FuIGJlIHJlbW92ZWQgYWZ0 ZXIgYSB3aGlsZS4gSXQgaXMgb25seSBrZXB0IHRvIGVuc3VyZSBhIHNtb290aCB0cmFuc2l0aW9u IHRvIHRoZSBuZXcgU1BJLgotICAgICAgICBbbnNDb29raWVTdG9yYWdlKCkgX3NldENvb2tpZXNB ZGRlZEhhbmRsZXI6XihOU0FycmF5PE5TSFRUUENvb2tpZSAqPiAqIG5zQ29va2llcywgTlNVUkwg KnVybEZvckFkZGVkQ29va2llcykgewotICAgICAgICAgICAgYXV0byBjb29raWVzID0gbnNDb29r aWVzVG9Db29raWVWZWN0b3IobnNDb29raWVzLCBbXShOU0hUVFBDb29raWUgKmNvb2tpZSkgeyBy ZXR1cm4gIWNvb2tpZS5IVFRQT25seTsgfSk7Ci0gICAgICAgICAgICBpZiAoY29va2llcy5pc0Vt cHR5KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgYXV0byBob3N0ID0g VVJMKHVybEZvckFkZGVkQ29va2llcykuaG9zdCgpLnRvU3RyaW5nKCk7Ci0gICAgICAgICAgICBS RUxFQVNFX0FTU0VSVCghaG9zdC5pc051bGwoKSk7Ci0gICAgICAgICAgICAvLyBGSVhNRTogVGhp cyBpcyBpbmVmZmljaWVudC4gVW5mb3J0dW5hdGVseSwgQ0ZOZXR3b3JrIHNlbmRzIHVzIG5vdGlm aWNhdGlvbnMgZm9yIGhvc3RzIHRoYXQgZG8gbm90IG1hdGNoIGV4YWN0bHkgdGhlIG9uZXMgd2UK LSAgICAgICAgICAgIC8vIGFyZSBsaXN0ZW5pbmcgZm9yIChlLmcuICdzZWN1cmUuaHVsdS5jb20g aW5zdGVhZCBvZiAnd3d3Lmh1bHUuY29tJyBmb3IpLiBTZWUgPHJkYXI6Ly9wcm9ibGVtLzU5OTcz NjMwPi4KLSAgICAgICAgICAgIGF1dG8gcmVnaXN0cmFibGVEb21haW4gPSBSZWdpc3RyYWJsZURv bWFpbjo6dW5jaGVja2VkQ3JlYXRlRnJvbUhvc3QoaG9zdCk7Ci0gICAgICAgICAgICBmb3IgKGF1 dG8mIHBhaXIgOiBtX2Nvb2tpZUNoYW5nZU9ic2VydmVycykgewotICAgICAgICAgICAgICAgIGlm IChSZWdpc3RyYWJsZURvbWFpbjo6dW5jaGVja2VkQ3JlYXRlRnJvbUhvc3QocGFpci5rZXkpID09 IHJlZ2lzdHJhYmxlRG9tYWluKSB7Ci0gICAgICAgICAgICAgICAgICAgIGZvciAoYXV0byogb2Jz ZXJ2ZXIgOiBwYWlyLnZhbHVlKQotICAgICAgICAgICAgICAgICAgICAgICAgb2JzZXJ2ZXItPmNv b2tpZXNBZGRlZChwYWlyLmtleSwgY29va2llcyk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgfQotICAgICAgICB9IG9uUXVldWU6ZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKV07Ci0g ICAgfQotCi0gICAgaWYgKFtuc0Nvb2tpZVN0b3JhZ2UoKSByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKF9zZXRDb29raWVzUmVtb3ZlZEhhbmRsZXI6b25RdWV1ZTopXSkgewotICAgICAgICBb bnNDb29raWVTdG9yYWdlKCkgX3NldENvb2tpZXNSZW1vdmVkSGFuZGxlcjpeKE5TQXJyYXk8TlNI VFRQQ29va2llKj4qIHJlbW92ZWRDb29raWVzLCBOU1N0cmluZyogZG9tYWluRm9yUmVtb3ZlZENv b2tpZXMsIGJvb2wgcmVtb3ZlQWxsQ29va2llcykKLSAgICAgICAgewotICAgICAgICAgICAgaWYg KHJlbW92ZUFsbENvb2tpZXMpIHsKLSAgICAgICAgICAgICAgICBmb3IgKGF1dG8mIG9ic2VydmVy cyA6IG1fY29va2llQ2hhbmdlT2JzZXJ2ZXJzLnZhbHVlcygpKSB7Ci0gICAgICAgICAgICAgICAg ICAgIGZvciAoYXV0byogb2JzZXJ2ZXIgOiBvYnNlcnZlcnMpCi0gICAgICAgICAgICAgICAgICAg ICAgICBvYnNlcnZlci0+YWxsQ29va2llc0RlbGV0ZWQoKTsKLSAgICAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQorICAgIFtuc0Nvb2tpZVN0b3Jh Z2UoKSBfc2V0Q29va2llc0NoYW5nZWRIYW5kbGVyOl4oTlNBcnJheTxOU0hUVFBDb29raWUqPiog YWRkZWRDb29raWVzLCBOU1N0cmluZyogZG9tYWluRm9yQ2hhbmdlZENvb2tpZSkgeworICAgICAg ICBTdHJpbmcgaG9zdCA9IGRvbWFpbkZvckNoYW5nZWRDb29raWU7CisgICAgICAgIGF1dG8gaXQg PSBtX2Nvb2tpZUNoYW5nZU9ic2VydmVycy5maW5kKGhvc3QpOworICAgICAgICBpZiAoaXQgPT0g bV9jb29raWVDaGFuZ2VPYnNlcnZlcnMuZW5kKCkpCisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIGF1dG8gY29va2llcyA9IG5zQ29va2llc1RvQ29va2llVmVjdG9yKGFkZGVkQ29va2llcywg W10oTlNIVFRQQ29va2llICpjb29raWUpIHsgcmV0dXJuICFjb29raWUuSFRUUE9ubHk7IH0pOwor ICAgICAgICBpZiAoY29va2llcy5pc0VtcHR5KCkpCisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIGZvciAoYXV0byogb2JzZXJ2ZXIgOiBpdC0+dmFsdWUpCisgICAgICAgICAgICBvYnNlcnZl ci0+Y29va2llc0FkZGVkKGhvc3QsIGNvb2tpZXMpOworICAgIH0gb25RdWV1ZTpkaXNwYXRjaF9n ZXRfbWFpbl9xdWV1ZSgpXTsKIAotICAgICAgICAgICAgU3RyaW5nIGhvc3QgPSBkb21haW5Gb3JS ZW1vdmVkQ29va2llczsKLSAgICAgICAgICAgIGF1dG8gaXQgPSBtX2Nvb2tpZUNoYW5nZU9ic2Vy dmVycy5maW5kKGhvc3QpOwotICAgICAgICAgICAgaWYgKGl0ID09IG1fY29va2llQ2hhbmdlT2Jz ZXJ2ZXJzLmVuZCgpKQotICAgICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAgICAgYXV0 byBjb29raWVzID0gbnNDb29raWVzVG9Db29raWVWZWN0b3IocmVtb3ZlZENvb2tpZXMsIFtdKE5T SFRUUENvb2tpZSAqY29va2llKSB7IHJldHVybiAhY29va2llLkhUVFBPbmx5OyB9KTsKLSAgICAg ICAgICAgIGlmIChjb29raWVzLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgICAgICBmb3IgKGF1dG8qIG9ic2VydmVyIDogaXQtPnZhbHVlKQotICAgICAgICAgICAg ICAgIG9ic2VydmVyLT5jb29raWVzRGVsZXRlZChob3N0LCBjb29raWVzKTsKLSAgICAgICAgfSBv blF1ZXVlOmRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCldOwotICAgIH0gZWxzZSB7Ci0gICAgICAg IC8vIE9sZCBTUEkuCi0gICAgICAgIC8vIEZJWE1FOiBUaGlzIGNvdWxkIGNhbiBiZSByZW1vdmVk IGFmdGVyIGEgd2hpbGUuIEl0IGlzIG9ubHkga2VwdCB0byBlbnN1cmUgYSBzbW9vdGggdHJhbnNp dGlvbiB0byB0aGUgbmV3IFNQSS4KLSAgICAgICAgW25zQ29va2llU3RvcmFnZSgpIF9zZXRDb29r aWVzRGVsZXRlZEhhbmRsZXI6XihOU0FycmF5PE5TSFRUUENvb2tpZSAqPiAqLCBib29sIC8qZGVs ZXRlZEFsbENvb2tpZXMqLykgeworICAgIFtuc0Nvb2tpZVN0b3JhZ2UoKSBfc2V0Q29va2llc1Jl bW92ZWRIYW5kbGVyOl4oTlNBcnJheTxOU0hUVFBDb29raWUqPiogcmVtb3ZlZENvb2tpZXMsIE5T U3RyaW5nKiBkb21haW5Gb3JSZW1vdmVkQ29va2llcywgYm9vbCByZW1vdmVBbGxDb29raWVzKQor ICAgIHsKKyAgICAgICAgaWYgKHJlbW92ZUFsbENvb2tpZXMpIHsKICAgICAgICAgICAgIGZvciAo YXV0byYgb2JzZXJ2ZXJzIDogbV9jb29raWVDaGFuZ2VPYnNlcnZlcnMudmFsdWVzKCkpIHsKICAg ICAgICAgICAgICAgICBmb3IgKGF1dG8qIG9ic2VydmVyIDogb2JzZXJ2ZXJzKQogICAgICAgICAg ICAgICAgICAgICBvYnNlcnZlci0+YWxsQ29va2llc0RlbGV0ZWQoKTsKICAgICAgICAgICAgIH0K LSAgICAgICAgfSBvblF1ZXVlOmRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCldOwotICAgIH0KKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIFN0cmluZyBob3N0ID0gZG9t YWluRm9yUmVtb3ZlZENvb2tpZXM7CisgICAgICAgIGF1dG8gaXQgPSBtX2Nvb2tpZUNoYW5nZU9i c2VydmVycy5maW5kKGhvc3QpOworICAgICAgICBpZiAoaXQgPT0gbV9jb29raWVDaGFuZ2VPYnNl cnZlcnMuZW5kKCkpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgYXV0byBjb29raWVz ID0gbnNDb29raWVzVG9Db29raWVWZWN0b3IocmVtb3ZlZENvb2tpZXMsIFtdKE5TSFRUUENvb2tp ZSAqY29va2llKSB7IHJldHVybiAhY29va2llLkhUVFBPbmx5OyB9KTsKKyAgICAgICAgaWYgKGNv b2tpZXMuaXNFbXB0eSgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBmb3IgKGF1dG8q IG9ic2VydmVyIDogaXQtPnZhbHVlKQorICAgICAgICAgICAgb2JzZXJ2ZXItPmNvb2tpZXNEZWxl dGVkKGhvc3QsIGNvb2tpZXMpOworICAgIH0gb25RdWV1ZTpkaXNwYXRjaF9nZXRfbWFpbl9xdWV1 ZSgpXTsKIH0KIAogdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnVucmVnaXN0ZXJDb29raWVD aGFuZ2VMaXN0ZW5lcnNJZk5lY2Vzc2FyeSgpCkBAIC02ODksMTYgKzY1Nyw4IEBAIHZvaWQgTmV0 d29ya1N0b3JhZ2VTZXNzaW9uOjp1bnJlZ2lzdGVyQ29va2llQ2hhbmdlTGlzdGVuZXJzSWZOZWNl c3NhcnkoKQogICAgIGlmICghbV9kaWRSZWdpc3RlckNvb2tpZUxpc3RlbmVycykKICAgICAgICAg cmV0dXJuOwogCi0gICAgaWYgKFtuc0Nvb2tpZVN0b3JhZ2UoKSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF9zZXRDb29raWVzQ2hhbmdlZEhhbmRsZXI6b25RdWV1ZTopXSkKLSAgICAgICAg W25zQ29va2llU3RvcmFnZSgpIF9zZXRDb29raWVzQ2hhbmdlZEhhbmRsZXI6bmlsIG9uUXVldWU6 bmlsXTsKLSAgICBlbHNlCi0gICAgICAgIFtuc0Nvb2tpZVN0b3JhZ2UoKSBfc2V0Q29va2llc0Fk ZGVkSGFuZGxlcjpuaWwgb25RdWV1ZTpuaWxdOyAvLyBPbGQgU1BJLgotCi0gICAgaWYgKFtuc0Nv b2tpZVN0b3JhZ2UoKSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRDb29raWVzUmVt b3ZlZEhhbmRsZXI6b25RdWV1ZTopXSkKLSAgICAgICAgW25zQ29va2llU3RvcmFnZSgpIF9zZXRD b29raWVzUmVtb3ZlZEhhbmRsZXI6bmlsIG9uUXVldWU6bmlsXTsKLSAgICBlbHNlCi0gICAgICAg IFtuc0Nvb2tpZVN0b3JhZ2UoKSBfc2V0Q29va2llc0RlbGV0ZWRIYW5kbGVyOm5pbCBvblF1ZXVl Om5pbF07IC8vIE9sZCBTUEkuCi0KKyAgICBbbnNDb29raWVTdG9yYWdlKCkgX3NldENvb2tpZXND aGFuZ2VkSGFuZGxlcjpuaWwgb25RdWV1ZTpuaWxdOworICAgIFtuc0Nvb2tpZVN0b3JhZ2UoKSBf c2V0Q29va2llc1JlbW92ZWRIYW5kbGVyOm5pbCBvblF1ZXVlOm5pbF07CiAgICAgW25zQ29va2ll U3RvcmFnZSgpIF9zZXRTdWJzY3JpYmVkRG9tYWluc0ZvckNvb2tpZUNoYW5nZXM6bmlsXTsKICAg ICBtX2RpZFJlZ2lzdGVyQ29va2llTGlzdGVuZXJzID0gZmFsc2U7CiB9Cg== 398528 2020-05-05 11:03:57 -0700 2020-05-05 11:59:42 -0700 Patch bug-211411-20200505110356.patch text/plain 10023 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzA1NjI0ZGUzZTVkMjkw MmE1MmUwOTEwZjUyODQ5ZGVkMGE0MGQyMC4uMTUxNjIxOGE4ODhjNThjYmI3ZGU4OGU2YTdlODk4 OGNhZDIzNjUwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA1LTA1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBjb2RlIHBhdGggdXNp bmcgdGhlIGxlZ2FjeSBDRk5ldHdvcmsgY29va2llIGNoYW5nZSBub3RpZmljYXRpb24gU1BJCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE0MTEKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyODY5MTQ4PgorCisgICAgICAgIFJldmlld2VkIGJ5IEpv aG4gV2lsYW5kZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NvY29hL05ldHdvcmtT dG9yYWdlU2Vzc2lvbkNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VT ZXNzaW9uOjpyZWdpc3RlckNvb2tpZUNoYW5nZUxpc3RlbmVyc0lmTmVjZXNzYXJ5KToKKyAgICAg ICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6dW5yZWdpc3RlckNvb2tpZUNoYW5n ZUxpc3RlbmVyc0lmTmVjZXNzYXJ5KToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdl U2Vzc2lvbjo6c3VwcG9ydHNDb29raWVDaGFuZ2VMaXN0ZW5lckFQSSBjb25zdCk6CisKIDIwMjAt MDUtMDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCByZXZlcnRpbmcgcjI2MTEzMC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCmluZGV4IGE2MTYxYTk1MDY4 OTdhMjVhYzFhZTUxN2JkZGUxNGYyZGM5N2Y2MWMuLjIzZTQ2MTIxNjdiYTc0ZjA0MGY3Yjc4NTMw YWQ0OTM4ZTkxZDkyOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIw LTA1LTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBj b2RlIHBhdGggdXNpbmcgdGhlIGxlZ2FjeSBDRk5ldHdvcmsgY29va2llIGNoYW5nZSBub3RpZmlj YXRpb24gU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTE0MTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyODY5MTQ4PgorCisgICAgICAgIFJl dmlld2VkIGJ5IEpvaG4gV2lsYW5kZXIuCisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NGTmV0d29y a1NQSS5oOgorCiAyMDIwLTA1LTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNjExMzAuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaCBiL1NvdXJjZS9XZWJDb3Jl L1BBTC9wYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oCmluZGV4IGEzYzkxYTk2YTNmMjZlOGNhMWU3 ZDI4OWIwYjdmYTZmY2Y1ZjlhYTQuLjhlZWI0MDliNjkxZTBlMzdjYWYyYmU1ZmVmYTFkMWQzOGFm NzcwYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0d29y a1NQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5o CkBAIC00MjMsOSArNDIzLDYgQEAgV1RGX0VYVEVSTl9DX0VORAogLSAoTlNBcnJheSogX19udWxs YWJsZSlfZ2V0Q29va2llc0ZvckRvbWFpbjooTlNTdHJpbmcqKWRvbWFpbjsKIC0gKHZvaWQpX3Nl dENvb2tpZXNDaGFuZ2VkSGFuZGxlcjoodm9pZCheX19udWxsYWJsZSkoTlNBcnJheTxOU0hUVFBD b29raWUqPiogYWRkZWRDb29raWVzLCBOU1N0cmluZyogZG9tYWluRm9yQ2hhbmdlZENvb2tpZSkp Y29va2llc0NoYW5nZWRIYW5kbGVyIG9uUXVldWU6KGRpc3BhdGNoX3F1ZXVlX3QgX19udWxsYWJs ZSlxdWV1ZTsKIC0gKHZvaWQpX3NldENvb2tpZXNSZW1vdmVkSGFuZGxlcjoodm9pZCheX19udWxs YWJsZSkoTlNBcnJheTxOU0hUVFBDb29raWUqPiogX19udWxsYWJsZSByZW1vdmVkQ29va2llcywg TlNTdHJpbmcqIF9fbnVsbGFibGUgZG9tYWluRm9yUmVtb3ZlZENvb2tpZXMsIGJvb2wgcmVtb3Zl QWxsQ29va2llcykpY29va2llc1JlbW92ZWRIYW5kbGVyIG9uUXVldWU6KGRpc3BhdGNoX3F1ZXVl X3QgX19udWxsYWJsZSlxdWV1ZTsKLS8vIEZJWE1FOiBUaGUgZm9sbG93aW5nIDIgc2hvdWxkIGJl IHJlbW92ZWQgYXJlIG9ubHkga2VwdCB0byBlbnN1cmUgc21vb3RoIHRyYW5zaXRpb24gdG8gdGhl IG5ldyBfc2V0Q29va2llc0NoYW5nZWRIYW5kbGVyIC8gX3NldENvb2tpZXNSZW1vdmVkSGFuZGxl ciBTUEkuCi0tICh2b2lkKV9zZXRDb29raWVzQWRkZWRIYW5kbGVyOih2b2lkKF5fX251bGxhYmxl KShOU0FycmF5PE5TSFRUUENvb2tpZSo+KiBhZGRlZENvb2tpZXMsIE5TVVJMKiBfX251bGxhYmxl IHVybEZvckFkZGVkQ29va2llcykpY29va2llc0FkZGVkSGFuZGxlciBvblF1ZXVlOihkaXNwYXRj aF9xdWV1ZV90IF9fbnVsbGFibGUpcXVldWU7Ci0tICh2b2lkKV9zZXRDb29raWVzRGVsZXRlZEhh bmRsZXI6KHZvaWQoXl9fbnVsbGFibGUpKE5TQXJyYXk8TlNIVFRQQ29va2llKj4qIF9fbnVsbGFi bGUgZGVsZXRlZENvb2tpZXMsIGJvb2wgZGVsZXRlZEFsbENvb2tpZXMpKWNvb2tpZXNEZWxldGVk SGFuZGxlciBvblF1ZXVlOihkaXNwYXRjaF9xdWV1ZV90IF9fbnVsbGFibGUpcXVldWU7CiBAZW5k CiAKIEBpbnRlcmZhY2UgTlNVUkxSZXNwb25zZSAoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9OZXR3b3JrU3RvcmFnZVNlc3Npb25Db2NvYS5tbSBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvTmV0d29ya1N0b3JhZ2VTZXNz aW9uQ29jb2EubW0KaW5kZXggODM3NmZjYmRlMjAyMThkMzhhNTlmMWQxOTFmNTcxMDI4ZTVmZGZk Yi4uM2RlODE2Njg5ZTQ2MmQ5ZjBiZTIyMzk4YzY3Yzc1ZWM0OGNiMGZkYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9OZXR3b3JrU3RvcmFnZVNlc3Np b25Db2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL05l dHdvcmtTdG9yYWdlU2Vzc2lvbkNvY29hLm1tCkBAIC02MjAsNzEgKzYyMCwzOCBAQCB2b2lkIE5l dHdvcmtTdG9yYWdlU2Vzc2lvbjo6cmVnaXN0ZXJDb29raWVDaGFuZ2VMaXN0ZW5lcnNJZk5lY2Vz c2FyeSgpCiAKICAgICBtX2RpZFJlZ2lzdGVyQ29va2llTGlzdGVuZXJzID0gdHJ1ZTsKIAotICAg IGlmIChbbnNDb29raWVTdG9yYWdlKCkgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfc2V0 Q29va2llc0NoYW5nZWRIYW5kbGVyOm9uUXVldWU6KV0pIHsKLSAgICAgICAgW25zQ29va2llU3Rv cmFnZSgpIF9zZXRDb29raWVzQ2hhbmdlZEhhbmRsZXI6XihOU0FycmF5PE5TSFRUUENvb2tpZSo+ KiBhZGRlZENvb2tpZXMsIE5TU3RyaW5nKiBkb21haW5Gb3JDaGFuZ2VkQ29va2llKSB7Ci0gICAg ICAgICAgICBTdHJpbmcgaG9zdCA9IGRvbWFpbkZvckNoYW5nZWRDb29raWU7Ci0gICAgICAgICAg ICBhdXRvIGl0ID0gbV9jb29raWVDaGFuZ2VPYnNlcnZlcnMuZmluZChob3N0KTsKLSAgICAgICAg ICAgIGlmIChpdCA9PSBtX2Nvb2tpZUNoYW5nZU9ic2VydmVycy5lbmQoKSkKLSAgICAgICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgICAgICBhdXRvIGNvb2tpZXMgPSBuc0Nvb2tpZXNUb0Nvb2tp ZVZlY3RvcihhZGRlZENvb2tpZXMsIFtdKE5TSFRUUENvb2tpZSAqY29va2llKSB7IHJldHVybiAh Y29va2llLkhUVFBPbmx5OyB9KTsKLSAgICAgICAgICAgIGlmIChjb29raWVzLmlzRW1wdHkoKSkK LSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICBmb3IgKGF1dG8qIG9ic2VydmVy IDogaXQtPnZhbHVlKQotICAgICAgICAgICAgICAgIG9ic2VydmVyLT5jb29raWVzQWRkZWQoaG9z dCwgY29va2llcyk7Ci0gICAgICAgIH0gb25RdWV1ZTpkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgp XTsKLSAgICB9IGVsc2UgewotICAgICAgICAvLyBPbGQgU1BJLgotICAgICAgICAvLyBGSVhNRTog VGhpcyBjb3VsZCBjYW4gYmUgcmVtb3ZlZCBhZnRlciBhIHdoaWxlLiBJdCBpcyBvbmx5IGtlcHQg dG8gZW5zdXJlIGEgc21vb3RoIHRyYW5zaXRpb24gdG8gdGhlIG5ldyBTUEkuCi0gICAgICAgIFtu c0Nvb2tpZVN0b3JhZ2UoKSBfc2V0Q29va2llc0FkZGVkSGFuZGxlcjpeKE5TQXJyYXk8TlNIVFRQ Q29va2llICo+ICogbnNDb29raWVzLCBOU1VSTCAqdXJsRm9yQWRkZWRDb29raWVzKSB7Ci0gICAg ICAgICAgICBhdXRvIGNvb2tpZXMgPSBuc0Nvb2tpZXNUb0Nvb2tpZVZlY3Rvcihuc0Nvb2tpZXMs IFtdKE5TSFRUUENvb2tpZSAqY29va2llKSB7IHJldHVybiAhY29va2llLkhUVFBPbmx5OyB9KTsK LSAgICAgICAgICAgIGlmIChjb29raWVzLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgICAgICBhdXRvIGhvc3QgPSBVUkwodXJsRm9yQWRkZWRDb29raWVzKS5ob3N0 KCkudG9TdHJpbmcoKTsKLSAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFob3N0LmlzTnVsbCgp KTsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIGluZWZmaWNpZW50LiBVbmZvcnR1bmF0 ZWx5LCBDRk5ldHdvcmsgc2VuZHMgdXMgbm90aWZpY2F0aW9ucyBmb3IgaG9zdHMgdGhhdCBkbyBu b3QgbWF0Y2ggZXhhY3RseSB0aGUgb25lcyB3ZQotICAgICAgICAgICAgLy8gYXJlIGxpc3Rlbmlu ZyBmb3IgKGUuZy4gJ3NlY3VyZS5odWx1LmNvbSBpbnN0ZWFkIG9mICd3d3cuaHVsdS5jb20nIGZv cikuIFNlZSA8cmRhcjovL3Byb2JsZW0vNTk5NzM2MzA+LgotICAgICAgICAgICAgYXV0byByZWdp c3RyYWJsZURvbWFpbiA9IFJlZ2lzdHJhYmxlRG9tYWluOjp1bmNoZWNrZWRDcmVhdGVGcm9tSG9z dChob3N0KTsKLSAgICAgICAgICAgIGZvciAoYXV0byYgcGFpciA6IG1fY29va2llQ2hhbmdlT2Jz ZXJ2ZXJzKSB7Ci0gICAgICAgICAgICAgICAgaWYgKFJlZ2lzdHJhYmxlRG9tYWluOjp1bmNoZWNr ZWRDcmVhdGVGcm9tSG9zdChwYWlyLmtleSkgPT0gcmVnaXN0cmFibGVEb21haW4pIHsKLSAgICAg ICAgICAgICAgICAgICAgZm9yIChhdXRvKiBvYnNlcnZlciA6IHBhaXIudmFsdWUpCi0gICAgICAg ICAgICAgICAgICAgICAgICBvYnNlcnZlci0+Y29va2llc0FkZGVkKHBhaXIua2V5LCBjb29raWVz KTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0gb25RdWV1ZTpk aXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpXTsKLSAgICB9Ci0KLSAgICBpZiAoW25zQ29va2llU3Rv cmFnZSgpIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3NldENvb2tpZXNSZW1vdmVkSGFu ZGxlcjpvblF1ZXVlOildKSB7Ci0gICAgICAgIFtuc0Nvb2tpZVN0b3JhZ2UoKSBfc2V0Q29va2ll c1JlbW92ZWRIYW5kbGVyOl4oTlNBcnJheTxOU0hUVFBDb29raWUqPiogcmVtb3ZlZENvb2tpZXMs IE5TU3RyaW5nKiBkb21haW5Gb3JSZW1vdmVkQ29va2llcywgYm9vbCByZW1vdmVBbGxDb29raWVz KQotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAocmVtb3ZlQWxsQ29va2llcykgewotICAgICAg ICAgICAgICAgIGZvciAoYXV0byYgb2JzZXJ2ZXJzIDogbV9jb29raWVDaGFuZ2VPYnNlcnZlcnMu dmFsdWVzKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgZm9yIChhdXRvKiBvYnNlcnZlciA6IG9i c2VydmVycykKLSAgICAgICAgICAgICAgICAgICAgICAgIG9ic2VydmVyLT5hbGxDb29raWVzRGVs ZXRlZCgpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgICAgICB9CisgICAgW25zQ29va2llU3RvcmFnZSgpIF9zZXRDb29raWVzQ2hhbmdlZEhhbmRs ZXI6XihOU0FycmF5PE5TSFRUUENvb2tpZSo+KiBhZGRlZENvb2tpZXMsIE5TU3RyaW5nKiBkb21h aW5Gb3JDaGFuZ2VkQ29va2llKSB7CisgICAgICAgIFN0cmluZyBob3N0ID0gZG9tYWluRm9yQ2hh bmdlZENvb2tpZTsKKyAgICAgICAgYXV0byBpdCA9IG1fY29va2llQ2hhbmdlT2JzZXJ2ZXJzLmZp bmQoaG9zdCk7CisgICAgICAgIGlmIChpdCA9PSBtX2Nvb2tpZUNoYW5nZU9ic2VydmVycy5lbmQo KSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgYXV0byBjb29raWVzID0gbnNDb29raWVz VG9Db29raWVWZWN0b3IoYWRkZWRDb29raWVzLCBbXShOU0hUVFBDb29raWUgKmNvb2tpZSkgeyBy ZXR1cm4gIWNvb2tpZS5IVFRQT25seTsgfSk7CisgICAgICAgIGlmIChjb29raWVzLmlzRW1wdHko KSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgZm9yIChhdXRvKiBvYnNlcnZlciA6IGl0 LT52YWx1ZSkKKyAgICAgICAgICAgIG9ic2VydmVyLT5jb29raWVzQWRkZWQoaG9zdCwgY29va2ll cyk7CisgICAgfSBvblF1ZXVlOmRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCldOwogCi0gICAgICAg ICAgICBTdHJpbmcgaG9zdCA9IGRvbWFpbkZvclJlbW92ZWRDb29raWVzOwotICAgICAgICAgICAg YXV0byBpdCA9IG1fY29va2llQ2hhbmdlT2JzZXJ2ZXJzLmZpbmQoaG9zdCk7Ci0gICAgICAgICAg ICBpZiAoaXQgPT0gbV9jb29raWVDaGFuZ2VPYnNlcnZlcnMuZW5kKCkpCi0gICAgICAgICAgICAg ICAgcmV0dXJuOwotCi0gICAgICAgICAgICBhdXRvIGNvb2tpZXMgPSBuc0Nvb2tpZXNUb0Nvb2tp ZVZlY3RvcihyZW1vdmVkQ29va2llcywgW10oTlNIVFRQQ29va2llICpjb29raWUpIHsgcmV0dXJu ICFjb29raWUuSFRUUE9ubHk7IH0pOwotICAgICAgICAgICAgaWYgKGNvb2tpZXMuaXNFbXB0eSgp KQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIGZvciAoYXV0byogb2JzZXJ2 ZXIgOiBpdC0+dmFsdWUpCi0gICAgICAgICAgICAgICAgb2JzZXJ2ZXItPmNvb2tpZXNEZWxldGVk KGhvc3QsIGNvb2tpZXMpOwotICAgICAgICB9IG9uUXVldWU6ZGlzcGF0Y2hfZ2V0X21haW5fcXVl dWUoKV07Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgLy8gT2xkIFNQSS4KLSAgICAgICAgLy8gRklY TUU6IFRoaXMgY291bGQgY2FuIGJlIHJlbW92ZWQgYWZ0ZXIgYSB3aGlsZS4gSXQgaXMgb25seSBr ZXB0IHRvIGVuc3VyZSBhIHNtb290aCB0cmFuc2l0aW9uIHRvIHRoZSBuZXcgU1BJLgotICAgICAg ICBbbnNDb29raWVTdG9yYWdlKCkgX3NldENvb2tpZXNEZWxldGVkSGFuZGxlcjpeKE5TQXJyYXk8 TlNIVFRQQ29va2llICo+ICosIGJvb2wgLypkZWxldGVkQWxsQ29va2llcyovKSB7CisgICAgW25z Q29va2llU3RvcmFnZSgpIF9zZXRDb29raWVzUmVtb3ZlZEhhbmRsZXI6XihOU0FycmF5PE5TSFRU UENvb2tpZSo+KiByZW1vdmVkQ29va2llcywgTlNTdHJpbmcqIGRvbWFpbkZvclJlbW92ZWRDb29r aWVzLCBib29sIHJlbW92ZUFsbENvb2tpZXMpIHsKKyAgICAgICAgaWYgKHJlbW92ZUFsbENvb2tp ZXMpIHsKICAgICAgICAgICAgIGZvciAoYXV0byYgb2JzZXJ2ZXJzIDogbV9jb29raWVDaGFuZ2VP YnNlcnZlcnMudmFsdWVzKCkpIHsKICAgICAgICAgICAgICAgICBmb3IgKGF1dG8qIG9ic2VydmVy IDogb2JzZXJ2ZXJzKQogICAgICAgICAgICAgICAgICAgICBvYnNlcnZlci0+YWxsQ29va2llc0Rl bGV0ZWQoKTsKICAgICAgICAgICAgIH0KLSAgICAgICAgfSBvblF1ZXVlOmRpc3BhdGNoX2dldF9t YWluX3F1ZXVlKCldOwotICAgIH0KKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisg ICAgICAgIFN0cmluZyBob3N0ID0gZG9tYWluRm9yUmVtb3ZlZENvb2tpZXM7CisgICAgICAgIGF1 dG8gaXQgPSBtX2Nvb2tpZUNoYW5nZU9ic2VydmVycy5maW5kKGhvc3QpOworICAgICAgICBpZiAo aXQgPT0gbV9jb29raWVDaGFuZ2VPYnNlcnZlcnMuZW5kKCkpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgYXV0byBjb29raWVzID0gbnNDb29raWVzVG9Db29raWVWZWN0b3IocmVtb3Zl ZENvb2tpZXMsIFtdKE5TSFRUUENvb2tpZSAqY29va2llKSB7IHJldHVybiAhY29va2llLkhUVFBP bmx5OyB9KTsKKyAgICAgICAgaWYgKGNvb2tpZXMuaXNFbXB0eSgpKQorICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICBmb3IgKGF1dG8qIG9ic2VydmVyIDogaXQtPnZhbHVlKQorICAgICAgICAg ICAgb2JzZXJ2ZXItPmNvb2tpZXNEZWxldGVkKGhvc3QsIGNvb2tpZXMpOworICAgIH0gb25RdWV1 ZTpkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpXTsKIH0KIAogdm9pZCBOZXR3b3JrU3RvcmFnZVNl c3Npb246OnVucmVnaXN0ZXJDb29raWVDaGFuZ2VMaXN0ZW5lcnNJZk5lY2Vzc2FyeSgpCkBAIC02 OTIsMTUgKzY1OSw4IEBAIHZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjp1bnJlZ2lzdGVyQ29v a2llQ2hhbmdlTGlzdGVuZXJzSWZOZWNlc3NhcnkoKQogICAgIGlmICghbV9kaWRSZWdpc3RlckNv b2tpZUxpc3RlbmVycykKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKFtuc0Nvb2tpZVN0b3Jh Z2UoKSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRDb29raWVzQ2hhbmdlZEhhbmRs ZXI6b25RdWV1ZTopXSkKLSAgICAgICAgW25zQ29va2llU3RvcmFnZSgpIF9zZXRDb29raWVzQ2hh bmdlZEhhbmRsZXI6bmlsIG9uUXVldWU6bmlsXTsKLSAgICBlbHNlCi0gICAgICAgIFtuc0Nvb2tp ZVN0b3JhZ2UoKSBfc2V0Q29va2llc0FkZGVkSGFuZGxlcjpuaWwgb25RdWV1ZTpuaWxdOyAvLyBP bGQgU1BJLgotCi0gICAgaWYgKFtuc0Nvb2tpZVN0b3JhZ2UoKSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF9zZXRDb29raWVzUmVtb3ZlZEhhbmRsZXI6b25RdWV1ZTopXSkKLSAgICAgICAg W25zQ29va2llU3RvcmFnZSgpIF9zZXRDb29raWVzUmVtb3ZlZEhhbmRsZXI6bmlsIG9uUXVldWU6 bmlsXTsKLSAgICBlbHNlCi0gICAgICAgIFtuc0Nvb2tpZVN0b3JhZ2UoKSBfc2V0Q29va2llc0Rl bGV0ZWRIYW5kbGVyOm5pbCBvblF1ZXVlOm5pbF07IC8vIE9sZCBTUEkuCisgICAgW25zQ29va2ll U3RvcmFnZSgpIF9zZXRDb29raWVzQ2hhbmdlZEhhbmRsZXI6bmlsIG9uUXVldWU6bmlsXTsKKyAg ICBbbnNDb29raWVTdG9yYWdlKCkgX3NldENvb2tpZXNSZW1vdmVkSGFuZGxlcjpuaWwgb25RdWV1 ZTpuaWxdOwogCiAgICAgW25zQ29va2llU3RvcmFnZSgpIF9zZXRTdWJzY3JpYmVkRG9tYWluc0Zv ckNvb2tpZUNoYW5nZXM6bmlsXTsKICAgICBtX2RpZFJlZ2lzdGVyQ29va2llTGlzdGVuZXJzID0g ZmFsc2U7CkBAIC03NTEsNyArNzExLDcgQEAgdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnN0 b3BMaXN0ZW5pbmdGb3JDb29raWVDaGFuZ2VOb3RpZmljYXRpb25zKENvb2tpZUNoYW4KIC8vIEZJ WE1FOiBUaGlzIGNhbiBldmVudHVhbGx5IGdvIGF3YXksIHRoaXMgaXMgbWVyZWx5IHRvIGVuc3Vy ZSBhIHNtb290aCB0cmFuc2l0aW9uIHRvIHRoZSBuZXcgQVBJLgogYm9vbCBOZXR3b3JrU3RvcmFn ZVNlc3Npb246OnN1cHBvcnRzQ29va2llQ2hhbmdlTGlzdGVuZXJBUEkoKSBjb25zdAogewotICAg IHN0YXRpYyBjb25zdCBib29sIHN1cHBvcnRzQVBJID0gW25zQ29va2llU3RvcmFnZSgpIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3NldFN1YnNjcmliZWREb21haW5zRm9yQ29va2llQ2hh bmdlczopXTsKKyAgICBzdGF0aWMgY29uc3QgYm9vbCBzdXBwb3J0c0FQSSA9IFtuc0Nvb2tpZVN0 b3JhZ2UoKSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRDb29raWVzQ2hhbmdlZEhh bmRsZXI6b25RdWV1ZTopXTsKICAgICByZXR1cm4gc3VwcG9ydHNBUEk7CiB9CiAK