227058 2021-06-15 23:13:37 -0700 Clean up API::HTTPCookieStore 2021-06-16 08:14:54 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen andersca oldest_to_newest 1770092 0 achristensen 2021-06-15 23:13:37 -0700 Clean up API::HTTPCookieStore 1770093 1 431522 achristensen 2021-06-15 23:15:06 -0700 Created attachment 431522 Patch 1770191 2 achristensen 2021-06-16 08:14:54 -0700 r278934 431522 2021-06-15 23:15:06 -0700 2021-06-16 07:06:20 -0700 Patch bug-227058-20210615231505.patch text/plain 11601 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4OTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNjNWQwYjk0MzNjMzljMDQ5 MDAwZDk1YTA4YTY3YmNiYjA1ODliZWIuLjlmYmEzMmVjNDMxMjFkMGY1MjkwOWRjZTA4ZmRjNzEy NzVmYWU4ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMDYtMTUgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBDbGVhbiB1cCBB UEk6OkhUVFBDb29raWVTdG9yZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjI3MDU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyByZW1vdmVzIGNvZGUgdGhhdCBoYXMgYmVlbiB1bnVzZWQgc2luY2Ug cjI2Nzc2My4KKyAgICAgICAgSSBhbHNvIHVzZSBzbWFydCBwb2ludGVycyBpbnN0ZWFkIG9mIHJh dyBwb2ludGVycyBqdXN0IHRvIGJlIG9uIHRoZSBzYWZlIHNpZGUuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0FQSUhUVFBDb29raWVTdG9yZS5jcHA6CisgICAgICAgIChBUEk6OkhUVFBDb29r aWVTdG9yZTo6fkhUVFBDb29raWVTdG9yZSk6CisgICAgICAgIChBUEk6OkhUVFBDb29raWVTdG9y ZTo6cmVnaXN0ZXJPYnNlcnZlcik6CisgICAgICAgIChBUEk6OkhUVFBDb29raWVTdG9yZTo6dW5y ZWdpc3Rlck9ic2VydmVyKToKKyAgICAgICAgKEFQSTo6SFRUUENvb2tpZVN0b3JlOjpjb29raWVz RGlkQ2hhbmdlKToKKyAgICAgICAgKEFQSTo6SFRUUENvb2tpZVN0b3JlOjpjb29raWVNYW5hZ2Vy RGVzdHJveWVkKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSUhUVFBDb29r aWVTdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb29raWVNYW5hZ2VyUHJveHkuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0 OjpnZW5lcmF0ZUxpc3RlbmVySWRlbnRpZmllcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6 OnByb2Nlc3NQb29sQ3JlYXRpb25MaXN0ZW5lckZ1bmN0aW9uTWFwKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnJlZ2lzdGVyUHJvY2Vzc1Bvb2xDcmVhdGlvbkxp c3RlbmVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnVucmVn aXN0ZXJQcm9jZXNzUG9vbENyZWF0aW9uTGlzdGVuZXIpOiBEZWxldGVkLgorICAgICAgICAoV2Vi S2l0OjpXZWJQcm9jZXNzUG9vbDo6bm90aWZ5VGhpc1dlYlByb2Nlc3NQb29sV2FzQ3JlYXRlZCk6 IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmg6CisKIDIwMjEt MDYtMTUgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZW1vdmUgdW51c2VkIGNvZGUgb24gQVBJOjpIVFRQQ29va2llU3RvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElIVFRQQ29va2llU3RvcmUuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUhUVFBDb29raWVTdG9yZS5jcHAKaW5kZXgg NGFkZDI0NmVkMDVmOTg2OWY3ODUzM2EyNGNhYWQ4ZWQ0ZWM4NzEzNC4uNjRiMGRlMDlmYzk4ZDg1 MDY0NWRhNjFlMWZkYjcxMjY1ODE4OGJjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0FQSUhUVFBDb29raWVTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0FQSUhUVFBDb29raWVTdG9yZS5jcHAKQEAgLTUwLDcgKzUwLDcgQEAgSFRUUENv b2tpZVN0b3JlOjpIVFRQQ29va2llU3RvcmUoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlJiB3ZWJz aXRlRGF0YVN0b3JlKQogCiBIVFRQQ29va2llU3RvcmU6On5IVFRQQ29va2llU3RvcmUoKQogewot ICAgIEFTU0VSVChtX29ic2VydmVycy5pc0VtcHR5KCkpOworICAgIEFTU0VSVChtX29ic2VydmVy cy5jb21wdXRlc0VtcHR5KCkpOwogICAgIEFTU0VSVCghbV9vYnNlcnZlZENvb2tpZU1hbmFnZXJQ cm94eSk7CiAgICAgQVNTRVJUKCFtX2Nvb2tpZU1hbmFnZXJQcm94eU9ic2VydmVyKTsKIH0KQEAg LTEzOCwxMSArMTM4LDYgQEAgcHJpdmF0ZToKICAgICAgICAgbV9jb29raWVTdG9yZS5jb29raWVz RGlkQ2hhbmdlKCk7CiAgICAgfQogCi0gICAgdm9pZCBtYW5hZ2VyRGVzdHJveWVkKCkgZmluYWwK LSAgICB7Ci0gICAgICAgIG1fY29va2llU3RvcmUuY29va2llTWFuYWdlckRlc3Ryb3llZCgpOwot ICAgIH0KLQogICAgIEFQSTo6SFRUUENvb2tpZVN0b3JlJiBtX2Nvb2tpZVN0b3JlOwogfTsKIApA QCAtMTU3LDM5ICsxNTIsMjggQEAgdm9pZCBIVFRQQ29va2llU3RvcmU6OnJlZ2lzdGVyT2JzZXJ2 ZXIoT2JzZXJ2ZXImIG9ic2VydmVyKQogCiAgICAgbV9jb29raWVNYW5hZ2VyUHJveHlPYnNlcnZl ciA9IG1ha2VVbmlxdWU8QVBJV2ViQ29va2llTWFuYWdlclByb3h5T2JzZXJ2ZXI+KCp0aGlzKTsK IAotICAgIG1fb2JzZXJ2ZWRDb29raWVNYW5hZ2VyUHJveHkgPSAmbV9vd25pbmdEYXRhU3RvcmUt Pm5ldHdvcmtQcm9jZXNzKCkuY29va2llTWFuYWdlcigpOworICAgIG1fb2JzZXJ2ZWRDb29raWVN YW5hZ2VyUHJveHkgPSBtYWtlV2Vha1B0cihtX293bmluZ0RhdGFTdG9yZS0+bmV0d29ya1Byb2Nl c3MoKS5jb29raWVNYW5hZ2VyKCkpOwogICAgIG1fb2JzZXJ2ZWRDb29raWVNYW5hZ2VyUHJveHkt PnJlZ2lzdGVyT2JzZXJ2ZXIobV9vd25pbmdEYXRhU3RvcmUtPnNlc3Npb25JRCgpLCAqbV9jb29r aWVNYW5hZ2VyUHJveHlPYnNlcnZlcik7CiB9CiAKIHZvaWQgSFRUUENvb2tpZVN0b3JlOjp1bnJl Z2lzdGVyT2JzZXJ2ZXIoT2JzZXJ2ZXImIG9ic2VydmVyKQogewotICAgIG1fb2JzZXJ2ZXJzLnJl bW92ZSgmb2JzZXJ2ZXIpOworICAgIG1fb2JzZXJ2ZXJzLnJlbW92ZShvYnNlcnZlcik7CiAKLSAg ICBpZiAoIW1fb2JzZXJ2ZXJzLmlzRW1wdHkoKSkKKyAgICBpZiAoIW1fb2JzZXJ2ZXJzLmNvbXB1 dGVzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKG1fb2JzZXJ2ZWRDb29raWVN YW5hZ2VyUHJveHkpCiAgICAgICAgIG1fb2JzZXJ2ZWRDb29raWVNYW5hZ2VyUHJveHktPnVucmVn aXN0ZXJPYnNlcnZlcihtX293bmluZ0RhdGFTdG9yZS0+c2Vzc2lvbklEKCksICptX2Nvb2tpZU1h bmFnZXJQcm94eU9ic2VydmVyKTsKIAotICAgIGlmIChtX3Byb2Nlc3NQb29sQ3JlYXRpb25MaXN0 ZW5lcklkZW50aWZpZXIpCi0gICAgICAgIFdlYlByb2Nlc3NQb29sOjp1bnJlZ2lzdGVyUHJvY2Vz c1Bvb2xDcmVhdGlvbkxpc3RlbmVyKG1fcHJvY2Vzc1Bvb2xDcmVhdGlvbkxpc3RlbmVySWRlbnRp Zmllcik7Ci0KLSAgICBtX3Byb2Nlc3NQb29sQ3JlYXRpb25MaXN0ZW5lcklkZW50aWZpZXIgPSAw OwogICAgIG1fb2JzZXJ2ZWRDb29raWVNYW5hZ2VyUHJveHkgPSBudWxscHRyOwogICAgIG1fY29v a2llTWFuYWdlclByb3h5T2JzZXJ2ZXIgPSBudWxscHRyOwogfQogCiB2b2lkIEhUVFBDb29raWVT dG9yZTo6Y29va2llc0RpZENoYW5nZSgpCiB7Ci0gICAgZm9yIChhdXRvKiBvYnNlcnZlciA6IG1f b2JzZXJ2ZXJzKQotICAgICAgICBvYnNlcnZlci0+Y29va2llc0RpZENoYW5nZSgqdGhpcyk7Ci19 Ci0KLXZvaWQgSFRUUENvb2tpZVN0b3JlOjpjb29raWVNYW5hZ2VyRGVzdHJveWVkKCkKLXsKLSAg ICBtX29ic2VydmVkQ29va2llTWFuYWdlclByb3h5LT51bnJlZ2lzdGVyT2JzZXJ2ZXIobV9vd25p bmdEYXRhU3RvcmUtPnNlc3Npb25JRCgpLCAqbV9jb29raWVNYW5hZ2VyUHJveHlPYnNlcnZlcik7 Ci0gICAgbV9vYnNlcnZlZENvb2tpZU1hbmFnZXJQcm94eSA9ICZtX293bmluZ0RhdGFTdG9yZS0+ bmV0d29ya1Byb2Nlc3MoKS5jb29raWVNYW5hZ2VyKCk7Ci0gICAgbV9vYnNlcnZlZENvb2tpZU1h bmFnZXJQcm94eS0+cmVnaXN0ZXJPYnNlcnZlcihtX293bmluZ0RhdGFTdG9yZS0+c2Vzc2lvbklE KCksICptX2Nvb2tpZU1hbmFnZXJQcm94eU9ic2VydmVyKTsKKyAgICBmb3IgKGF1dG8mIG9ic2Vy dmVyIDogbV9vYnNlcnZlcnMpCisgICAgICAgIG9ic2VydmVyLmNvb2tpZXNEaWRDaGFuZ2UoKnRo aXMpOwogfQogICAgIAogfSAvLyBuYW1lc3BhY2UgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQVBJSFRUUENvb2tpZVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQVBJSFRUUENvb2tpZVN0b3JlLmgKaW5kZXggMjRlZGU1NzFiOTJjOWU0MGQ0 MTg1ZTAxYmYwMzM4ODE4NTE4YjdhMC4uYmFlOTBiYWRlNzdiNzVhZDQ0OTIwZjkxMGUwYjQ5ZGFj NGNiZTY0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUhUVFBD b29raWVTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElIVFRQQ29v a2llU3RvcmUuaApAQCAtMjksNyArMjksOCBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ29va2llLmg+ CiAjaW5jbHVkZSA8d3RmL0NvbXBsZXRpb25IYW5kbGVyLmg+CiAjaW5jbHVkZSA8d3RmL0Zvcndh cmQuaD4KLSNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgorI2luY2x1ZGUgPHd0Zi9XZWFrSGFzaFNl dC5oPgorI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHN0 cnVjdCBDb29raWU7CkBAIC02Niw3ICs2Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEhUVFBD b29raWVBY2NlcHRQb2xpY3koV2ViQ29yZTo6SFRUUENvb2tpZUFjY2VwdFBvbGljeSwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICAgICB2b2lkIGZsdXNoQ29va2llcyhDb21wbGV0aW9u SGFuZGxlcjx2b2lkKCk+JiYpOwogCi0gICAgY2xhc3MgT2JzZXJ2ZXIgeworICAgIGNsYXNzIE9i c2VydmVyIDogcHVibGljIENhbk1ha2VXZWFrUHRyPE9ic2VydmVyPiB7CiAgICAgcHVibGljOgog ICAgICAgICB2aXJ0dWFsIH5PYnNlcnZlcigpIHsgfQogICAgICAgICB2aXJ0dWFsIHZvaWQgY29v a2llc0RpZENoYW5nZShIVFRQQ29va2llU3RvcmUmKSA9IDA7CkBAIC03Niw3ICs3Nyw2IEBAIHB1 YmxpYzoKICAgICB2b2lkIHVucmVnaXN0ZXJPYnNlcnZlcihPYnNlcnZlciYpOwogCiAgICAgdm9p ZCBjb29raWVzRGlkQ2hhbmdlKCk7Ci0gICAgdm9pZCBjb29raWVNYW5hZ2VyRGVzdHJveWVkKCk7 CiAKICAgICB2b2lkIGZpbHRlckFwcEJvdW5kQ29va2llcyhjb25zdCBWZWN0b3I8V2ViQ29yZTo6 Q29va2llPiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoVmVjdG9yPFdlYkNvcmU6OkNvb2tpZT4m Jik+JiYpOwogCkBAIC04NiwxNSArODYsOSBAQCBwcml2YXRlOgogICAgIC8vIEZJWE1FOiBUaGlz IGlzIGEgcmVmZXJlbmNlIGN5Y2xlLgogICAgIFJlZjxXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU+ IG1fb3duaW5nRGF0YVN0b3JlOwogCi0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGEgV2Vh a0hhc2hTZXQuCi0gICAgSGFzaFNldDxPYnNlcnZlcio+IG1fb2JzZXJ2ZXJzOwotCi0gICAgLy8g RklYTUU6IFRoaXMgc2hvdWxkIGJlIGEgV2Vha1B0ci4KLSAgICBXZWJLaXQ6OldlYkNvb2tpZU1h bmFnZXJQcm94eSogbV9vYnNlcnZlZENvb2tpZU1hbmFnZXJQcm94eSB7IG51bGxwdHIgfTsKKyAg ICBXZWFrSGFzaFNldDxPYnNlcnZlcj4gbV9vYnNlcnZlcnM7CisgICAgV2Vha1B0cjxXZWJLaXQ6 OldlYkNvb2tpZU1hbmFnZXJQcm94eT4gbV9vYnNlcnZlZENvb2tpZU1hbmFnZXJQcm94eTsKICAg ICBzdGQ6OnVuaXF1ZV9wdHI8QVBJV2ViQ29va2llTWFuYWdlclByb3h5T2JzZXJ2ZXI+IG1fY29v a2llTWFuYWdlclByb3h5T2JzZXJ2ZXI7Ci0KLSAgICAvLyBGSVhNRTogVGhpcyBpcyBhbHdheXMg MC4gUmVtb3ZlIGl0IGFuZCB0aGUgY29kZSB0aGF0IGlzIGNhbGxlZCB3aGVuIGl0IHdhc24ndCB6 ZXJvIGJlZm9yZSByMjY3NzYzLgotICAgIHVpbnQ2NF90IG1fcHJvY2Vzc1Bvb2xDcmVhdGlvbkxp c3RlbmVySWRlbnRpZmllciB7IDAgfTsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYkNvb2tpZU1hbmFnZXJQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5LmgKaW5kZXggMTRkMmNjMDA0ZjRkOTY5Y2U2Zjkx YWI1ZmE2MTYxZTE4Mjk4YjY3Yi4uN2JhODViMDllYjNlNzFlYmYwNzVmNTkyZjE3ZWNlZmUzOGEw NGVhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQ29va2llTWFuYWdl clByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclBy b3h5LmgKQEAgLTUyLDcgKzUyLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBXZWJQcm9j ZXNzUG9vbDsKIGNsYXNzIFdlYlByb2Nlc3NQcm94eTsKIAotY2xhc3MgV2ViQ29va2llTWFuYWdl clByb3h5IDogcHVibGljIEFQSTo6T2JqZWN0SW1wbDxBUEk6Ok9iamVjdDo6VHlwZTo6Q29va2ll TWFuYWdlcj4sIHByaXZhdGUgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgeworY2xhc3MgV2ViQ29va2ll TWFuYWdlclByb3h5IDogcHVibGljIEFQSTo6T2JqZWN0SW1wbDxBUEk6Ok9iamVjdDo6VHlwZTo6 Q29va2llTWFuYWdlcj4sIHB1YmxpYyBJUEM6Ok1lc3NhZ2VSZWNlaXZlciB7CiBwdWJsaWM6CiAg ICAgc3RhdGljIFJlZjxXZWJDb29raWVNYW5hZ2VyUHJveHk+IGNyZWF0ZShOZXR3b3JrUHJvY2Vz c1Byb3h5JiBuZXR3b3JrUHJvY2VzcykgeyByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJDb29raWVN YW5hZ2VyUHJveHkobmV0d29ya1Byb2Nlc3MpKTsgfQogICAgIHZpcnR1YWwgfldlYkNvb2tpZU1h bmFnZXJQcm94eSgpOwpAQCAtODMsNyArODMsNiBAQCBwdWJsaWM6CiAgICAgcHVibGljOgogICAg ICAgICB2aXJ0dWFsIH5PYnNlcnZlcigpIHsgfQogICAgICAgICB2aXJ0dWFsIHZvaWQgY29va2ll c0RpZENoYW5nZSgpID0gMDsKLSAgICAgICAgdmlydHVhbCB2b2lkIG1hbmFnZXJEZXN0cm95ZWQo KSA9IDA7CiAgICAgfTsKIAogICAgIHZvaWQgcmVnaXN0ZXJPYnNlcnZlcihQQUw6OlNlc3Npb25J RCwgT2JzZXJ2ZXImKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNw cAppbmRleCA4MTZlYTQzMjM0NWYyYTliN2FkNTE2ZGY0M2NjNjA0YmI0NTlkMmEwLi5iMjc2ODU3 Njk0NDVlYzdhMTU3NjZhOTZlNGQ5YWM2OTAyMWZjYzgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0xNjIsNjggKzE2MiwxMiBAQCBjb25zdGV4cHIg U2Vjb25kcyByZXNldEdQVVByb2Nlc3NDcmFzaENvdW50RGVsYXkgeyAzMF9zIH07CiBjb25zdGV4 cHIgdW5zaWduZWQgbWF4aW11bUdQVVByb2Nlc3NSZWxhdW5jaEF0dGVtcHRzQmVmb3JlS2lsbGlu Z1dlYlByb2Nlc3NlcyB7IDIgfTsKICNlbmRpZgogCi1zdGF0aWMgdWludDY0X3QgZ2VuZXJhdGVM aXN0ZW5lcklkZW50aWZpZXIoKQotewotICAgIHN0YXRpYyB1aW50NjRfdCBuZXh0SWRlbnRpZmll ciA9IDE7Ci0gICAgcmV0dXJuIG5leHRJZGVudGlmaWVyKys7Ci19Ci0KLXN0YXRpYyBIYXNoTWFw PHVpbnQ2NF90LCBGdW5jdGlvbjx2b2lkKFdlYlByb2Nlc3NQb29sJik+PiYgcHJvY2Vzc1Bvb2xD cmVhdGlvbkxpc3RlbmVyRnVuY3Rpb25NYXAoKQotewotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3ll ZDxIYXNoTWFwPHVpbnQ2NF90LCBGdW5jdGlvbjx2b2lkKFdlYlByb2Nlc3NQb29sJik+Pj4gbWFw OwotICAgIHJldHVybiBtYXA7Ci19Ci0KLXVpbnQ2NF90IFdlYlByb2Nlc3NQb29sOjpyZWdpc3Rl clByb2Nlc3NQb29sQ3JlYXRpb25MaXN0ZW5lcihGdW5jdGlvbjx2b2lkKFdlYlByb2Nlc3NQb29s Jik+JiYgZnVuY3Rpb24pCi17Ci0gICAgQVNTRVJUKGZ1bmN0aW9uKTsKLQotICAgIGF1dG8gaWRl bnRpZmllciA9IGdlbmVyYXRlTGlzdGVuZXJJZGVudGlmaWVyKCk7Ci0gICAgcHJvY2Vzc1Bvb2xD cmVhdGlvbkxpc3RlbmVyRnVuY3Rpb25NYXAoKS5zZXQoaWRlbnRpZmllciwgV1RGTW92ZShmdW5j dGlvbikpOwotICAgIHJldHVybiBpZGVudGlmaWVyOwotfQotCi12b2lkIFdlYlByb2Nlc3NQb29s Ojp1bnJlZ2lzdGVyUHJvY2Vzc1Bvb2xDcmVhdGlvbkxpc3RlbmVyKHVpbnQ2NF90IGlkZW50aWZp ZXIpCi17Ci0gICAgcHJvY2Vzc1Bvb2xDcmVhdGlvbkxpc3RlbmVyRnVuY3Rpb25NYXAoKS5yZW1v dmUoaWRlbnRpZmllcik7Ci19Ci0KIFJlZjxXZWJQcm9jZXNzUG9vbD4gV2ViUHJvY2Vzc1Bvb2w6 OmNyZWF0ZShBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiYgY29uZmlndXJhdGlvbikKIHsK ICAgICBJbml0aWFsaXplV2ViS2l0MigpOwogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYlBy b2Nlc3NQb29sKGNvbmZpZ3VyYXRpb24pKTsKIH0KIAotdm9pZCBXZWJQcm9jZXNzUG9vbDo6bm90 aWZ5VGhpc1dlYlByb2Nlc3NQb29sV2FzQ3JlYXRlZCgpCi17Ci0gICAgYXV0byYgbGlzdGVuZXJN YXAgPSBwcm9jZXNzUG9vbENyZWF0aW9uTGlzdGVuZXJGdW5jdGlvbk1hcCgpOwotCi0gICAgVmVj dG9yPHVpbnQ2NF90PiBpZGVudGlmaWVyczsKLSAgICBpZGVudGlmaWVycy5yZXNlcnZlSW5pdGlh bENhcGFjaXR5KGxpc3RlbmVyTWFwLnNpemUoKSk7Ci0gICAgZm9yIChhdXRvIGlkZW50aWZpZXIg OiBsaXN0ZW5lck1hcC5rZXlzKCkpCi0gICAgICAgIGlkZW50aWZpZXJzLnVuY2hlY2tlZEFwcGVu ZChpZGVudGlmaWVyKTsKLQotICAgIGZvciAoYXV0byBpZGVudGlmaWVyIDogaWRlbnRpZmllcnMp IHsKLSAgICAgICAgYXV0byBpdGVyYXRvciA9IGxpc3RlbmVyTWFwLmZpbmQoaWRlbnRpZmllcik7 Ci0gICAgICAgIGlmIChpdGVyYXRvciA9PSBsaXN0ZW5lck1hcC5lbmQoKSkKLSAgICAgICAgICAg IGNvbnRpbnVlOwotCi0gICAgICAgIC8vIFRvIG1ha2Ugc3VyZSB0aGUgRnVuY3Rpb24gb2JqZWN0 IHN0YXlzIGFsaXZlIHVudGlsIGFmdGVyIHRoZSBmdW5jdGlvbiBjYWxsIGhhcyBiZWVuIG1hZGUs Ci0gICAgICAgIC8vIHdlIHRlbXBvcmFyaWx5IG1vdmUgaXQgb3V0IG9mIHRoZSBtYXAuCi0gICAg ICAgIC8vIFRoaXMgcHJvdGVjdHMgaXQgZnJvbSB0aGUgRnVuY3Rpb24gY2FsbGluZyB1bnJlZ2lz dGVyUHJvY2Vzc1Bvb2xDcmVhdGlvbkxpc3RlbmVyIHRoZXJlYnkKLSAgICAgICAgLy8gcmVtb3Zp bmcgaXRzZWxmIGZyb20gdGhlIG1hcCBvZiBsaXN0ZW5lcnMuCi0gICAgICAgIC8vIElmIHRoZSBp ZGVudGlmaWVyIHN0aWxsIGV4aXN0cyBpbiB0aGUgbWFwIGxhdGVyLCB3ZSBtb3ZlIGl0IGJhY2sg aW4uCi0gICAgICAgIEZ1bmN0aW9uPHZvaWQoV2ViUHJvY2Vzc1Bvb2wmKT4gZnVuY3Rpb24gPSBX VEZNb3ZlKGl0ZXJhdG9yLT52YWx1ZSk7Ci0gICAgICAgIGZ1bmN0aW9uKCp0aGlzKTsKLQotICAg ICAgICBpdGVyYXRvciA9IGxpc3RlbmVyTWFwLmZpbmQoaWRlbnRpZmllcik7Ci0gICAgICAgIGlm IChpdGVyYXRvciAhPSBsaXN0ZW5lck1hcC5lbmQoKSkgewotICAgICAgICAgICAgQVNTRVJUKCFp dGVyYXRvci0+dmFsdWUpOwotICAgICAgICAgICAgaXRlcmF0b3ItPnZhbHVlID0gV1RGTW92ZShm dW5jdGlvbik7Ci0gICAgICAgIH0KLSAgICB9Ci19Ci0KIHN0YXRpYyBWZWN0b3I8V2ViUHJvY2Vz c1Bvb2wqPiYgcHJvY2Vzc1Bvb2xzKCkKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8VmVj dG9yPFdlYlByb2Nlc3NQb29sKj4+IHByb2Nlc3NQb29sczsKQEAgLTMxNCwxMiArMjU4LDYgQEAg V2ViUHJvY2Vzc1Bvb2w6OldlYlByb2Nlc3NQb29sKEFQSTo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uJiBjb25maWd1cmF0aW9uKQogI2VuZGlmCiAKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWlu KCkpOwotICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbd2Vha1B0ciA9IG1ha2VXZWFrUHRy KCp0aGlzKV0gewotICAgICAgICBpZiAoIXdlYWtQdHIpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgd2Vha1B0ci0+bm90aWZ5VGhpc1dlYlByb2Nlc3NQb29sV2FzQ3JlYXRlZCgpOwot ICAgIH0pOwogCiAgICAgdXBkYXRlQmFja0ZvcndhcmRDYWNoZUNhcGFjaXR5KCk7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCmluZGV4IDg0YjFmNWM2ZTg4YTM4ZDM2 MzljYmQwY2FjZDBjY2E4ZDg0MGNlZDAuLjU3YzA4ZWZlYzg2OWQ1M2EyZjgxMmVhODRhYjZkZjZl ZjIwZDgxOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ b29sLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaApAQCAt MTM2LDggKzEzNiw2IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBXZWJQcm9jZXNzUG9vbChBUEk6 OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiYpOyAgICAgICAgCiAgICAgdmlydHVhbCB+V2ViUHJv Y2Vzc1Bvb2woKTsKIAotICAgIHZvaWQgbm90aWZ5VGhpc1dlYlByb2Nlc3NQb29sV2FzQ3JlYXRl ZCgpOwotCiAgICAgQVBJOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24mIGNvbmZpZ3VyYXRpb24o KSB7IHJldHVybiBtX2NvbmZpZ3VyYXRpb24uZ2V0KCk7IH0KIAogICAgIHN0YXRpYyBjb25zdCBW ZWN0b3I8V2ViUHJvY2Vzc1Bvb2wqPiYgYWxsUHJvY2Vzc1Bvb2xzKCk7CkBAIC00NDEsOSArNDM5 LDYgQEAgcHVibGljOgogICAgIHZvaWQgY2xlYXJQZXJtYW5lbnRDcmVkZW50aWFsc0ZvclByb3Rl Y3Rpb25TcGFjZShXZWJDb3JlOjpQcm90ZWN0aW9uU3BhY2UmJik7CiAjZW5kaWYKIAotICAgIHN0 YXRpYyB1aW50NjRfdCByZWdpc3RlclByb2Nlc3NQb29sQ3JlYXRpb25MaXN0ZW5lcihGdW5jdGlv bjx2b2lkKFdlYlByb2Nlc3NQb29sJik+JiYpOwotICAgIHN0YXRpYyB2b2lkIHVucmVnaXN0ZXJQ cm9jZXNzUG9vbENyZWF0aW9uTGlzdGVuZXIodWludDY0X3QgaWRlbnRpZmllcik7Ci0KICAgICBG b3JlZ3JvdW5kV2ViUHJvY2Vzc1Rva2VuIGZvcmVncm91bmRXZWJQcm9jZXNzVG9rZW4oKSBjb25z dCB7IHJldHVybiBGb3JlZ3JvdW5kV2ViUHJvY2Vzc1Rva2VuKG1fZm9yZWdyb3VuZFdlYlByb2Nl c3NDb3VudGVyLmNvdW50KCkpOyB9CiAgICAgQmFja2dyb3VuZFdlYlByb2Nlc3NUb2tlbiBiYWNr Z3JvdW5kV2ViUHJvY2Vzc1Rva2VuKCkgY29uc3QgeyByZXR1cm4gQmFja2dyb3VuZFdlYlByb2Nl c3NUb2tlbihtX2JhY2tncm91bmRXZWJQcm9jZXNzQ291bnRlci5jb3VudCgpKTsgfQogICAgIGJv b2wgaGFzRm9yZWdyb3VuZFdlYlByb2Nlc3NlcygpIGNvbnN0IHsgcmV0dXJuIG1fZm9yZWdyb3Vu ZFdlYlByb2Nlc3NDb3VudGVyLnZhbHVlKCk7IH0K