194868 2019-02-20 13:24:53 -0800 Resolve WebsiteDataStore/HTTPCookieStore ref cycle 2019-02-20 16:14:14 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified REOPENED InRadar P2 Normal --- 1 achristensen achristensen commit-queue ggaren webkit-bug-importer oldest_to_newest 1508209 0 achristensen 2019-02-20 13:24:53 -0800 Resolve WebsiteDataStore/HTTPCookieStore ref cycle 1508211 1 362532 achristensen 2019-02-20 13:25:01 -0800 Created attachment 362532 Patch 1508224 2 362532 ggaren 2019-02-20 13:52:24 -0800 Comment on attachment 362532 Patch r=me 1508244 3 362532 commit-queue 2019-02-20 14:22:29 -0800 Comment on attachment 362532 Patch Clearing flags on attachment: 362532 Committed r241838: <https://trac.webkit.org/changeset/241838> 1508245 4 commit-queue 2019-02-20 14:22:30 -0800 All reviewed patches have been landed. Closing bug. 1508249 5 webkit-bug-importer 2019-02-20 14:24:47 -0800 <rdar://problem/48251863> 1508340 6 achristensen 2019-02-20 16:14:00 -0800 Reverted in https://trac.webkit.org/changeset/241850/webkit The first attempt caused crashes in these API tests: WebKit.CookieObserverCrash WebKit.WKHTTPCookieStoreWithoutProcessPoolWithPrewarming WebKit.WKHTTPCookieStoreWithoutProcessPoolWithoutPrewarming 1508341 7 achristensen 2019-02-20 16:14:14 -0800 Reopening 362532 2019-02-20 13:25:01 -0800 2019-02-20 14:22:29 -0800 Patch bug-194868-20190220132500.patch text/plain 10871 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDE4MzApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE5LTAyLTIwICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVzb2x2ZSBXZWJz aXRlRGF0YVN0b3JlL0hUVFBDb29raWVTdG9yZSByZWYgY3ljbGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDg2OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElIVFRQQ29v a2llU3RvcmUuY3BwOgorICAgICAgICAoQVBJOjpIVFRQQ29va2llU3RvcmU6OkhUVFBDb29raWVT dG9yZSk6CisgICAgICAgIChBUEk6OkhUVFBDb29raWVTdG9yZTo6Y29va2llcyk6CisgICAgICAg IChBUEk6OkhUVFBDb29raWVTdG9yZTo6c2V0Q29va2llKToKKyAgICAgICAgKEFQSTo6SFRUUENv b2tpZVN0b3JlOjpkZWxldGVDb29raWUpOgorICAgICAgICAoQVBJOjpIVFRQQ29va2llU3RvcmU6 OnJlZ2lzdGVyT2JzZXJ2ZXIpOgorICAgICAgICAoQVBJOjpIVFRQQ29va2llU3RvcmU6OnVucmVn aXN0ZXJPYnNlcnZlcik6CisgICAgICAgIChBUEk6OkhUVFBDb29raWVTdG9yZTo6Y29va2llTWFu YWdlckRlc3Ryb3llZCk6CisgICAgICAgIChBUEk6OkhUVFBDb29raWVTdG9yZTo6cmVnaXN0ZXJG b3JOZXdQcm9jZXNzUG9vbE5vdGlmaWNhdGlvbnMpOgorICAgICAgICAoQVBJOjpIVFRQQ29va2ll U3RvcmU6OnJlZiBjb25zdCk6CisgICAgICAgIChBUEk6OkhUVFBDb29raWVTdG9yZTo6ZGVyZWYg Y29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJSFRUUENvb2tpZVN0b3JlLmg6CisK IDIwMTktMDItMjAgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtpT1NdIE9wZW4gc2FuZGJveCBmb3Igc3BlY2lmaWMgY2FsbC4KSW5kZXg6IFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElIVFRQQ29va2llU3RvcmUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElIVFRQQ29va2llU3RvcmUuY3BwCShyZXZp c2lvbiAyNDE4MjYpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJSFRUUENvb2tp ZVN0b3JlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDAsNyArNDAsNyBAQCBuYW1lc3BhY2UgQVBJ IHsKIEhUVFBDb29raWVTdG9yZTo6SFRUUENvb2tpZVN0b3JlKFdlYktpdDo6V2Vic2l0ZURhdGFT dG9yZSYgd2Vic2l0ZURhdGFTdG9yZSkKICAgICA6IG1fb3duaW5nRGF0YVN0b3JlKHdlYnNpdGVE YXRhU3RvcmUpCiB7Ci0gICAgaWYgKCFtX293bmluZ0RhdGFTdG9yZS0+cHJvY2Vzc1Bvb2xGb3JD b29raWVTdG9yYWdlT3BlcmF0aW9ucygpKQorICAgIGlmICghbV9vd25pbmdEYXRhU3RvcmUucHJv Y2Vzc1Bvb2xGb3JDb29raWVTdG9yYWdlT3BlcmF0aW9ucygpKQogICAgICAgICByZWdpc3RlckZv ck5ld1Byb2Nlc3NQb29sTm90aWZpY2F0aW9ucygpOwogfQogCkBAIC01NSwxMiArNTUsMTIgQEAg SFRUUENvb2tpZVN0b3JlOjp+SFRUUENvb2tpZVN0b3JlKCkKIAogdm9pZCBIVFRQQ29va2llU3Rv cmU6OmNvb2tpZXMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWN0b3I8V2ViQ29yZTo6 Q29va2llPiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGF1dG8qIHBvb2wgPSBtX293 bmluZ0RhdGFTdG9yZS0+cHJvY2Vzc1Bvb2xGb3JDb29raWVTdG9yYWdlT3BlcmF0aW9ucygpOwor ICAgIGF1dG8qIHBvb2wgPSBtX293bmluZ0RhdGFTdG9yZS5wcm9jZXNzUG9vbEZvckNvb2tpZVN0 b3JhZ2VPcGVyYXRpb25zKCk7CiAgICAgaWYgKCFwb29sKSB7CiAgICAgICAgIFZlY3RvcjxXZWJD b3JlOjpDb29raWU+IGFsbENvb2tpZXM7Ci0gICAgICAgIGlmIChtX293bmluZ0RhdGFTdG9yZS0+ c2Vzc2lvbklEKCkgPT0gUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSkKKyAgICAg ICAgaWYgKG1fb3duaW5nRGF0YVN0b3JlLnNlc3Npb25JRCgpID09IFBBTDo6U2Vzc2lvbklEOjpk ZWZhdWx0U2Vzc2lvbklEKCkpCiAgICAgICAgICAgICBhbGxDb29raWVzID0gZ2V0QWxsRGVmYXVs dFVJUHJvY2Vzc0Nvb2tpZVN0b3JlQ29va2llcygpOwotICAgICAgICBhbGxDb29raWVzLmFwcGVu ZFZlY3RvcihtX293bmluZ0RhdGFTdG9yZS0+cGVuZGluZ0Nvb2tpZXMoKSk7CisgICAgICAgIGFs bENvb2tpZXMuYXBwZW5kVmVjdG9yKG1fb3duaW5nRGF0YVN0b3JlLnBlbmRpbmdDb29raWVzKCkp OwogCiAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlciksIGFsbENvb2tpZXNdICgpIG11dGFibGUgewogICAgICAgICAg ICAgY29tcGxldGlvbkhhbmRsZXIoYWxsQ29va2llcyk7CkBAIC02OSwyMCArNjksMjAgQEAgdm9p ZCBIVFRQQ29va2llU3RvcmU6OmNvb2tpZXMoQ29tcGxldGlvbgogICAgIH0KIAogICAgIGF1dG8q IGNvb2tpZU1hbmFnZXIgPSBwb29sLT5zdXBwbGVtZW50PFdlYktpdDo6V2ViQ29va2llTWFuYWdl clByb3h5PigpOwotICAgIGNvb2tpZU1hbmFnZXItPmdldEFsbENvb2tpZXMobV9vd25pbmdEYXRh U3RvcmUtPnNlc3Npb25JRCgpLCBbcG9vbCA9IFdURk1vdmUocG9vbCksIGNvbXBsZXRpb25IYW5k bGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildIChjb25zdCBWZWN0b3I8V2ViQ29yZTo6 Q29va2llPiYgY29va2llcywgQ2FsbGJhY2tCYXNlOjpFcnJvciBlcnJvcikgbXV0YWJsZSB7Cisg ICAgY29va2llTWFuYWdlci0+Z2V0QWxsQ29va2llcyhtX293bmluZ0RhdGFTdG9yZS5zZXNzaW9u SUQoKSwgW3Bvb2wgPSBXVEZNb3ZlKHBvb2wpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpXSAoY29uc3QgVmVjdG9yPFdlYkNvcmU6OkNvb2tpZT4mIGNvb2tp ZXMsIENhbGxiYWNrQmFzZTo6RXJyb3IgZXJyb3IpIG11dGFibGUgewogICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihjb29raWVzKTsKICAgICB9KTsKIH0KIAogdm9pZCBIVFRQQ29va2llU3RvcmU6 OnNldENvb2tpZShjb25zdCBXZWJDb3JlOjpDb29raWUmIGNvb2tpZSwgQ29tcGxldGlvbkhhbmRs ZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGF1dG8qIHBvb2wgPSBtX293 bmluZ0RhdGFTdG9yZS0+cHJvY2Vzc1Bvb2xGb3JDb29raWVTdG9yYWdlT3BlcmF0aW9ucygpOwor ICAgIGF1dG8qIHBvb2wgPSBtX293bmluZ0RhdGFTdG9yZS5wcm9jZXNzUG9vbEZvckNvb2tpZVN0 b3JhZ2VPcGVyYXRpb25zKCk7CiAgICAgaWYgKCFwb29sKSB7CiAgICAgICAgIC8vIEZJWE1FOiBw ZW5kaW5nQ29va2llcyB1c2VkIGZvciBkZWZhdWx0U2Vzc2lvbiBiZWNhdXNlIHNlc3Npb24gY29v a2llcyBjYW5ub3QgYmUgcHJvcGFnYXRlZCB0byBOZXR3b3JrIFByb2Nlc3Mgd2l0aCB1aVByb2Nl c3NDb29raWVTdG9yYWdlSWRlbnRpZmllci4KLSAgICAgICAgaWYgKG1fb3duaW5nRGF0YVN0b3Jl LT5zZXNzaW9uSUQoKSA9PSBQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpICYmICFj b29raWUuc2Vzc2lvbikKKyAgICAgICAgaWYgKG1fb3duaW5nRGF0YVN0b3JlLnNlc3Npb25JRCgp ID09IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkgJiYgIWNvb2tpZS5zZXNzaW9u KQogICAgICAgICAgICAgc2V0Q29va2llSW5EZWZhdWx0VUlQcm9jZXNzQ29va2llU3RvcmUoY29v a2llKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgbV9vd25pbmdEYXRhU3RvcmUtPmFkZFBl bmRpbmdDb29raWUoY29va2llKTsKKyAgICAgICAgICAgIG1fb3duaW5nRGF0YVN0b3JlLmFkZFBl bmRpbmdDb29raWUoY29va2llKTsKIAogICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtjb21wbGV0 aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSAoKSBtdXRhYmxlIHsKICAg ICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CkBAIC05MSwxOSArOTEsMTkgQEAgdm9pZCBI VFRQQ29va2llU3RvcmU6OnNldENvb2tpZShjb25zdCBXZQogICAgIH0KIAogICAgIGF1dG8qIGNv b2tpZU1hbmFnZXIgPSBwb29sLT5zdXBwbGVtZW50PFdlYktpdDo6V2ViQ29va2llTWFuYWdlclBy b3h5PigpOwotICAgIGNvb2tpZU1hbmFnZXItPnNldENvb2tpZShtX293bmluZ0RhdGFTdG9yZS0+ c2Vzc2lvbklEKCksIGNvb2tpZSwgW3Bvb2wgPSBXVEZNb3ZlKHBvb2wpLCBjb21wbGV0aW9uSGFu ZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSAoQ2FsbGJhY2tCYXNlOjpFcnJvciBl cnJvcikgbXV0YWJsZSB7CisgICAgY29va2llTWFuYWdlci0+c2V0Q29va2llKG1fb3duaW5nRGF0 YVN0b3JlLnNlc3Npb25JRCgpLCBjb29raWUsIFtwb29sID0gV1RGTW92ZShwb29sKSwgY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gKENhbGxiYWNrQmFzZTo6 RXJyb3IgZXJyb3IpIG11dGFibGUgewogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwogICAg IH0pOwogfQogCiB2b2lkIEhUVFBDb29raWVTdG9yZTo6ZGVsZXRlQ29va2llKGNvbnN0IFdlYkNv cmU6OkNvb2tpZSYgY29va2llLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlv bkhhbmRsZXIpCiB7Ci0gICAgYXV0byogcG9vbCA9IG1fb3duaW5nRGF0YVN0b3JlLT5wcm9jZXNz UG9vbEZvckNvb2tpZVN0b3JhZ2VPcGVyYXRpb25zKCk7CisgICAgYXV0byogcG9vbCA9IG1fb3du aW5nRGF0YVN0b3JlLnByb2Nlc3NQb29sRm9yQ29va2llU3RvcmFnZU9wZXJhdGlvbnMoKTsKICAg ICBpZiAoIXBvb2wpIHsKLSAgICAgICAgaWYgKG1fb3duaW5nRGF0YVN0b3JlLT5zZXNzaW9uSUQo KSA9PSBQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpICYmICFjb29raWUuc2Vzc2lv bikKKyAgICAgICAgaWYgKG1fb3duaW5nRGF0YVN0b3JlLnNlc3Npb25JRCgpID09IFBBTDo6U2Vz c2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkgJiYgIWNvb2tpZS5zZXNzaW9uKQogICAgICAgICAg ICAgZGVsZXRlQ29va2llRnJvbURlZmF1bHRVSVByb2Nlc3NDb29raWVTdG9yZShjb29raWUpOwog ICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX293bmluZ0RhdGFTdG9yZS0+cmVtb3ZlUGVuZGlu Z0Nvb2tpZShjb29raWUpOworICAgICAgICAgICAgbV9vd25pbmdEYXRhU3RvcmUucmVtb3ZlUGVu ZGluZ0Nvb2tpZShjb29raWUpOwogCiAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2NvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFibGUgewogICAg ICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKQEAgLTExMiw3ICsxMTIsNyBAQCB2b2lkIEhU VFBDb29raWVTdG9yZTo6ZGVsZXRlQ29va2llKGNvbnN0CiAgICAgfQogCiAgICAgYXV0byogY29v a2llTWFuYWdlciA9IHBvb2wtPnN1cHBsZW1lbnQ8V2ViS2l0OjpXZWJDb29raWVNYW5hZ2VyUHJv eHk+KCk7Ci0gICAgY29va2llTWFuYWdlci0+ZGVsZXRlQ29va2llKG1fb3duaW5nRGF0YVN0b3Jl LT5zZXNzaW9uSUQoKSwgY29va2llLCBbcG9vbCA9IFdURk1vdmUocG9vbCksIGNvbXBsZXRpb25I YW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKENhbGxiYWNrQmFzZTo6RXJyb3Ig ZXJyb3IpIG11dGFibGUgeworICAgIGNvb2tpZU1hbmFnZXItPmRlbGV0ZUNvb2tpZShtX293bmlu Z0RhdGFTdG9yZS5zZXNzaW9uSUQoKSwgY29va2llLCBbcG9vbCA9IFdURk1vdmUocG9vbCksIGNv bXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKENhbGxiYWNrQmFz ZTo6RXJyb3IgZXJyb3IpIG11dGFibGUgewogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwog ICAgIH0pOwogfQpAQCAtMTUwLDcgKzE1MCw3IEBAIHZvaWQgSFRUUENvb2tpZVN0b3JlOjpyZWdp c3Rlck9ic2VydmVyKE8KIAogICAgIG1fY29va2llTWFuYWdlclByb3h5T2JzZXJ2ZXIgPSBzdGQ6 Om1ha2VfdW5pcXVlPEFQSVdlYkNvb2tpZU1hbmFnZXJQcm94eU9ic2VydmVyPigqdGhpcyk7CiAK LSAgICBhdXRvKiBwb29sID0gbV9vd25pbmdEYXRhU3RvcmUtPnByb2Nlc3NQb29sRm9yQ29va2ll U3RvcmFnZU9wZXJhdGlvbnMoKTsKKyAgICBhdXRvKiBwb29sID0gbV9vd25pbmdEYXRhU3RvcmUu cHJvY2Vzc1Bvb2xGb3JDb29raWVTdG9yYWdlT3BlcmF0aW9ucygpOwogCiAgICAgaWYgKCFwb29s KSB7CiAgICAgICAgIEFTU0VSVCghbV9vYnNlcnZpbmdVSVByb2Nlc3NDb29raWVzKTsKQEAgLTE2 NSw3ICsxNjUsNyBAQCB2b2lkIEhUVFBDb29raWVTdG9yZTo6cmVnaXN0ZXJPYnNlcnZlcihPCiAg ICAgfQogCiAgICAgbV9vYnNlcnZlZENvb2tpZU1hbmFnZXJQcm94eSA9IHBvb2wtPnN1cHBsZW1l bnQ8V2ViS2l0OjpXZWJDb29raWVNYW5hZ2VyUHJveHk+KCk7Ci0gICAgbV9vYnNlcnZlZENvb2tp ZU1hbmFnZXJQcm94eS0+cmVnaXN0ZXJPYnNlcnZlcihtX293bmluZ0RhdGFTdG9yZS0+c2Vzc2lv bklEKCksICptX2Nvb2tpZU1hbmFnZXJQcm94eU9ic2VydmVyKTsKKyAgICBtX29ic2VydmVkQ29v a2llTWFuYWdlclByb3h5LT5yZWdpc3Rlck9ic2VydmVyKG1fb3duaW5nRGF0YVN0b3JlLnNlc3Np b25JRCgpLCAqbV9jb29raWVNYW5hZ2VyUHJveHlPYnNlcnZlcik7CiB9CiAKIHZvaWQgSFRUUENv b2tpZVN0b3JlOjp1bnJlZ2lzdGVyT2JzZXJ2ZXIoT2JzZXJ2ZXImIG9ic2VydmVyKQpAQCAtMTc2 LDcgKzE3Niw3IEBAIHZvaWQgSFRUUENvb2tpZVN0b3JlOjp1bnJlZ2lzdGVyT2JzZXJ2ZXIKICAg ICAgICAgcmV0dXJuOwogCiAgICAgaWYgKG1fb2JzZXJ2ZWRDb29raWVNYW5hZ2VyUHJveHkpCi0g ICAgICAgIG1fb2JzZXJ2ZWRDb29raWVNYW5hZ2VyUHJveHktPnVucmVnaXN0ZXJPYnNlcnZlciht X293bmluZ0RhdGFTdG9yZS0+c2Vzc2lvbklEKCksICptX2Nvb2tpZU1hbmFnZXJQcm94eU9ic2Vy dmVyKTsKKyAgICAgICAgbV9vYnNlcnZlZENvb2tpZU1hbmFnZXJQcm94eS0+dW5yZWdpc3Rlck9i c2VydmVyKG1fb3duaW5nRGF0YVN0b3JlLnNlc3Npb25JRCgpLCAqbV9jb29raWVNYW5hZ2VyUHJv eHlPYnNlcnZlcik7CiAKICAgICBpZiAobV9vYnNlcnZpbmdVSVByb2Nlc3NDb29raWVzKQogICAg ICAgICBzdG9wT2JzZXJ2aW5nQ2hhbmdlc1RvRGVmYXVsdFVJUHJvY2Vzc0Nvb2tpZVN0b3JlKCk7 CkBAIC0xOTgsMTYgKzE5OCwxNiBAQCB2b2lkIEhUVFBDb29raWVTdG9yZTo6Y29va2llc0RpZENo YW5nZSgpCiAKIHZvaWQgSFRUUENvb2tpZVN0b3JlOjpjb29raWVNYW5hZ2VyRGVzdHJveWVkKCkK IHsKLSAgICBtX29ic2VydmVkQ29va2llTWFuYWdlclByb3h5LT51bnJlZ2lzdGVyT2JzZXJ2ZXIo bV9vd25pbmdEYXRhU3RvcmUtPnNlc3Npb25JRCgpLCAqbV9jb29raWVNYW5hZ2VyUHJveHlPYnNl cnZlcik7CisgICAgbV9vYnNlcnZlZENvb2tpZU1hbmFnZXJQcm94eS0+dW5yZWdpc3Rlck9ic2Vy dmVyKG1fb3duaW5nRGF0YVN0b3JlLnNlc3Npb25JRCgpLCAqbV9jb29raWVNYW5hZ2VyUHJveHlP YnNlcnZlcik7CiAgICAgbV9vYnNlcnZlZENvb2tpZU1hbmFnZXJQcm94eSA9IG51bGxwdHI7CiAK LSAgICBhdXRvKiBwb29sID0gbV9vd25pbmdEYXRhU3RvcmUtPnByb2Nlc3NQb29sRm9yQ29va2ll U3RvcmFnZU9wZXJhdGlvbnMoKTsKKyAgICBhdXRvKiBwb29sID0gbV9vd25pbmdEYXRhU3RvcmUu cHJvY2Vzc1Bvb2xGb3JDb29raWVTdG9yYWdlT3BlcmF0aW9ucygpOwogCiAgICAgaWYgKCFwb29s KQogICAgICAgICByZXR1cm47CiAKICAgICBtX29ic2VydmVkQ29va2llTWFuYWdlclByb3h5ID0g cG9vbC0+c3VwcGxlbWVudDxXZWJLaXQ6OldlYkNvb2tpZU1hbmFnZXJQcm94eT4oKTsKLSAgICBt X29ic2VydmVkQ29va2llTWFuYWdlclByb3h5LT5yZWdpc3Rlck9ic2VydmVyKG1fb3duaW5nRGF0 YVN0b3JlLT5zZXNzaW9uSUQoKSwgKm1fY29va2llTWFuYWdlclByb3h5T2JzZXJ2ZXIpOworICAg IG1fb2JzZXJ2ZWRDb29raWVNYW5hZ2VyUHJveHktPnJlZ2lzdGVyT2JzZXJ2ZXIobV9vd25pbmdE YXRhU3RvcmUuc2Vzc2lvbklEKCksICptX2Nvb2tpZU1hbmFnZXJQcm94eU9ic2VydmVyKTsKIH0K IAogdm9pZCBIVFRQQ29va2llU3RvcmU6OnJlZ2lzdGVyRm9yTmV3UHJvY2Vzc1Bvb2xOb3RpZmlj YXRpb25zKCkKQEAgLTIxNSw3ICsyMTUsNyBAQCB2b2lkIEhUVFBDb29raWVTdG9yZTo6cmVnaXN0 ZXJGb3JOZXdQcm9jCiAgICAgQVNTRVJUKCFtX3Byb2Nlc3NQb29sQ3JlYXRpb25MaXN0ZW5lcklk ZW50aWZpZXIpOwogCiAgICAgbV9wcm9jZXNzUG9vbENyZWF0aW9uTGlzdGVuZXJJZGVudGlmaWVy ID0gV2ViUHJvY2Vzc1Bvb2w6OnJlZ2lzdGVyUHJvY2Vzc1Bvb2xDcmVhdGlvbkxpc3RlbmVyKFt0 aGlzXShXZWJQcm9jZXNzUG9vbCYgbmV3UHJvY2Vzc1Bvb2wpIHsKLSAgICAgICAgaWYgKCFtX293 bmluZ0RhdGFTdG9yZS0+aXNBc3NvY2lhdGVkUHJvY2Vzc1Bvb2wobmV3UHJvY2Vzc1Bvb2wpKQor ICAgICAgICBpZiAoIW1fb3duaW5nRGF0YVN0b3JlLmlzQXNzb2NpYXRlZFByb2Nlc3NQb29sKG5l d1Byb2Nlc3NQb29sKSkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAvLyBOb3cgdGhh dCBhbiBhc3NvY2lhdGVkIHByb2Nlc3MgcG9vbCBleGlzdHMsIHdlIG5lZWQgdG8gZmx1c2ggdGhl IFVJIHByb2Nlc3MgY29va2llIHN0b3JlCkBAIC0yMjUsNyArMjI1LDcgQEAgdm9pZCBIVFRQQ29v a2llU3RvcmU6OnJlZ2lzdGVyRm9yTmV3UHJvYwogCiAgICAgICAgIGlmIChtX2Nvb2tpZU1hbmFn ZXJQcm94eU9ic2VydmVyKSB7CiAgICAgICAgICAgICBtX29ic2VydmVkQ29va2llTWFuYWdlclBy b3h5ID0gbmV3UHJvY2Vzc1Bvb2wuc3VwcGxlbWVudDxXZWJLaXQ6OldlYkNvb2tpZU1hbmFnZXJQ cm94eT4oKTsKLSAgICAgICAgICAgIG1fb2JzZXJ2ZWRDb29raWVNYW5hZ2VyUHJveHktPnJlZ2lz dGVyT2JzZXJ2ZXIobV9vd25pbmdEYXRhU3RvcmUtPnNlc3Npb25JRCgpLCAqbV9jb29raWVNYW5h Z2VyUHJveHlPYnNlcnZlcik7CisgICAgICAgICAgICBtX29ic2VydmVkQ29va2llTWFuYWdlclBy b3h5LT5yZWdpc3Rlck9ic2VydmVyKG1fb3duaW5nRGF0YVN0b3JlLnNlc3Npb25JRCgpLCAqbV9j b29raWVNYW5hZ2VyUHJveHlPYnNlcnZlcik7CiAgICAgICAgIH0KICAgICAgICAgdW5yZWdpc3Rl ckZvck5ld1Byb2Nlc3NQb29sTm90aWZpY2F0aW9ucygpOwogICAgIH0pOwpAQCAtMjM5LDYgKzIz OSwxNiBAQCB2b2lkIEhUVFBDb29raWVTdG9yZTo6dW5yZWdpc3RlckZvck5ld1ByCiAgICAgbV9w cm9jZXNzUG9vbENyZWF0aW9uTGlzdGVuZXJJZGVudGlmaWVyID0gMDsKIH0KIAordm9pZCBIVFRQ Q29va2llU3RvcmU6OnJlZigpIGNvbnN0Cit7CisgICAgbV9vd25pbmdEYXRhU3RvcmUucmVmKCk7 Cit9CisKK3ZvaWQgSFRUUENvb2tpZVN0b3JlOjpkZXJlZigpIGNvbnN0Cit7CisgICAgbV9vd25p bmdEYXRhU3RvcmUuZGVyZWYoKTsKK30KKwogI2lmICFQTEFURk9STShDT0NPQSkKIHZvaWQgSFRU UENvb2tpZVN0b3JlOjpmbHVzaERlZmF1bHRVSVByb2Nlc3NDb29raWVTdG9yZSgpIHsgfQogVmVj dG9yPFdlYkNvcmU6OkNvb2tpZT4gSFRUUENvb2tpZVN0b3JlOjpnZXRBbGxEZWZhdWx0VUlQcm9j ZXNzQ29va2llU3RvcmVDb29raWVzKCkgeyByZXR1cm4geyB9OyB9CkluZGV4OiBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQVBJSFRUUENvb2tpZVN0b3JlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUhUVFBDb29raWVTdG9yZS5oCShyZXZpc2lvbiAy NDE4MjYpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJSFRUUENvb2tpZVN0b3Jl LmgJKHdvcmtpbmcgY29weSkKQEAgLTc0LDYgKzc0LDkgQEAgcHVibGljOgogICAgIHZvaWQgY29v a2llc0RpZENoYW5nZSgpOwogICAgIHZvaWQgY29va2llTWFuYWdlckRlc3Ryb3llZCgpOwogCisg ICAgdm9pZCByZWYoKSBjb25zdDsKKyAgICB2b2lkIGRlcmVmKCkgY29uc3Q7CisgICAgCiBwcml2 YXRlOgogICAgIEhUVFBDb29raWVTdG9yZShXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmUmKTsKIApA QCAtODcsOCArOTAsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdDaGFuZ2Vz VG9EZWZhdWx0VUlQcm9jZXNzQ29va2llU3RvcmUoRnVuY3Rpb248dm9pZCgpPiYmKTsKICAgICB2 b2lkIHN0b3BPYnNlcnZpbmdDaGFuZ2VzVG9EZWZhdWx0VUlQcm9jZXNzQ29va2llU3RvcmUoKTsK ICAgICAKLSAgICAvLyBGSVhNRTogVGhpcyBpcyBhIHJlZmVyZW5jZSBjeWNsZS4KLSAgICBSZWY8 V2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlPiBtX293bmluZ0RhdGFTdG9yZTsKKyAgICBXZWJLaXQ6 OldlYnNpdGVEYXRhU3RvcmUmIG1fb3duaW5nRGF0YVN0b3JlOwogICAgIEhhc2hTZXQ8T2JzZXJ2 ZXIqPiBtX29ic2VydmVyczsKIAogICAgIFdlYktpdDo6V2ViQ29va2llTWFuYWdlclByb3h5KiBt X29ic2VydmVkQ29va2llTWFuYWdlclByb3h5IHsgbnVsbHB0ciB9Owo=