201314 2019-08-29 15:25:47 -0700 Speculative loads should use the NetworkSession owning their Cache 2020-07-06 14:43:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 214008 1 achristensen achristensen cdumez cgarcia commit-queue ews-watchlist webkit-bug-importer oldest_to_newest 1566415 0 achristensen 2019-08-29 15:25:47 -0700 Speculative loads should use the NetworkSession owning their Cache 1566417 1 377634 achristensen 2019-08-29 15:26:58 -0700 Created attachment 377634 Patch 1566418 2 377635 achristensen 2019-08-29 15:31:49 -0700 Created attachment 377635 Patch 1566478 3 377635 commit-queue 2019-08-29 17:17:48 -0700 Comment on attachment 377635 Patch Clearing flags on attachment: 377635 Committed r249303: <https://trac.webkit.org/changeset/249303> 1566479 4 commit-queue 2019-08-29 17:17:49 -0700 All reviewed patches have been landed. Closing bug. 1566483 5 webkit-bug-importer 2019-08-29 17:18:20 -0700 <rdar://problem/54862251> 1669175 6 377635 cdumez 2020-07-06 14:43:29 -0700 Comment on attachment 377635 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=377635&action=review > Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:62 > + m_networkLoad = makeUnique<NetworkLoad>(*this, nullptr, WTFMove(parameters), *cache.networkProcess().networkSession(cache.sessionID())); Turns out this may return a null session now and do a null Derek of the session in the NetworkLoad constructor. See Bug 214008. 377634 2019-08-29 15:26:58 -0700 2019-08-29 15:31:47 -0700 Patch bug-201314-20190829152658.patch text/plain 6477 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5MTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU2NDI1MTJhN2MwYzRkNTAx ZGVlYmUwYTA4Yjg2NjZiYWE4Nzg1NzQuLjMzNTcwNTE2NjY0MzAzMTUwMzdhMWNlZTQyNmZlZTUy NGFmYTI4ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDgtMjkgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBTcGVjdWxhdGl2 ZSBsb2FkcyBzaG91bGQgdXNlIHRoZSBOZXR3b3JrU2Vzc2lvbiBvd25pbmcgdGhlaXIgQ2FjaGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTMxNAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcHJv dmlkZXMgYSBwZXJmb3JtYW5jZSBpbXByb3ZlbWVudCB3aGVuIHVzaW5nIG5vbi1kZWZhdWx0IHBl cnNpc3RlbnQgV0tXZWJzaXRlRGF0YVN0b3Jlcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L05ldHdvcmtTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb246Ok5l dHdvcmtTZXNzaW9uKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2Fj aGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkNhY2hlOjpvcGVuKToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpDYWNoZTo6Q2FjaGUpOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrQ2FjaGU6OkNhY2hlOjpzZXNzaW9uSUQgY29uc3QpOgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHA6CisgICAgICAgIChXZWJL aXQ6Ok5ldHdvcmtDYWNoZTo6U3BlY3VsYXRpdmVMb2FkOjpTcGVjdWxhdGl2ZUxvYWQpOgorCiAy MDE5LTA4LTI2ICBSdXNzZWxsIEVwc3RlaW4gIDxyZXBzdGVpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI0ODk2MS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAKaW5kZXggZDllYzgzMzJhYmEzYmYwZDYz NGVkMmNjMWFkYTRkNzYwOWM2ZmZlMS4uYzNlZTg2MzI5OWY1YmNhODY5MjI1NjkyNTEwMzg5NGFj OGNkNGUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr U2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vz c2lvbi5jcHAKQEAgLTkyLDcgKzkyLDcgQEAgTmV0d29ya1Nlc3Npb246Ok5ldHdvcmtTZXNzaW9u KE5ldHdvcmtQcm9jZXNzJiBuZXR3b3JrUHJvY2VzcywgY29uc3QgTmV0d29ya1Nlc3MKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5 KHBhcmFtZXRlcnMubmV0d29ya0NhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKIAotICAg ICAgICBtX2NhY2hlID0gTmV0d29ya0NhY2hlOjpDYWNoZTo6b3BlbihuZXR3b3JrUHJvY2Vzcywg bmV0d29ya0NhY2hlRGlyZWN0b3J5LCBuZXR3b3JrUHJvY2Vzcy5jYWNoZU9wdGlvbnMoKSk7Cisg ICAgICAgIG1fY2FjaGUgPSBOZXR3b3JrQ2FjaGU6OkNhY2hlOjpvcGVuKG5ldHdvcmtQcm9jZXNz LCBuZXR3b3JrQ2FjaGVEaXJlY3RvcnksIG5ldHdvcmtQcm9jZXNzLmNhY2hlT3B0aW9ucygpLCBt X3Nlc3Npb25JRCk7CiAgICAgICAgIGlmICghbV9jYWNoZSkKICAgICAgICAgICAgIFJFTEVBU0Vf TE9HX0VSUk9SKE5ldHdvcmtDYWNoZSwgIkZhaWxlZCB0byBpbml0aWFsaXplIHRoZSBXZWJLaXQg bmV0d29yayBkaXNrIGNhY2hlIik7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCmluZGV4IDc2ZWYxY2JlZmU5NGFlZmQ4 ZmJhMTFlOGU2M2EyZWY5Y2I3ZWJmMzAuLjc0MjYyZmYwMDdlNTIxZTg5OWYxNDBmOTlhNTU2ZWU2 YTYxMTk1MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZS5jcHAKQEAgLTU5LDcgKzU5LDcgQEAgc3RhdGljIGNvbnN0IEF0b21TdHJp bmcmIHJlc291cmNlVHlwZSgpCiAgICAgcmV0dXJuIHJlc291cmNlOwogfQogCi1SZWZQdHI8Q2Fj aGU+IENhY2hlOjpvcGVuKE5ldHdvcmtQcm9jZXNzJiBuZXR3b3JrUHJvY2VzcywgY29uc3QgU3Ry aW5nJiBjYWNoZVBhdGgsIE9wdGlvblNldDxDYWNoZU9wdGlvbj4gb3B0aW9ucykKK1JlZlB0cjxD YWNoZT4gQ2FjaGU6Om9wZW4oTmV0d29ya1Byb2Nlc3MmIG5ldHdvcmtQcm9jZXNzLCBjb25zdCBT dHJpbmcmIGNhY2hlUGF0aCwgT3B0aW9uU2V0PENhY2hlT3B0aW9uPiBvcHRpb25zLCBQQUw6OlNl c3Npb25JRCBzZXNzaW9uSUQpCiB7CiAgICAgYXV0byBzdG9yYWdlID0gU3RvcmFnZTo6b3Blbihj YWNoZVBhdGgsIG9wdGlvbnMuY29udGFpbnMoQ2FjaGVPcHRpb246OlRlc3RpbmdNb2RlKSA/IFN0 b3JhZ2U6Ok1vZGU6OkF2b2lkUmFuZG9tbmVzcyA6IFN0b3JhZ2U6Ok1vZGU6Ok5vcm1hbCk7CiAK QEAgLTY4LDcgKzY4LDcgQEAgUmVmUHRyPENhY2hlPiBDYWNoZTo6b3BlbihOZXR3b3JrUHJvY2Vz cyYgbmV0d29ya1Byb2Nlc3MsIGNvbnN0IFN0cmluZyYgY2FjaGVQYXQKICAgICBpZiAoIXN0b3Jh Z2UpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcg Q2FjaGUobmV0d29ya1Byb2Nlc3MsIHN0b3JhZ2UucmVsZWFzZU5vbk51bGwoKSwgb3B0aW9ucykp OworICAgIHJldHVybiBhZG9wdFJlZigqbmV3IENhY2hlKG5ldHdvcmtQcm9jZXNzLCBzdG9yYWdl LnJlbGVhc2VOb25OdWxsKCksIG9wdGlvbnMsIHNlc3Npb25JRCkpOwogfQogCiAjaWYgUExBVEZP Uk0oR1RLKSB8fCBQTEFURk9STShXUEUpCkBAIC03OCw5ICs3OCwxMCBAQCBzdGF0aWMgdm9pZCBk dW1wRmlsZUNoYW5nZWQoQ2FjaGUqIGNhY2hlKQogfQogI2VuZGlmCiAKLUNhY2hlOjpDYWNoZShO ZXR3b3JrUHJvY2VzcyYgbmV0d29ya1Byb2Nlc3MsIFJlZjxTdG9yYWdlPiYmIHN0b3JhZ2UsIE9w dGlvblNldDxDYWNoZU9wdGlvbj4gb3B0aW9ucykKK0NhY2hlOjpDYWNoZShOZXR3b3JrUHJvY2Vz cyYgbmV0d29ya1Byb2Nlc3MsIFJlZjxTdG9yYWdlPiYmIHN0b3JhZ2UsIE9wdGlvblNldDxDYWNo ZU9wdGlvbj4gb3B0aW9ucywgUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQogICAgIDogbV9zdG9y YWdlKFdURk1vdmUoc3RvcmFnZSkpCiAgICAgLCBtX25ldHdvcmtQcm9jZXNzKG5ldHdvcmtQcm9j ZXNzKQorICAgICwgbV9zZXNzaW9uSUQoc2Vzc2lvbklEKQogewogI2lmIEVOQUJMRShORVRXT1JL X0NBQ0hFX1NQRUNVTEFUSVZFX1JFVkFMSURBVElPTikKICAgICBpZiAob3B0aW9ucy5jb250YWlu cyhDYWNoZU9wdGlvbjo6U3BlY3VsYXRpdmVSZXZhbGlkYXRpb24pKSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuaAppbmRleCA1NDJhMDI2 OTkwMDM3YTRhYTAxM2Q1ZjA5ZmFlMmQyMGVkYWFlZDJiLi43ZjUzOGY2NTQyYWY3ZDIxMmJlMmVm MDYxNWFjODUzODBmNjQ5ZGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY2FjaGUvTmV0d29ya0NhY2hlLmgKQEAgLTk5LDcgKzk5LDcgQEAgZW51bSBjbGFzcyBDYWNo ZU9wdGlvbiA6IHVpbnQ4X3QgewogCiBjbGFzcyBDYWNoZSA6IHB1YmxpYyBSZWZDb3VudGVkPENh Y2hlPiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZlB0cjxDYWNoZT4gb3BlbihOZXR3b3JrUHJv Y2VzcyYsIGNvbnN0IFN0cmluZyYgY2FjaGVQYXRoLCBPcHRpb25TZXQ8Q2FjaGVPcHRpb24+KTsK KyAgICBzdGF0aWMgUmVmUHRyPENhY2hlPiBvcGVuKE5ldHdvcmtQcm9jZXNzJiwgY29uc3QgU3Ry aW5nJiBjYWNoZVBhdGgsIE9wdGlvblNldDxDYWNoZU9wdGlvbj4sIFBBTDo6U2Vzc2lvbklEKTsK IAogICAgIHZvaWQgc2V0Q2FwYWNpdHkoc2l6ZV90KTsKIApAQCAtMTQ2LDExICsxNDYsMTIgQEAg cHVibGljOgogI2VuZGlmCiAKICAgICBOZXR3b3JrUHJvY2VzcyYgbmV0d29ya1Byb2Nlc3MoKSB7 IHJldHVybiBtX25ldHdvcmtQcm9jZXNzLmdldCgpOyB9CisgICAgY29uc3QgUEFMOjpTZXNzaW9u SUQmIHNlc3Npb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Vzc2lvbklEOyB9CiAKICAgICB+Q2Fj aGUoKTsKIAogcHJpdmF0ZToKLSAgICBDYWNoZShOZXR3b3JrUHJvY2VzcyYsIFJlZjxTdG9yYWdl PiYmLCBPcHRpb25TZXQ8Q2FjaGVPcHRpb24+KTsKKyAgICBDYWNoZShOZXR3b3JrUHJvY2VzcyYs IFJlZjxTdG9yYWdlPiYmLCBPcHRpb25TZXQ8Q2FjaGVPcHRpb24+LCBQQUw6OlNlc3Npb25JRCk7 CiAKICAgICBLZXkgbWFrZUNhY2hlS2V5KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYp OwogCkBAIC0xNzAsNiArMTcxLDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgdW5zaWduZWQg bV90cmF2ZXJzZUNvdW50IHsgMCB9OworICAgIFBBTDo6U2Vzc2lvbklEIG1fc2Vzc2lvbklEOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgTmV0d29ya0NhY2hlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0 aXZlTG9hZC5jcHAKaW5kZXggYmI5N2M3YTNmMjc2MTc2ZDA5ZmY0ODM1YjJmM2I5N2VmMmU1OGZh ZS4uN2E4NzAwNDU4Nzg2MzBkMjExYzVjZTE1Yzg0OTM4ZWEwMWU1Y2E1ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2 ZUxvYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29y a0NhY2hlU3BlY3VsYXRpdmVMb2FkLmNwcApAQCAtNTIsMTQgKzUyLDE0IEBAIFNwZWN1bGF0aXZl TG9hZDo6U3BlY3VsYXRpdmVMb2FkKENhY2hlJiBjYWNoZSwgY29uc3QgR2xvYmFsRnJhbWVJRCYg Z2xvYmFsRnJhbWVJCiB7CiAgICAgQVNTRVJUKCFtX2NhY2hlRW50cnkgfHwgbV9jYWNoZUVudHJ5 LT5uZWVkc1ZhbGlkYXRpb24oKSk7CiAKLSAgICBOZXR3b3JrTG9hZFBhcmFtZXRlcnMgcGFyYW1l dGVycyB7IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkgfTsKKyAgICBOZXR3b3Jr TG9hZFBhcmFtZXRlcnMgcGFyYW1ldGVycyB7IGNhY2hlLnNlc3Npb25JRCgpIH07CiAgICAgcGFy YW1ldGVycy53ZWJQYWdlSUQgPSBnbG9iYWxGcmFtZUlELmZpcnN0OwogICAgIHBhcmFtZXRlcnMu d2ViRnJhbWVJRCA9IGdsb2JhbEZyYW1lSUQuc2Vjb25kOwogICAgIHBhcmFtZXRlcnMuc3RvcmVk Q3JlZGVudGlhbHNQb2xpY3kgPSBTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlOwogICAgIHBh cmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5ID0gQ29udGVudFNuaWZmaW5nUG9saWN5OjpE b05vdFNuaWZmQ29udGVudDsKICAgICBwYXJhbWV0ZXJzLmNvbnRlbnRFbmNvZGluZ1NuaWZmaW5n UG9saWN5ID0gQ29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3k6OlNuaWZmOwogICAgIHBhcmFt ZXRlcnMucmVxdWVzdCA9IG1fb3JpZ2luYWxSZXF1ZXN0OwotICAgIG1fbmV0d29ya0xvYWQgPSBt YWtlVW5pcXVlPE5ldHdvcmtMb2FkPigqdGhpcywgbnVsbHB0ciwgV1RGTW92ZShwYXJhbWV0ZXJz KSwgKmNhY2hlLm5ldHdvcmtQcm9jZXNzKCkubmV0d29ya1Nlc3Npb24oUEFMOjpTZXNzaW9uSUQ6 OmRlZmF1bHRTZXNzaW9uSUQoKSkpOworICAgIG1fbmV0d29ya0xvYWQgPSBtYWtlVW5pcXVlPE5l dHdvcmtMb2FkPigqdGhpcywgbnVsbHB0ciwgV1RGTW92ZShwYXJhbWV0ZXJzKSwgKmNhY2hlLm5l dHdvcmtQcm9jZXNzKCkubmV0d29ya1Nlc3Npb24oY2FjaGUuc2Vzc2lvbklEKCkpKTsKIH0KIAog U3BlY3VsYXRpdmVMb2FkOjp+U3BlY3VsYXRpdmVMb2FkKCkK 377635 2019-08-29 15:31:49 -0700 2019-08-29 17:17:48 -0700 Patch bug-201314-20190829153148.patch text/plain 7046 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5MTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU2NDI1MTJhN2MwYzRkNTAx ZGVlYmUwYTA4Yjg2NjZiYWE4Nzg1NzQuLjMzNTcwNTE2NjY0MzAzMTUwMzdhMWNlZTQyNmZlZTUy NGFmYTI4ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDgtMjkgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBTcGVjdWxhdGl2 ZSBsb2FkcyBzaG91bGQgdXNlIHRoZSBOZXR3b3JrU2Vzc2lvbiBvd25pbmcgdGhlaXIgQ2FjaGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTMxNAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcHJv dmlkZXMgYSBwZXJmb3JtYW5jZSBpbXByb3ZlbWVudCB3aGVuIHVzaW5nIG5vbi1kZWZhdWx0IHBl cnNpc3RlbnQgV0tXZWJzaXRlRGF0YVN0b3Jlcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L05ldHdvcmtTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb246Ok5l dHdvcmtTZXNzaW9uKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2Fj aGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkNhY2hlOjpvcGVuKToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpDYWNoZTo6Q2FjaGUpOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrQ2FjaGU6OkNhY2hlOjpzZXNzaW9uSUQgY29uc3QpOgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHA6CisgICAgICAgIChXZWJL aXQ6Ok5ldHdvcmtDYWNoZTo6U3BlY3VsYXRpdmVMb2FkOjpTcGVjdWxhdGl2ZUxvYWQpOgorCiAy MDE5LTA4LTI2ICBSdXNzZWxsIEVwc3RlaW4gIDxyZXBzdGVpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI0ODk2MS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAKaW5kZXggZDllYzgzMzJhYmEzYmYwZDYz NGVkMmNjMWFkYTRkNzYwOWM2ZmZlMS4uYzNlZTg2MzI5OWY1YmNhODY5MjI1NjkyNTEwMzg5NGFj OGNkNGUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr U2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vz c2lvbi5jcHAKQEAgLTkyLDcgKzkyLDcgQEAgTmV0d29ya1Nlc3Npb246Ok5ldHdvcmtTZXNzaW9u KE5ldHdvcmtQcm9jZXNzJiBuZXR3b3JrUHJvY2VzcywgY29uc3QgTmV0d29ya1Nlc3MKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5 KHBhcmFtZXRlcnMubmV0d29ya0NhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKIAotICAg ICAgICBtX2NhY2hlID0gTmV0d29ya0NhY2hlOjpDYWNoZTo6b3BlbihuZXR3b3JrUHJvY2Vzcywg bmV0d29ya0NhY2hlRGlyZWN0b3J5LCBuZXR3b3JrUHJvY2Vzcy5jYWNoZU9wdGlvbnMoKSk7Cisg ICAgICAgIG1fY2FjaGUgPSBOZXR3b3JrQ2FjaGU6OkNhY2hlOjpvcGVuKG5ldHdvcmtQcm9jZXNz LCBuZXR3b3JrQ2FjaGVEaXJlY3RvcnksIG5ldHdvcmtQcm9jZXNzLmNhY2hlT3B0aW9ucygpLCBt X3Nlc3Npb25JRCk7CiAgICAgICAgIGlmICghbV9jYWNoZSkKICAgICAgICAgICAgIFJFTEVBU0Vf TE9HX0VSUk9SKE5ldHdvcmtDYWNoZSwgIkZhaWxlZCB0byBpbml0aWFsaXplIHRoZSBXZWJLaXQg bmV0d29yayBkaXNrIGNhY2hlIik7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCmluZGV4IDc2ZWYxY2JlZmU5NGFlZmQ4 ZmJhMTFlOGU2M2EyZWY5Y2I3ZWJmMzAuLjc0MjYyZmYwMDdlNTIxZTg5OWYxNDBmOTlhNTU2ZWU2 YTYxMTk1MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZS5jcHAKQEAgLTU5LDcgKzU5LDcgQEAgc3RhdGljIGNvbnN0IEF0b21TdHJp bmcmIHJlc291cmNlVHlwZSgpCiAgICAgcmV0dXJuIHJlc291cmNlOwogfQogCi1SZWZQdHI8Q2Fj aGU+IENhY2hlOjpvcGVuKE5ldHdvcmtQcm9jZXNzJiBuZXR3b3JrUHJvY2VzcywgY29uc3QgU3Ry aW5nJiBjYWNoZVBhdGgsIE9wdGlvblNldDxDYWNoZU9wdGlvbj4gb3B0aW9ucykKK1JlZlB0cjxD YWNoZT4gQ2FjaGU6Om9wZW4oTmV0d29ya1Byb2Nlc3MmIG5ldHdvcmtQcm9jZXNzLCBjb25zdCBT dHJpbmcmIGNhY2hlUGF0aCwgT3B0aW9uU2V0PENhY2hlT3B0aW9uPiBvcHRpb25zLCBQQUw6OlNl c3Npb25JRCBzZXNzaW9uSUQpCiB7CiAgICAgYXV0byBzdG9yYWdlID0gU3RvcmFnZTo6b3Blbihj YWNoZVBhdGgsIG9wdGlvbnMuY29udGFpbnMoQ2FjaGVPcHRpb246OlRlc3RpbmdNb2RlKSA/IFN0 b3JhZ2U6Ok1vZGU6OkF2b2lkUmFuZG9tbmVzcyA6IFN0b3JhZ2U6Ok1vZGU6Ok5vcm1hbCk7CiAK QEAgLTY4LDcgKzY4LDcgQEAgUmVmUHRyPENhY2hlPiBDYWNoZTo6b3BlbihOZXR3b3JrUHJvY2Vz cyYgbmV0d29ya1Byb2Nlc3MsIGNvbnN0IFN0cmluZyYgY2FjaGVQYXQKICAgICBpZiAoIXN0b3Jh Z2UpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcg Q2FjaGUobmV0d29ya1Byb2Nlc3MsIHN0b3JhZ2UucmVsZWFzZU5vbk51bGwoKSwgb3B0aW9ucykp OworICAgIHJldHVybiBhZG9wdFJlZigqbmV3IENhY2hlKG5ldHdvcmtQcm9jZXNzLCBzdG9yYWdl LnJlbGVhc2VOb25OdWxsKCksIG9wdGlvbnMsIHNlc3Npb25JRCkpOwogfQogCiAjaWYgUExBVEZP Uk0oR1RLKSB8fCBQTEFURk9STShXUEUpCkBAIC03OCw5ICs3OCwxMCBAQCBzdGF0aWMgdm9pZCBk dW1wRmlsZUNoYW5nZWQoQ2FjaGUqIGNhY2hlKQogfQogI2VuZGlmCiAKLUNhY2hlOjpDYWNoZShO ZXR3b3JrUHJvY2VzcyYgbmV0d29ya1Byb2Nlc3MsIFJlZjxTdG9yYWdlPiYmIHN0b3JhZ2UsIE9w dGlvblNldDxDYWNoZU9wdGlvbj4gb3B0aW9ucykKK0NhY2hlOjpDYWNoZShOZXR3b3JrUHJvY2Vz cyYgbmV0d29ya1Byb2Nlc3MsIFJlZjxTdG9yYWdlPiYmIHN0b3JhZ2UsIE9wdGlvblNldDxDYWNo ZU9wdGlvbj4gb3B0aW9ucywgUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQogICAgIDogbV9zdG9y YWdlKFdURk1vdmUoc3RvcmFnZSkpCiAgICAgLCBtX25ldHdvcmtQcm9jZXNzKG5ldHdvcmtQcm9j ZXNzKQorICAgICwgbV9zZXNzaW9uSUQoc2Vzc2lvbklEKQogewogI2lmIEVOQUJMRShORVRXT1JL X0NBQ0hFX1NQRUNVTEFUSVZFX1JFVkFMSURBVElPTikKICAgICBpZiAob3B0aW9ucy5jb250YWlu cyhDYWNoZU9wdGlvbjo6U3BlY3VsYXRpdmVSZXZhbGlkYXRpb24pKSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuaAppbmRleCA1NDJhMDI2 OTkwMDM3YTRhYTAxM2Q1ZjA5ZmFlMmQyMGVkYWFlZDJiLi43ZjUzOGY2NTQyYWY3ZDIxMmJlMmVm MDYxNWFjODUzODBmNjQ5ZGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY2FjaGUvTmV0d29ya0NhY2hlLmgKQEAgLTk5LDcgKzk5LDcgQEAgZW51bSBjbGFzcyBDYWNo ZU9wdGlvbiA6IHVpbnQ4X3QgewogCiBjbGFzcyBDYWNoZSA6IHB1YmxpYyBSZWZDb3VudGVkPENh Y2hlPiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZlB0cjxDYWNoZT4gb3BlbihOZXR3b3JrUHJv Y2VzcyYsIGNvbnN0IFN0cmluZyYgY2FjaGVQYXRoLCBPcHRpb25TZXQ8Q2FjaGVPcHRpb24+KTsK KyAgICBzdGF0aWMgUmVmUHRyPENhY2hlPiBvcGVuKE5ldHdvcmtQcm9jZXNzJiwgY29uc3QgU3Ry aW5nJiBjYWNoZVBhdGgsIE9wdGlvblNldDxDYWNoZU9wdGlvbj4sIFBBTDo6U2Vzc2lvbklEKTsK IAogICAgIHZvaWQgc2V0Q2FwYWNpdHkoc2l6ZV90KTsKIApAQCAtMTQ2LDExICsxNDYsMTIgQEAg cHVibGljOgogI2VuZGlmCiAKICAgICBOZXR3b3JrUHJvY2VzcyYgbmV0d29ya1Byb2Nlc3MoKSB7 IHJldHVybiBtX25ldHdvcmtQcm9jZXNzLmdldCgpOyB9CisgICAgY29uc3QgUEFMOjpTZXNzaW9u SUQmIHNlc3Npb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Vzc2lvbklEOyB9CiAKICAgICB+Q2Fj aGUoKTsKIAogcHJpdmF0ZToKLSAgICBDYWNoZShOZXR3b3JrUHJvY2VzcyYsIFJlZjxTdG9yYWdl PiYmLCBPcHRpb25TZXQ8Q2FjaGVPcHRpb24+KTsKKyAgICBDYWNoZShOZXR3b3JrUHJvY2VzcyYs IFJlZjxTdG9yYWdlPiYmLCBPcHRpb25TZXQ8Q2FjaGVPcHRpb24+LCBQQUw6OlNlc3Npb25JRCk7 CiAKICAgICBLZXkgbWFrZUNhY2hlS2V5KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYp OwogCkBAIC0xNzAsNiArMTcxLDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgdW5zaWduZWQg bV90cmF2ZXJzZUNvdW50IHsgMCB9OworICAgIFBBTDo6U2Vzc2lvbklEIG1fc2Vzc2lvbklEOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgTmV0d29ya0NhY2hlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0 aXZlTG9hZC5jcHAKaW5kZXggYmI5N2M3YTNmMjc2MTc2ZDA5ZmY0ODM1YjJmM2I5N2VmMmU1OGZh ZS4uZWQzYzgwYzg5NTRkMGZlMzdiMjJkN2Y3MDc4ZTMyYWUxZmQxYmUwMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2 ZUxvYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29y a0NhY2hlU3BlY3VsYXRpdmVMb2FkLmNwcApAQCAtNTIsMTQgKzUyLDE0IEBAIFNwZWN1bGF0aXZl TG9hZDo6U3BlY3VsYXRpdmVMb2FkKENhY2hlJiBjYWNoZSwgY29uc3QgR2xvYmFsRnJhbWVJRCYg Z2xvYmFsRnJhbWVJCiB7CiAgICAgQVNTRVJUKCFtX2NhY2hlRW50cnkgfHwgbV9jYWNoZUVudHJ5 LT5uZWVkc1ZhbGlkYXRpb24oKSk7CiAKLSAgICBOZXR3b3JrTG9hZFBhcmFtZXRlcnMgcGFyYW1l dGVycyB7IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkgfTsKKyAgICBOZXR3b3Jr TG9hZFBhcmFtZXRlcnMgcGFyYW1ldGVycyB7IGNhY2hlLnNlc3Npb25JRCgpIH07CiAgICAgcGFy YW1ldGVycy53ZWJQYWdlSUQgPSBnbG9iYWxGcmFtZUlELmZpcnN0OwogICAgIHBhcmFtZXRlcnMu d2ViRnJhbWVJRCA9IGdsb2JhbEZyYW1lSUQuc2Vjb25kOwogICAgIHBhcmFtZXRlcnMuc3RvcmVk Q3JlZGVudGlhbHNQb2xpY3kgPSBTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlOwogICAgIHBh cmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5ID0gQ29udGVudFNuaWZmaW5nUG9saWN5OjpE b05vdFNuaWZmQ29udGVudDsKICAgICBwYXJhbWV0ZXJzLmNvbnRlbnRFbmNvZGluZ1NuaWZmaW5n UG9saWN5ID0gQ29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3k6OlNuaWZmOwogICAgIHBhcmFt ZXRlcnMucmVxdWVzdCA9IG1fb3JpZ2luYWxSZXF1ZXN0OwotICAgIG1fbmV0d29ya0xvYWQgPSBt YWtlVW5pcXVlPE5ldHdvcmtMb2FkPigqdGhpcywgbnVsbHB0ciwgV1RGTW92ZShwYXJhbWV0ZXJz KSwgKmNhY2hlLm5ldHdvcmtQcm9jZXNzKCkubmV0d29ya1Nlc3Npb24oUEFMOjpTZXNzaW9uSUQ6 OmRlZmF1bHRTZXNzaW9uSUQoKSkpOworICAgIG1fbmV0d29ya0xvYWQgPSBtYWtlVW5pcXVlPE5l dHdvcmtMb2FkPigqdGhpcywgbnVsbHB0ciwgV1RGTW92ZShwYXJhbWV0ZXJzKSwgKmNhY2hlLm5l dHdvcmtQcm9jZXNzKCkubmV0d29ya1Nlc3Npb24oY2FjaGUuc2Vzc2lvbklEKCkpKTsKIH0KIAog U3BlY3VsYXRpdmVMb2FkOjp+U3BlY3VsYXRpdmVMb2FkKCkKQEAgLTczLDcgKzczLDcgQEAgdm9p ZCBTcGVjdWxhdGl2ZUxvYWQ6OndpbGxTZW5kUmVkaXJlY3RlZFJlcXVlc3QoUmVzb3VyY2VSZXF1 ZXN0JiYgcmVxdWVzdCwgUmVzb3UKIAogICAgIE9wdGlvbmFsPFNlY29uZHM+IG1heEFnZUNhcDsK ICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQotICAgIGlmIChhdXRvKiBuZXR3 b3JrU3RvcmFnZVNlc3Npb24gPSBtX2NhY2hlLT5uZXR3b3JrUHJvY2VzcygpLnN0b3JhZ2VTZXNz aW9uKFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkpKQorICAgIGlmIChhdXRvKiBu ZXR3b3JrU3RvcmFnZVNlc3Npb24gPSBtX2NhY2hlLT5uZXR3b3JrUHJvY2VzcygpLnN0b3JhZ2VT ZXNzaW9uKG1fY2FjaGUtPnNlc3Npb25JRCgpKSkKICAgICAgICAgbWF4QWdlQ2FwID0gbmV0d29y a1N0b3JhZ2VTZXNzaW9uLT5tYXhBZ2VDYWNoZUNhcChyZXF1ZXN0KTsKICNlbmRpZgogICAgIG1f Y2FjaGVFbnRyeSA9IG1fY2FjaGUtPnN0b3JlUmVkaXJlY3QocmVxdWVzdCwgcmVkaXJlY3RSZXNw b25zZSwgcmVkaXJlY3RSZXF1ZXN0LCBtYXhBZ2VDYXApOwo=