207903 2020-02-18 12:51:12 -0800 NetworkDataTask should not expect its session wrapper to be always live 2020-02-18 15:09:07 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar InRadar P2 Normal --- 1 youennf youennf achristensen beidson commit-queue webkit-bug-importer oldest_to_newest 1620275 0 youennf 2020-02-18 12:51:12 -0800 NetworkDataTask should not expect its session wrapper to be always live 1620279 1 youennf 2020-02-18 12:52:56 -0800 <rdar://problem/59291486> 1620280 2 webkit-bug-importer 2020-02-18 12:53:15 -0800 <rdar://problem/59561689> 1620281 3 youennf 2020-02-18 12:53:46 -0800 <rdar://problem/59291486> 1620283 4 391079 youennf 2020-02-18 12:55:47 -0800 Created attachment 391079 Patch 1620313 5 391079 youennf 2020-02-18 14:04:44 -0800 Comment on attachment 391079 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391079&action=review > Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h:93 > + WeakPtr<SessionWrapper> m_sessionWrapper; I think the WeakPtr is necessary in case of SessionWrapper being an isolated session, which can be removed or cleared at various points in time. 1620315 6 391079 achristensen 2020-02-18 14:07:45 -0800 Comment on attachment 391079 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391079&action=review > Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:321 > if (!m_task || !m_session) Let's just replace m_session with m_sessionWrapper, which is the only one used in this function. 1620316 7 391088 youennf 2020-02-18 14:10:56 -0800 Created attachment 391088 Patch for landing 1620356 8 391088 commit-queue 2020-02-18 15:09:05 -0800 Comment on attachment 391088 Patch for landing Clearing flags on attachment: 391088 Committed r256857: <https://trac.webkit.org/changeset/256857> 1620357 9 commit-queue 2020-02-18 15:09:07 -0800 All reviewed patches have been landed. Closing bug. 391079 2020-02-18 12:55:47 -0800 2020-02-18 14:10:54 -0800 Patch bug-207903-20200218125546.patch text/plain 5452 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2Nzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE2Njk4YmNiOTNiOWM2NGE3 YzI3OGQyMWUwZWZmZGIyZjZlNTg0NDUuLmMzMDNmMjQxMmMyMGMwMjRkMzAyOGZhYzM3NzA1NjZi YmU0YTcyNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDItMTggIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE5ldHdvcmtEYXRhVGFzayBzaG91 bGQgbm90IGV4cGVjdCBpdHMgc2Vzc2lvbiB3cmFwcGVyIHRvIGJlIGFsd2F5cyBsaXZlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDc5MDMKKyAgICAg ICAgcmRhcjovL3Byb2JsZW0vNTkyOTE0ODYKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTmV0d29ya0RhdGFUYXNrQ29jb2Egc2hvdWxkIHRha2UgYSB3ZWFr IHBvaW50ZXIgdG8gaXRzIHNlc3Npb24gd3JhcHBlci4KKyAgICAgICAgSWYgdGhlIHNlc3Npb24g d3JhcHBlciBpcyBzdGlsbCB2YWxpZCwgdGhlbiB3ZSBjYW4gcmVtb3ZlIHRoZSB0YXNrIGZyb20g dGhlIHNlc3Npb24gd3JhcHBlciBtYXAuCisgICAgICAgIFdlIGNhbm5vdCBndWFyYW50ZWUgc2Vz c2lvbiB3cmFwcGVyIGlzIHZhbGlkIHNpbmNlIE5ldHdvcmtEYXRhVGFzayBpcyByZWYgY291bnRl ZC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29h Lmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2Eu bW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3b3JrRGF0YVRh c2tDb2NvYSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0NvY29hOjp+TmV0d29y a0RhdGFUYXNrQ29jb2EpOgorCiAyMDIwLTAyLTE3ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFw cGxlLmNvbT4KIAogICAgICAgICBVc2UgbW9yZSBPYmplY3RJZGVudGlmaWVyIGluIFdlYlJUQyBN RE5TIHJlZ2lzdGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2Nv Y29hL05ldHdvcmtEYXRhVGFza0NvY29hLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLmgKaW5kZXggMDJiMWQzMDkyMzk5ZTVmNmIxMzY1 MjNjZjE2OTljOThjNmI0OGRiZi4uZjQ4MzE5YTcxZDkyNTk4YzJkMTYwYTUwYmY4NjQ3ZWU3YmJh NmE3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3 b3JrRGF0YVRhc2tDb2NvYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya0RhdGFUYXNrQ29jb2EuaApAQCAtOTAsNyArOTAsNyBAQCBwcml2YXRlOgogICAg IGJvb2wgaXNUaGlyZFBhcnR5UmVxdWVzdChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm KSBjb25zdDsKICAgICBib29sIGlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpIGNvbnN0OwogCi0g ICAgU2Vzc2lvbldyYXBwZXImIG1fc2Vzc2lvbldyYXBwZXI7CisgICAgV2Vha1B0cjxTZXNzaW9u V3JhcHBlcj4gbV9zZXNzaW9uV3JhcHBlcjsKICAgICBSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4g bV9zYW5kYm94RXh0ZW5zaW9uOwogICAgIFJldGFpblB0cjxOU1VSTFNlc3Npb25EYXRhVGFzaz4g bV90YXNrOwogICAgIFdlYkNvcmU6Ok5ldHdvcmtMb2FkTWV0cmljcyBtX25ldHdvcmtMb2FkTWV0 cmljczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0 d29ya0RhdGFUYXNrQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtEYXRhVGFza0NvY29hLm1tCmluZGV4IDEyZDM5NjFjZGZhYTc3NjI4NjUyYWYzZjk5 Y2FkMWM5MjhkNzE1MjguLjY5YzE1NTE2MjhkY2Q3YTg3ODhmMWVjMTgyMTNkNzQwMTA3YjczYmMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0Rh dGFUYXNrQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9O ZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQpAQCAtMjMwLDcgKzIzMCw3IEBAIHN0YXRpYyBpbmxpbmUg Ym9vbCBjb21wdXRlSXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKE5ldHdvcmtTZXNzaW9uJiBzZXNz aW9uKQogCiBOZXR3b3JrRGF0YVRhc2tDb2NvYTo6TmV0d29ya0RhdGFUYXNrQ29jb2EoTmV0d29y a1Nlc3Npb24mIHNlc3Npb24sIE5ldHdvcmtEYXRhVGFza0NsaWVudCYgY2xpZW50LCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3RXaXRoQ3JlZGVudGlhbHMsIFdlYkNvcmU6 OkZyYW1lSWRlbnRpZmllciBmcmFtZUlELCBXZWJDb3JlOjpQYWdlSWRlbnRpZmllciBwYWdlSUQs IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5IHN0b3JlZENyZWRlbnRpYWxzUG9saWN5 LCBXZWJDb3JlOjpDb250ZW50U25pZmZpbmdQb2xpY3kgc2hvdWxkQ29udGVudFNuaWZmLCBXZWJD b3JlOjpDb250ZW50RW5jb2RpbmdTbmlmZmluZ1BvbGljeSBzaG91bGRDb250ZW50RW5jb2RpbmdT bmlmZiwgYm9vbCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCBQcmVj b25uZWN0T25seSBzaG91bGRQcmVjb25uZWN0T25seSwgYm9vbCBkYXRhVGFza0lzRm9yTWFpbkZy YW1lTmF2aWdhdGlvbiwgYm9vbCBkYXRhVGFza0lzRm9yTWFpblJlc291cmNlTmF2aWdhdGlvbkZv ckFueUZyYW1lLCBPcHRpb25hbDxOZXR3b3JrQWN0aXZpdHlUcmFja2VyPiBuZXR3b3JrQWN0aXZp dHlUcmFja2VyKQogICAgIDogTmV0d29ya0RhdGFUYXNrKHNlc3Npb24sIGNsaWVudCwgcmVxdWVz dFdpdGhDcmVkZW50aWFscywgc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3ksIHNob3VsZENsZWFyUmVm ZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QsIGRhdGFUYXNrSXNGb3JNYWluRnJhbWVOYXZpZ2F0 aW9uKQotICAgICwgbV9zZXNzaW9uV3JhcHBlcihzdGF0aWNfY2FzdDxOZXR3b3JrU2Vzc2lvbkNv Y29hJj4oc2Vzc2lvbikuc2Vzc2lvbldyYXBwZXJGb3JUYXNrKHJlcXVlc3RXaXRoQ3JlZGVudGlh bHMsIHN0b3JlZENyZWRlbnRpYWxzUG9saWN5KSkKKyAgICAsIG1fc2Vzc2lvbldyYXBwZXIobWFr ZVdlYWtQdHIoc3RhdGljX2Nhc3Q8TmV0d29ya1Nlc3Npb25Db2NvYSY+KHNlc3Npb24pLnNlc3Np b25XcmFwcGVyRm9yVGFzayhyZXF1ZXN0V2l0aENyZWRlbnRpYWxzLCBzdG9yZWRDcmVkZW50aWFs c1BvbGljeSkpKQogICAgICwgbV9mcmFtZUlEKGZyYW1lSUQpCiAgICAgLCBtX3BhZ2VJRChwYWdl SUQpCiAgICAgLCBtX2lzRm9yTWFpblJlc291cmNlTmF2aWdhdGlvbkZvckFueUZyYW1lKGRhdGFU YXNrSXNGb3JNYWluUmVzb3VyY2VOYXZpZ2F0aW9uRm9yQW55RnJhbWUpCkBAIC0yNzcsMTIgKzI3 NywxMiBAQCBOZXR3b3JrRGF0YVRhc2tDb2NvYTo6TmV0d29ya0RhdGFUYXNrQ29jb2EoTmV0d29y a1Nlc3Npb24mIHNlc3Npb24sIE5ldHdvcmtEYXRhVAogICAgIE5TVVJMUmVxdWVzdCAqbnNSZXF1 ZXN0ID0gcmVxdWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6SFRUUEJvZHlVcGRhdGVQb2xpY3k6 OlVwZGF0ZUhUVFBCb2R5KTsKICAgICBhcHBseVNuaWZmaW5nUG9saWNpZXNBbmRCaW5kUmVxdWVz dFRvSW5mZXJmYWNlSWZOZWVkZWQobnNSZXF1ZXN0LCBzaG91bGRDb250ZW50U25pZmYgPT0gV2Vi Q29yZTo6Q29udGVudFNuaWZmaW5nUG9saWN5OjpTbmlmZkNvbnRlbnQgJiYgIXVybC5pc0xvY2Fs RmlsZSgpLCBzaG91bGRDb250ZW50RW5jb2RpbmdTbmlmZiA9PSBXZWJDb3JlOjpDb250ZW50RW5j b2RpbmdTbmlmZmluZ1BvbGljeTo6U25pZmYpOwogCi0gICAgbV90YXNrID0gW21fc2Vzc2lvbldy YXBwZXIuc2Vzc2lvbiBkYXRhVGFza1dpdGhSZXF1ZXN0Om5zUmVxdWVzdF07CisgICAgbV90YXNr ID0gW21fc2Vzc2lvbldyYXBwZXItPnNlc3Npb24gZGF0YVRhc2tXaXRoUmVxdWVzdDpuc1JlcXVl c3RdOwogCiAgICAgQkVHSU5fU0lHTlBPU1QobV90YXNrLCAiJXtwdWJsaWN9cyBwcmk6ICVmIHBy ZWNvbm5lY3Q6ICVkIiwgdXJsLnN0cmluZygpLmFzY2lpKCkuZGF0YSgpLCB0b05TVVJMU2Vzc2lv blRhc2tQcmlvcml0eShyZXF1ZXN0LnByaW9yaXR5KCkpLCBzaG91bGRQcmVjb25uZWN0T25seSA9 PSBQcmVjb25uZWN0T25seTo6WWVzKTsKIAotICAgIFJFTEVBU0VfQVNTRVJUKCFtX3Nlc3Npb25X cmFwcGVyLmRhdGFUYXNrTWFwLmNvbnRhaW5zKFttX3Rhc2sgdGFza0lkZW50aWZpZXJdKSk7Ci0g ICAgbV9zZXNzaW9uV3JhcHBlci5kYXRhVGFza01hcC5hZGQoW21fdGFzayB0YXNrSWRlbnRpZmll cl0sIHRoaXMpOworICAgIFJFTEVBU0VfQVNTRVJUKCFtX3Nlc3Npb25XcmFwcGVyLT5kYXRhVGFz a01hcC5jb250YWlucyhbbV90YXNrIHRhc2tJZGVudGlmaWVyXSkpOworICAgIG1fc2Vzc2lvbldy YXBwZXItPmRhdGFUYXNrTWFwLmFkZChbbV90YXNrIHRhc2tJZGVudGlmaWVyXSwgdGhpcyk7CiAg ICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiJWxsdSBDcmVhdGluZyBOZXR3b3JrRGF0YVRhc2sgd2l0 aCBVUkwgJXMiLCBbbV90YXNrIHRhc2tJZGVudGlmaWVyXSwgbnNSZXF1ZXN0LlVSTC5hYnNvbHV0 ZVN0cmluZy5VVEY4U3RyaW5nKTsKIAogICAgIGlmIChzaG91bGRQcmVjb25uZWN0T25seSA9PSBQ cmVjb25uZWN0T25seTo6WWVzKSB7CkBAIC0zMjEsOCArMzIxLDExIEBAIE5ldHdvcmtEYXRhVGFz a0NvY29hOjp+TmV0d29ya0RhdGFUYXNrQ29jb2EoKQogICAgIGlmICghbV90YXNrIHx8ICFtX3Nl c3Npb24pCiAgICAgICAgIHJldHVybjsKIAotICAgIFJFTEVBU0VfQVNTRVJUKG1fc2Vzc2lvbldy YXBwZXIuZGF0YVRhc2tNYXAuZ2V0KFttX3Rhc2sgdGFza0lkZW50aWZpZXJdKSA9PSB0aGlzKTsK LSAgICBtX3Nlc3Npb25XcmFwcGVyLmRhdGFUYXNrTWFwLnJlbW92ZShbbV90YXNrIHRhc2tJZGVu dGlmaWVyXSk7CisgICAgaWYgKCFtX3Nlc3Npb25XcmFwcGVyKQorICAgICAgICByZXR1cm47CisK KyAgICBSRUxFQVNFX0FTU0VSVChtX3Nlc3Npb25XcmFwcGVyLT5kYXRhVGFza01hcC5nZXQoW21f dGFzayB0YXNrSWRlbnRpZmllcl0pID09IHRoaXMpOworICAgIG1fc2Vzc2lvbldyYXBwZXItPmRh dGFUYXNrTWFwLnJlbW92ZShbbV90YXNrIHRhc2tJZGVudGlmaWVyXSk7CiB9CiAKIHZvaWQgTmV0 d29ya0RhdGFUYXNrQ29jb2E6OnJlc3RyaWN0UmVxdWVzdFJlZmVycmVyVG9PcmlnaW5JZk5lZWRl ZChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCg== 391088 2020-02-18 14:10:56 -0800 2020-02-18 15:09:05 -0800 Patch for landing bug-207903-20200218141056.patch text/plain 5536 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2Nzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE2Njk4YmNiOTNiOWM2NGE3 YzI3OGQyMWUwZWZmZGIyZjZlNTg0NDUuLmFlN2MxN2Y0OGZlYTEyY2JiYmFhMzE3YTk5ZTU3OTE4 Zjg0YjI4NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDItMTggIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE5ldHdvcmtEYXRhVGFzayBzaG91 bGQgbm90IGV4cGVjdCBpdHMgc2Vzc2lvbiB3cmFwcGVyIHRvIGJlIGFsd2F5cyBsaXZlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDc5MDMKKyAgICAg ICAgcmRhcjovL3Byb2JsZW0vNTkyOTE0ODYKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENo cmlzdGVuc2VuLgorCisgICAgICAgIE5ldHdvcmtEYXRhVGFza0NvY29hIHNob3VsZCB0YWtlIGEg d2VhayBwb2ludGVyIHRvIGl0cyBzZXNzaW9uIHdyYXBwZXIuCisgICAgICAgIElmIHRoZSBzZXNz aW9uIHdyYXBwZXIgaXMgc3RpbGwgdmFsaWQsIHRoZW4gd2UgY2FuIHJlbW92ZSB0aGUgdGFzayBm cm9tIHRoZSBzZXNzaW9uIHdyYXBwZXIgbWFwLgorICAgICAgICBXZSBjYW5ub3QgZ3VhcmFudGVl IHNlc3Npb24gd3JhcHBlciBpcyB2YWxpZCBzaW5jZSBOZXR3b3JrRGF0YVRhc2sgaXMgcmVmIGNv dW50ZWQuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tD b2NvYS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0Nv Y29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2tDb2NvYTo6TmV0d29ya0Rh dGFUYXNrQ29jb2EpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2tDb2NvYTo6fk5l dHdvcmtEYXRhVGFza0NvY29hKToKKwogMjAyMC0wMi0xNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIG1vcmUgT2JqZWN0SWRlbnRpZmllciBpbiBXZWJS VEMgTUROUyByZWdpc3RlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5oCmluZGV4IDAyYjFkMzA5MjM5OWU1ZjZi MTM2NTIzY2YxNjk5Yzk4YzZiNDhkYmYuLmY0ODMxOWE3MWQ5MjU5OGMyZDE2MGE1MGJmODY0N2Vl N2JiYTZhNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2Ev TmV0d29ya0RhdGFUYXNrQ29jb2EuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLmgKQEAgLTkwLDcgKzkwLDcgQEAgcHJpdmF0ZToK ICAgICBib29sIGlzVGhpcmRQYXJ0eVJlcXVlc3QoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JikgY29uc3Q7CiAgICAgYm9vbCBpc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSBjb25zdDsK IAotICAgIFNlc3Npb25XcmFwcGVyJiBtX3Nlc3Npb25XcmFwcGVyOworICAgIFdlYWtQdHI8U2Vz c2lvbldyYXBwZXI+IG1fc2Vzc2lvbldyYXBwZXI7CiAgICAgUmVmUHRyPFNhbmRib3hFeHRlbnNp b24+IG1fc2FuZGJveEV4dGVuc2lvbjsKICAgICBSZXRhaW5QdHI8TlNVUkxTZXNzaW9uRGF0YVRh c2s+IG1fdGFzazsKICAgICBXZWJDb3JlOjpOZXR3b3JrTG9hZE1ldHJpY3MgbV9uZXR3b3JrTG9h ZE1ldHJpY3M7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtEYXRhVGFza0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j b2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQppbmRleCAxMmQzOTYxY2RmYWE3NzYyODY1MmFm M2Y5OWNhZDFjOTI4ZDcxNTI4Li41OWY1NmY0YjczYmFmMGY2M2U2YmU0NTA3YmM1ODdmYjNkZGRh MjY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdv cmtEYXRhVGFza0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0KQEAgLTIzMCw3ICsyMzAsNyBAQCBzdGF0aWMgaW5s aW5lIGJvb2wgY29tcHV0ZUlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZChOZXR3b3JrU2Vzc2lvbiYg c2Vzc2lvbikKIAogTmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0NvY29hKE5l dHdvcmtTZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0YVRhc2tDbGllbnQmIGNsaWVudCwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0V2l0aENyZWRlbnRpYWxzLCBXZWJD b3JlOjpGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIgcGFn ZUlELCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSBzdG9yZWRDcmVkZW50aWFsc1Bv bGljeSwgV2ViQ29yZTo6Q29udGVudFNuaWZmaW5nUG9saWN5IHNob3VsZENvbnRlbnRTbmlmZiwg V2ViQ29yZTo6Q29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3kgc2hvdWxkQ29udGVudEVuY29k aW5nU25pZmYsIGJvb2wgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwg UHJlY29ubmVjdE9ubHkgc2hvdWxkUHJlY29ubmVjdE9ubHksIGJvb2wgZGF0YVRhc2tJc0Zvck1h aW5GcmFtZU5hdmlnYXRpb24sIGJvb2wgZGF0YVRhc2tJc0Zvck1haW5SZXNvdXJjZU5hdmlnYXRp b25Gb3JBbnlGcmFtZSwgT3B0aW9uYWw8TmV0d29ya0FjdGl2aXR5VHJhY2tlcj4gbmV0d29ya0Fj dGl2aXR5VHJhY2tlcikKICAgICA6IE5ldHdvcmtEYXRhVGFzayhzZXNzaW9uLCBjbGllbnQsIHJl cXVlc3RXaXRoQ3JlZGVudGlhbHMsIHN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBzaG91bGRDbGVh clJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCBkYXRhVGFza0lzRm9yTWFpbkZyYW1lTmF2 aWdhdGlvbikKLSAgICAsIG1fc2Vzc2lvbldyYXBwZXIoc3RhdGljX2Nhc3Q8TmV0d29ya1Nlc3Np b25Db2NvYSY+KHNlc3Npb24pLnNlc3Npb25XcmFwcGVyRm9yVGFzayhyZXF1ZXN0V2l0aENyZWRl bnRpYWxzLCBzdG9yZWRDcmVkZW50aWFsc1BvbGljeSkpCisgICAgLCBtX3Nlc3Npb25XcmFwcGVy KG1ha2VXZWFrUHRyKHN0YXRpY19jYXN0PE5ldHdvcmtTZXNzaW9uQ29jb2EmPihzZXNzaW9uKS5z ZXNzaW9uV3JhcHBlckZvclRhc2socmVxdWVzdFdpdGhDcmVkZW50aWFscywgc3RvcmVkQ3JlZGVu dGlhbHNQb2xpY3kpKSkKICAgICAsIG1fZnJhbWVJRChmcmFtZUlEKQogICAgICwgbV9wYWdlSUQo cGFnZUlEKQogICAgICwgbV9pc0Zvck1haW5SZXNvdXJjZU5hdmlnYXRpb25Gb3JBbnlGcmFtZShk YXRhVGFza0lzRm9yTWFpblJlc291cmNlTmF2aWdhdGlvbkZvckFueUZyYW1lKQpAQCAtMjc3LDEy ICsyNzcsMTIgQEAgTmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0NvY29hKE5l dHdvcmtTZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0YVQKICAgICBOU1VSTFJlcXVlc3QgKm5z UmVxdWVzdCA9IHJlcXVlc3QubnNVUkxSZXF1ZXN0KFdlYkNvcmU6OkhUVFBCb2R5VXBkYXRlUG9s aWN5OjpVcGRhdGVIVFRQQm9keSk7CiAgICAgYXBwbHlTbmlmZmluZ1BvbGljaWVzQW5kQmluZFJl cXVlc3RUb0luZmVyZmFjZUlmTmVlZGVkKG5zUmVxdWVzdCwgc2hvdWxkQ29udGVudFNuaWZmID09 IFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGljeTo6U25pZmZDb250ZW50ICYmICF1cmwuaXNM b2NhbEZpbGUoKSwgc2hvdWxkQ29udGVudEVuY29kaW5nU25pZmYgPT0gV2ViQ29yZTo6Q29udGVu dEVuY29kaW5nU25pZmZpbmdQb2xpY3k6OlNuaWZmKTsKIAotICAgIG1fdGFzayA9IFttX3Nlc3Np b25XcmFwcGVyLnNlc3Npb24gZGF0YVRhc2tXaXRoUmVxdWVzdDpuc1JlcXVlc3RdOworICAgIG1f dGFzayA9IFttX3Nlc3Npb25XcmFwcGVyLT5zZXNzaW9uIGRhdGFUYXNrV2l0aFJlcXVlc3Q6bnNS ZXF1ZXN0XTsKIAogICAgIEJFR0lOX1NJR05QT1NUKG1fdGFzaywgIiV7cHVibGljfXMgcHJpOiAl ZiBwcmVjb25uZWN0OiAlZCIsIHVybC5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSwgdG9OU1VSTFNl c3Npb25UYXNrUHJpb3JpdHkocmVxdWVzdC5wcmlvcml0eSgpKSwgc2hvdWxkUHJlY29ubmVjdE9u bHkgPT0gUHJlY29ubmVjdE9ubHk6Olllcyk7CiAKLSAgICBSRUxFQVNFX0FTU0VSVCghbV9zZXNz aW9uV3JhcHBlci5kYXRhVGFza01hcC5jb250YWlucyhbbV90YXNrIHRhc2tJZGVudGlmaWVyXSkp OwotICAgIG1fc2Vzc2lvbldyYXBwZXIuZGF0YVRhc2tNYXAuYWRkKFttX3Rhc2sgdGFza0lkZW50 aWZpZXJdLCB0aGlzKTsKKyAgICBSRUxFQVNFX0FTU0VSVCghbV9zZXNzaW9uV3JhcHBlci0+ZGF0 YVRhc2tNYXAuY29udGFpbnMoW21fdGFzayB0YXNrSWRlbnRpZmllcl0pKTsKKyAgICBtX3Nlc3Np b25XcmFwcGVyLT5kYXRhVGFza01hcC5hZGQoW21fdGFzayB0YXNrSWRlbnRpZmllcl0sIHRoaXMp OwogICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwgIiVsbHUgQ3JlYXRpbmcgTmV0d29ya0RhdGFUYXNr IHdpdGggVVJMICVzIiwgW21fdGFzayB0YXNrSWRlbnRpZmllcl0sIG5zUmVxdWVzdC5VUkwuYWJz b2x1dGVTdHJpbmcuVVRGOFN0cmluZyk7CiAKICAgICBpZiAoc2hvdWxkUHJlY29ubmVjdE9ubHkg PT0gUHJlY29ubmVjdE9ubHk6OlllcykgewpAQCAtMzE4LDExICszMTgsMTEgQEAgTmV0d29ya0Rh dGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0NvY29hKE5ldHdvcmtTZXNzaW9uJiBzZXNzaW9u LCBOZXR3b3JrRGF0YVQKIAogTmV0d29ya0RhdGFUYXNrQ29jb2E6On5OZXR3b3JrRGF0YVRhc2tD b2NvYSgpCiB7Ci0gICAgaWYgKCFtX3Rhc2sgfHwgIW1fc2Vzc2lvbikKKyAgICBpZiAoIW1fdGFz ayB8fCAhbV9zZXNzaW9uV3JhcHBlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgUkVMRUFTRV9B U1NFUlQobV9zZXNzaW9uV3JhcHBlci5kYXRhVGFza01hcC5nZXQoW21fdGFzayB0YXNrSWRlbnRp Zmllcl0pID09IHRoaXMpOwotICAgIG1fc2Vzc2lvbldyYXBwZXIuZGF0YVRhc2tNYXAucmVtb3Zl KFttX3Rhc2sgdGFza0lkZW50aWZpZXJdKTsKKyAgICBSRUxFQVNFX0FTU0VSVChtX3Nlc3Npb25X cmFwcGVyLT5kYXRhVGFza01hcC5nZXQoW21fdGFzayB0YXNrSWRlbnRpZmllcl0pID09IHRoaXMp OworICAgIG1fc2Vzc2lvbldyYXBwZXItPmRhdGFUYXNrTWFwLnJlbW92ZShbbV90YXNrIHRhc2tJ ZGVudGlmaWVyXSk7CiB9CiAKIHZvaWQgTmV0d29ya0RhdGFUYXNrQ29jb2E6OnJlc3RyaWN0UmVx dWVzdFJlZmVycmVyVG9PcmlnaW5JZk5lZWRlZChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QpCg==