226628 2021-06-03 23:22:23 -0700 Pass NetworkLoadParameters to NetworkDataTaskCocoa constructor 2021-06-04 10:06:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen sam oldest_to_newest 1766686 0 achristensen 2021-06-03 23:22:23 -0700 Pass NetworkLoadParameters to NetworkDataTaskCocoa constructor 1766687 1 430551 achristensen 2021-06-03 23:23:56 -0700 Created attachment 430551 Patch 1766818 2 achristensen 2021-06-04 10:06:17 -0700 r278468 430551 2021-06-03 23:23:56 -0700 2021-06-04 08:53:50 -0700 Patch bug-226628-20210603232355.patch text/plain 15066 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlkNmZlMDBiZTdjOWFkZWE4 OWIwZDg0NDYwZGFmZWRlNmEyZGMyNzcuLjZmMmM2MzhhYTVmMmI4ZjQ1MmNjNzFiMzZjOTI1YTk4 NTk0ZGZkNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDYtMDMgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBQYXNzIE5ldHdv cmtMb2FkUGFyYW1ldGVycyB0byBOZXR3b3JrRGF0YVRhc2tDb2NvYSBjb25zdHJ1Y3RvcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NjI4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGlu IGJlaGF2aW9yLiAgSnVzdCBwYXNzIGEgcGFyYW1ldGVycyBvYmplY3QgaW5zdGVhZCBvZiBzcGxp dHRpbmcgdGhlbSBpbnRvIHNlcGFyYXRlIHBhcmFtZXRlcnMuCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrQWN0aXZpdHlUcmFja2VyLmg6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtBY3Rpdml0eVRyYWNrZXI6OmdldFBsYXRmb3JtT2JqZWN0IGNvbnN0KToKKyAgICAgICAgKFdl YktpdDo6TmV0d29ya0FjdGl2aXR5VHJhY2tlcjo6Z2V0UGxhdGZvcm1PYmplY3QpOiBEZWxldGVk LgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtEYXRhVGFzay5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFzazo6Y3JlYXRlKToKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrRGF0YVRhc2tDb2NvYTo6TmV0d29ya0RhdGFUYXNrQ29jb2EpOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrRGF0YVRhc2tDb2NvYTo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKwogMjAyMS0wNi0w MiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IEZpeCBXUFQgdGVzdCByZXNvdXJjZS10aW1pbmcvY3Jvc3Mtb3JpZ2luLXJlZGlyZWN0cy5odG1s CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtBY3Rpdml0 eVRyYWNrZXIuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0FjdGl2aXR5 VHJhY2tlci5oCmluZGV4IGYwNGIxMDI1NzE0ODc3MjE4N2NiMTQ4NGFhMDNiOTQ1ZGRkYzA5NWQu LmM1NWM5MjM0MjlkN2VlNmE0MmIwMDVhZTYyOWE0MTdiZGNiM2Y1MzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0FjdGl2aXR5VHJhY2tlci5oCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0FjdGl2aXR5VHJhY2tlci5oCkBA IC03Nyw3ICs3Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNvbXBsZXRlKENvbXBsZXRpb25Db2Rl KTsKIAogI2lmIEhBVkUoTldfQUNUSVZJVFkpCi0gICAgbndfYWN0aXZpdHlfdCBnZXRQbGF0Zm9y bU9iamVjdCgpIHsgcmV0dXJuIG1fbmV0d29ya0FjdGl2aXR5LmdldCgpOyB9CisgICAgbndfYWN0 aXZpdHlfdCBnZXRQbGF0Zm9ybU9iamVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbmV0d29ya0FjdGl2 aXR5LmdldCgpOyB9CiAjZW5kaWYKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0RhdGFUYXNrLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya0RhdGFUYXNrLmNwcAppbmRleCAzOGE2MjUxNDkzOTk2ZWMzMTU3 NzlmMTRlZjEwYzdkMzA4NGY1ZDIyLi4zZTk2NDZhMWE1ODhhMTliNTEwYzUwZjZjMTA4NzJiZjhk NzE3ZjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtE YXRhVGFzay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrRGF0 YVRhc2suY3BwCkBAIC01Myw4ICs1Myw3IEBAIFJlZjxOZXR3b3JrRGF0YVRhc2s+IE5ldHdvcmtE YXRhVGFzazo6Y3JlYXRlKE5ldHdvcmtTZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0CiB7CiAg ICAgQVNTRVJUKCFwYXJhbWV0ZXJzLnJlcXVlc3QudXJsKCkucHJvdG9jb2xJc0Jsb2IoKSk7CiAj aWYgUExBVEZPUk0oQ09DT0EpCi0gICAgLy8gRklYTUU6IEp1c3QgcGFzcyBwYXJhbWV0ZXJzIHRv IHRoZSBOZXR3b3JrRGF0YVRhc2tDb2NvYSBjb25zdHJ1Y3Rvci4KLSAgICByZXR1cm4gTmV0d29y a0RhdGFUYXNrQ29jb2E6OmNyZWF0ZShzZXNzaW9uLCBjbGllbnQsIHBhcmFtZXRlcnMucmVxdWVz dCwgcGFyYW1ldGVycy53ZWJGcmFtZUlELCBwYXJhbWV0ZXJzLndlYlBhZ2VJRCwgcGFyYW1ldGVy cy53ZWJQYWdlUHJveHlJRCwgIHBhcmFtZXRlcnMuc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3ksIHBh cmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5LCBwYXJhbWV0ZXJzLmNvbnRlbnRFbmNvZGlu Z1NuaWZmaW5nUG9saWN5LCBwYXJhbWV0ZXJzLnNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9I VFRQUmVkaXJlY3QsIHBhcmFtZXRlcnMuc2hvdWxkUHJlY29ubmVjdE9ubHksIHBhcmFtZXRlcnMu aXNNYWluRnJhbWVOYXZpZ2F0aW9uLCBwYXJhbWV0ZXJzLmlzTWFpblJlc291cmNlTmF2aWdhdGlv bkZvckFueUZyYW1lLCBwYXJhbWV0ZXJzLm5ldHdvcmtBY3Rpdml0eVRyYWNrZXIsIHBhcmFtZXRl cnMuaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbiwgcGFyYW1ldGVycy5zaG91bGRSZWxheFRo aXJkUGFydHlDb29raWVCbG9ja2luZywgcGFyYW1ldGVycy5wY21EYXRhQ2FycmllZCk7CisgICAg cmV0dXJuIE5ldHdvcmtEYXRhVGFza0NvY29hOjpjcmVhdGUoc2Vzc2lvbiwgY2xpZW50LCBwYXJh bWV0ZXJzKTsKICNlbmRpZgogI2lmIFVTRShTT1VQKQogICAgIHJldHVybiBOZXR3b3JrRGF0YVRh c2tTb3VwOjpjcmVhdGUoc2Vzc2lvbiwgY2xpZW50LCBwYXJhbWV0ZXJzLnJlcXVlc3QsIHBhcmFt ZXRlcnMud2ViRnJhbWVJRCwgcGFyYW1ldGVycy53ZWJQYWdlSUQsIHBhcmFtZXRlcnMuc3RvcmVk Q3JlZGVudGlhbHNQb2xpY3ksIHBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5LCBwYXJh bWV0ZXJzLmNvbnRlbnRFbmNvZGluZ1NuaWZmaW5nUG9saWN5LCBwYXJhbWV0ZXJzLnNob3VsZENs ZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QsIHBhcmFtZXRlcnMuc2hvdWxkUHJlY29u bmVjdE9ubHksIHBhcmFtZXRlcnMuaXNNYWluRnJhbWVOYXZpZ2F0aW9uKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2Eu aCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29j b2EuaAppbmRleCA4NjkyODRjMzZlMTE1YTVlNTU0ZjQ1MmRmYmE1OGRlZTcyNTAxMzY0Li5mYWQy NDhlOTM5NDY4NzNjMjY5YmQ5OGFkNDM0Y2E3NDIxODAwNGEzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLmgKKysrIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5o CkBAIC00Niw5ICs0Niw5IEBAIHN0cnVjdCBTZXNzaW9uV3JhcHBlcjsKIAogY2xhc3MgTmV0d29y a0RhdGFUYXNrQ29jb2EgZmluYWwgOiBwdWJsaWMgTmV0d29ya0RhdGFUYXNrIHsKIHB1YmxpYzoK LSAgICBzdGF0aWMgUmVmPE5ldHdvcmtEYXRhVGFzaz4gY3JlYXRlKE5ldHdvcmtTZXNzaW9uJiBz ZXNzaW9uLCBOZXR3b3JrRGF0YVRhc2tDbGllbnQmIGNsaWVudCwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwg V2ViQ29yZTo6UGFnZUlkZW50aWZpZXIgcGFnZUlELCBXZWJQYWdlUHJveHlJZGVudGlmaWVyIHdl YlBhZ2VQcm94eUlELCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSBzdG9yZWRDcmVk ZW50aWFsc1BvbGljeSwgV2ViQ29yZTo6Q29udGVudFNuaWZmaW5nUG9saWN5IHNob3VsZENvbnRl bnRTbmlmZiwgV2ViQ29yZTo6Q29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3kgc2hvdWxkQ29u dGVudEVuY29kaW5nU25pZmYsIGJvb2wgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBS ZWRpcmVjdCwgUHJlY29ubmVjdE9ubHkgc2hvdWxkUHJlY29ubmVjdE9ubHksIGJvb2wgZGF0YVRh c2tJc0Zvck1haW5GcmFtZU5hdmlnYXRpb24sIGJvb2wgZGF0YVRhc2tJc0Zvck1haW5SZXNvdXJj ZU5hdmlnYXRpb25Gb3JBbnlGcmFtZSwgc3RkOjpvcHRpb25hbDxOZXR3b3JrQWN0aXZpdHlUcmFj a2VyPiBuZXR3b3JrQWN0aXZpdHlUcmFja2VyLCBzdGQ6Om9wdGlvbmFsPE5hdmlnYXRpbmdUb0Fw cEJvdW5kRG9tYWluPiBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluLCBXZWJDb3JlOjpTaG91 bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZyBzaG91bGRSZWxheFRoaXJkUGFydHlDb29r aWVCbG9ja2luZywgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVu dDo6UGNtRGF0YUNhcnJpZWQ+IHBjbURhdGFDYXJyaWVkKQorICAgIHN0YXRpYyBSZWY8TmV0d29y a0RhdGFUYXNrPiBjcmVhdGUoTmV0d29ya1Nlc3Npb24mIHNlc3Npb24sIE5ldHdvcmtEYXRhVGFz a0NsaWVudCYgY2xpZW50LCBjb25zdCBOZXR3b3JrTG9hZFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMp CiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBOZXR3b3JrRGF0YVRhc2tDb2Nv YShzZXNzaW9uLCBjbGllbnQsIHJlcXVlc3QsIGZyYW1lSUQsIHBhZ2VJRCwgd2ViUGFnZVByb3h5 SUQsIHN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBzaG91bGRDb250ZW50U25pZmYsIHNob3VsZENv bnRlbnRFbmNvZGluZ1NuaWZmLCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGly ZWN0LCBzaG91bGRQcmVjb25uZWN0T25seSwgZGF0YVRhc2tJc0Zvck1haW5GcmFtZU5hdmlnYXRp b24sIGRhdGFUYXNrSXNGb3JNYWluUmVzb3VyY2VOYXZpZ2F0aW9uRm9yQW55RnJhbWUsIG5ldHdv cmtBY3Rpdml0eVRyYWNrZXIsIGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4sIHNob3VsZFJl bGF4VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nLCBwY21EYXRhQ2FycmllZCkpOworICAgICAgICBy ZXR1cm4gYWRvcHRSZWYoKm5ldyBOZXR3b3JrRGF0YVRhc2tDb2NvYShzZXNzaW9uLCBjbGllbnQs IHBhcmFtZXRlcnMpKTsKICAgICB9CiAKICAgICB+TmV0d29ya0RhdGFUYXNrQ29jb2EoKTsKQEAg LTg1LDcgKzg1LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0UHJpb3JpdHkoV2ViQ29yZTo6UmVz b3VyY2VMb2FkUHJpb3JpdHkpIG92ZXJyaWRlOwogCiBwcml2YXRlOgotICAgIE5ldHdvcmtEYXRh VGFza0NvY29hKE5ldHdvcmtTZXNzaW9uJiwgTmV0d29ya0RhdGFUYXNrQ2xpZW50JiwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgV2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyLCBXZWJD b3JlOjpQYWdlSWRlbnRpZmllciwgV2ViUGFnZVByb3h5SWRlbnRpZmllciwgV2ViQ29yZTo6U3Rv cmVkQ3JlZGVudGlhbHNQb2xpY3ksIFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGljeSwgV2Vi Q29yZTo6Q29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3ksIGJvb2wgc2hvdWxkQ2xlYXJSZWZl cnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgUHJlY29ubmVjdE9ubHksIGJvb2wgZGF0YVRhc2tJ c0Zvck1haW5GcmFtZU5hdmlnYXRpb24sIGJvb2wgZGF0YVRhc2tJc0Zvck1haW5SZXNvdXJjZU5h dmlnYXRpb25Gb3JBbnlGcmFtZSwgc3RkOjpvcHRpb25hbDxOZXR3b3JrQWN0aXZpdHlUcmFja2Vy Piwgc3RkOjpvcHRpb25hbDxOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbj4gaXNOYXZpZ2F0aW5n VG9BcHBCb3VuZERvbWFpbiwgV2ViQ29yZTo6U2hvdWxkUmVsYXhUaGlyZFBhcnR5Q29va2llQmxv Y2tpbmcsIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OlBj bURhdGFDYXJyaWVkPik7CisgICAgTmV0d29ya0RhdGFUYXNrQ29jb2EoTmV0d29ya1Nlc3Npb24m LCBOZXR3b3JrRGF0YVRhc2tDbGllbnQmLCBjb25zdCBOZXR3b3JrTG9hZFBhcmFtZXRlcnMmKTsK IAogICAgIGJvb2wgdHJ5UGFzc3dvcmRCYXNlZEF1dGhlbnRpY2F0aW9uKGNvbnN0IFdlYkNvcmU6 OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiwgQ2hhbGxlbmdlQ29tcGxldGlvbkhhbmRsZXImKTsK ICAgICB2b2lkIGFwcGx5U25pZmZpbmdQb2xpY2llc0FuZEJpbmRSZXF1ZXN0VG9JbmZlcmZhY2VJ Zk5lZWRlZChSZXRhaW5QdHI8TlNVUkxSZXF1ZXN0PiYsIGJvb2wgc2hvdWxkQ29udGVudFNuaWZm LCBib29sIHNob3VsZENvbnRlbnRFbmNvZGluZ1NuaWZmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0gYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCmlu ZGV4IDFiZjQxZTU1NWYwNjcwMWRjZTc3MmE0MTdkYzg2ZjFlM2Q4NTQ2M2YuLmNmZGZlMTM2OWNl NmE4ZTVmYmUzZjZmYTQxMTU3NzMwMjk0ZjczMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0KKysrIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQpAQCAt NTYsNyArNTYsNyBAQAogI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAjaW1wb3J0IDxXZWJL aXRBZGRpdGlvbnMvTmV0d29ya0RhdGFUYXNrQ29jb2FBZGRpdGlvbnMuaD4KICNlbHNlCi0jZGVm aW5lIE5FVFdPUktfREFUQV9UQVNLX0NPQ09BX0FERElUSU9OUworI2RlZmluZSBORVRXT1JLX0RB VEFfVEFTS19DT0NPQV9BRERJVElPTlMgVU5VU0VEX1ZBUklBQkxFKHBjbURhdGFDYXJyaWVkKTsK IHN0YXRpYyBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiBjb250ZXh0U3RyaW5nKE5TVVJMUmVx dWVzdCAqKSB7IHJldHVybiB7IH07IH0KICNlbmRpZgogCkBAIC0yOTEsMTkgKzI5MSwxOSBAQCBz dGF0aWMgaW5saW5lIGJvb2wgY29tcHV0ZUlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZChOZXR3b3Jr U2Vzc2lvbiYgc2Vzc2lvbikKICAgICByZXR1cm4gc2Vzc2lvbi5zZXNzaW9uSUQoKS5pc0Fsd2F5 c09uTG9nZ2luZ0FsbG93ZWQoKTsKIH0KIAotTmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtE YXRhVGFza0NvY29hKE5ldHdvcmtTZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0YVRhc2tDbGll bnQmIGNsaWVudCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0V2l0aENy ZWRlbnRpYWxzLCBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgV2ViQ29yZTo6UGFn ZUlkZW50aWZpZXIgcGFnZUlELCBXZWJQYWdlUHJveHlJZGVudGlmaWVyIHdlYlBhZ2VQcm94eUlE LCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSBzdG9yZWRDcmVkZW50aWFsc1BvbGlj eSwgV2ViQ29yZTo6Q29udGVudFNuaWZmaW5nUG9saWN5IHNob3VsZENvbnRlbnRTbmlmZiwgV2Vi Q29yZTo6Q29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3kgc2hvdWxkQ29udGVudEVuY29kaW5n U25pZmYsIGJvb2wgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgUHJl Y29ubmVjdE9ubHkgc2hvdWxkUHJlY29ubmVjdE9ubHksIGJvb2wgZGF0YVRhc2tJc0Zvck1haW5G cmFtZU5hdmlnYXRpb24sIGJvb2wgZGF0YVRhc2tJc0Zvck1haW5SZXNvdXJjZU5hdmlnYXRpb25G b3JBbnlGcmFtZSwgc3RkOjpvcHRpb25hbDxOZXR3b3JrQWN0aXZpdHlUcmFja2VyPiBuZXR3b3Jr QWN0aXZpdHlUcmFja2VyLCBzdGQ6Om9wdGlvbmFsPE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWlu PiBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluLCBXZWJDb3JlOjpTaG91bGRSZWxheFRoaXJk UGFydHlDb29raWVCbG9ja2luZyBzaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZywg c3RkOjpvcHRpb25hbDxXZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6UGNtRGF0YUNh cnJpZWQ+IHBjbURhdGFDYXJyaWVkKQotICAgIDogTmV0d29ya0RhdGFUYXNrKHNlc3Npb24sIGNs aWVudCwgcmVxdWVzdFdpdGhDcmVkZW50aWFscywgc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3ksIHNo b3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QsIGRhdGFUYXNrSXNGb3JNYWlu RnJhbWVOYXZpZ2F0aW9uKQotICAgICwgbV9zZXNzaW9uV3JhcHBlcihtYWtlV2Vha1B0cihzdGF0 aWNfY2FzdDxOZXR3b3JrU2Vzc2lvbkNvY29hJj4oc2Vzc2lvbikuc2Vzc2lvbldyYXBwZXJGb3JU YXNrKHdlYlBhZ2VQcm94eUlELCByZXF1ZXN0V2l0aENyZWRlbnRpYWxzLCBzdG9yZWRDcmVkZW50 aWFsc1BvbGljeSwgaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbikpKQotICAgICwgbV9mcmFt ZUlEKGZyYW1lSUQpCi0gICAgLCBtX3BhZ2VJRChwYWdlSUQpCi0gICAgLCBtX3dlYlBhZ2VQcm94 eUlEKHdlYlBhZ2VQcm94eUlEKQotICAgICwgbV9pc0Zvck1haW5SZXNvdXJjZU5hdmlnYXRpb25G b3JBbnlGcmFtZShkYXRhVGFza0lzRm9yTWFpblJlc291cmNlTmF2aWdhdGlvbkZvckFueUZyYW1l KQorTmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0NvY29hKE5ldHdvcmtTZXNz aW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0YVRhc2tDbGllbnQmIGNsaWVudCwgY29uc3QgTmV0d29y a0xvYWRQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQorICAgIDogTmV0d29ya0RhdGFUYXNrKHNlc3Np b24sIGNsaWVudCwgcGFyYW1ldGVycy5yZXF1ZXN0LCBwYXJhbWV0ZXJzLnN0b3JlZENyZWRlbnRp YWxzUG9saWN5LCBwYXJhbWV0ZXJzLnNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVk aXJlY3QsIHBhcmFtZXRlcnMuaXNNYWluRnJhbWVOYXZpZ2F0aW9uKQorICAgICwgbV9zZXNzaW9u V3JhcHBlcihtYWtlV2Vha1B0cihzdGF0aWNfY2FzdDxOZXR3b3JrU2Vzc2lvbkNvY29hJj4oc2Vz c2lvbikuc2Vzc2lvbldyYXBwZXJGb3JUYXNrKHBhcmFtZXRlcnMud2ViUGFnZVByb3h5SUQsIHBh cmFtZXRlcnMucmVxdWVzdCwgcGFyYW1ldGVycy5zdG9yZWRDcmVkZW50aWFsc1BvbGljeSwgcGFy YW1ldGVycy5pc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKSkpCisgICAgLCBtX2ZyYW1lSUQo cGFyYW1ldGVycy53ZWJGcmFtZUlEKQorICAgICwgbV9wYWdlSUQocGFyYW1ldGVycy53ZWJQYWdl SUQpCisgICAgLCBtX3dlYlBhZ2VQcm94eUlEKHBhcmFtZXRlcnMud2ViUGFnZVByb3h5SUQpCisg ICAgLCBtX2lzRm9yTWFpblJlc291cmNlTmF2aWdhdGlvbkZvckFueUZyYW1lKHBhcmFtZXRlcnMu aXNNYWluUmVzb3VyY2VOYXZpZ2F0aW9uRm9yQW55RnJhbWUpCiAgICAgLCBtX2lzQWx3YXlzT25M b2dnaW5nQWxsb3dlZChjb21wdXRlSXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKHNlc3Npb24pKQot ICAgICwgbV9zaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZyhzaG91bGRSZWxheFRo aXJkUGFydHlDb29raWVCbG9ja2luZykKKyAgICAsIG1fc2hvdWxkUmVsYXhUaGlyZFBhcnR5Q29v a2llQmxvY2tpbmcocGFyYW1ldGVycy5zaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2lu ZykKIHsKLSAgICBhdXRvIHJlcXVlc3QgPSByZXF1ZXN0V2l0aENyZWRlbnRpYWxzOworICAgIGF1 dG8gcmVxdWVzdCA9IHBhcmFtZXRlcnMucmVxdWVzdDsKICAgICBhdXRvIHVybCA9IHJlcXVlc3Qu dXJsKCk7Ci0gICAgaWYgKHN0b3JlZENyZWRlbnRpYWxzUG9saWN5ID09IFdlYkNvcmU6OlN0b3Jl ZENyZWRlbnRpYWxzUG9saWN5OjpVc2UgJiYgdXJsLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkg eworICAgIGlmIChtX3N0b3JlZENyZWRlbnRpYWxzUG9saWN5ID09IFdlYkNvcmU6OlN0b3JlZENy ZWRlbnRpYWxzUG9saWN5OjpVc2UgJiYgdXJsLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkgewog ICAgICAgICBtX3VzZXIgPSB1cmwudXNlcigpOwogICAgICAgICBtX3Bhc3N3b3JkID0gdXJsLnBh c3N3b3JkKCk7CiAgICAgICAgIHJlcXVlc3QucmVtb3ZlQ3JlZGVudGlhbHMoKTsKQEAgLTMyOCwz MyArMzI4LDM0IEBAIE5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3b3JrRGF0YVRhc2tDb2NvYShO ZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFUCiAKICAgICBib29sIHNob3VsZEJs b2NrQ29va2llcyA9IGZhbHNlOwogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1Mp Ci0gICAgc2hvdWxkQmxvY2tDb29raWVzID0gc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kgPT0gV2Vi Q29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkVwaGVtZXJhbFN0YXRlbGVzczsKKyAgICBz aG91bGRCbG9ja0Nvb2tpZXMgPSBtX3N0b3JlZENyZWRlbnRpYWxzUG9saWN5ID09IFdlYkNvcmU6 OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0ZWxlc3M7CiAgICAgaWYgKGF1 dG8qIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbiA9IHNlc3Npb24ubmV0d29ya1N0b3JhZ2VTZXNzaW9u KCkpIHsKICAgICAgICAgaWYgKCFzaG91bGRCbG9ja0Nvb2tpZXMpCi0gICAgICAgICAgICBzaG91 bGRCbG9ja0Nvb2tpZXMgPSBuZXR3b3JrU3RvcmFnZVNlc3Npb24tPnNob3VsZEJsb2NrQ29va2ll cyhyZXF1ZXN0LCBmcmFtZUlELCBwYWdlSUQsIG1fc2hvdWxkUmVsYXhUaGlyZFBhcnR5Q29va2ll QmxvY2tpbmcpOworICAgICAgICAgICAgc2hvdWxkQmxvY2tDb29raWVzID0gbmV0d29ya1N0b3Jh Z2VTZXNzaW9uLT5zaG91bGRCbG9ja0Nvb2tpZXMocmVxdWVzdCwgZnJhbWVJRCgpLCBwYWdlSUQo KSwgbV9zaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZyk7CiAgICAgfQogI2VuZGlm CiAgICAgcmVzdHJpY3RSZXF1ZXN0UmVmZXJyZXJUb09yaWdpbklmTmVlZGVkKHJlcXVlc3QpOwog Ci0gICAgLy8gRklYTUU6IE9uY2Ugd2UgYXJlIGRvbmUgd2l0aCBORVRXT1JLX0RBVEFfVEFTS19D T0NPQV9BRERJVElPTlMsIG1ha2UgbnNSZXF1ZXN0IGEgUmV0YWluUHRyIGFuZCBnZXQgcmlkIG9m IHByb3RlY3RlZE5TUmVxdWVzdC4KKyAgICAvLyBGSVhNRTogT25jZSB3ZSBhcmUgZG9uZSB3aXRo IE5FVFdPUktfREFUQV9UQVNLX0NPQ09BX0FERElUSU9OUywgbWFrZSBuc1JlcXVlc3QgYSBSZXRh aW5QdHIgYW5kIGdldCByaWQgb2YgcHJvdGVjdGVkTlNSZXF1ZXN0IGFuZCBwY21EYXRhQ2Fycmll ZC4KICAgICBOU1VSTFJlcXVlc3QgKm5zUmVxdWVzdCA9IHJlcXVlc3QubnNVUkxSZXF1ZXN0KFdl YkNvcmU6OkhUVFBCb2R5VXBkYXRlUG9saWN5OjpVcGRhdGVIVFRQQm9keSk7CisgICAgYXV0byBw Y21EYXRhQ2FycmllZCA9IHBhcmFtZXRlcnMucGNtRGF0YUNhcnJpZWQ7CiAKICAgICBORVRXT1JL X0RBVEFfVEFTS19DT0NPQV9BRERJVElPTlMKIAogICAgIGF1dG8gcHJvdGVjdGVkTlNSZXF1ZXN0 ID0gcmV0YWluUHRyKG5zUmVxdWVzdCk7CiAgICAgbV9zZXNzaW9uLT5hcHBCb3VuZE5hdmlnYXRp b25UZXN0aW5nRGF0YSgpLnVwZGF0ZUFwcEJvdW5kTmF2aWdhdGlvblRlc3RpbmdEYXRhKHJlcXVl c3QsIGNvbnRleHRTdHJpbmcocHJvdGVjdGVkTlNSZXF1ZXN0LmdldCgpKSk7CiAKLSAgICBhcHBs eVNuaWZmaW5nUG9saWNpZXNBbmRCaW5kUmVxdWVzdFRvSW5mZXJmYWNlSWZOZWVkZWQocHJvdGVj dGVkTlNSZXF1ZXN0LCBzaG91bGRDb250ZW50U25pZmYgPT0gV2ViQ29yZTo6Q29udGVudFNuaWZm aW5nUG9saWN5OjpTbmlmZkNvbnRlbnQgJiYgIXVybC5pc0xvY2FsRmlsZSgpLCBzaG91bGRDb250 ZW50RW5jb2RpbmdTbmlmZiA9PSBXZWJDb3JlOjpDb250ZW50RW5jb2RpbmdTbmlmZmluZ1BvbGlj eTo6U25pZmYpOworICAgIGFwcGx5U25pZmZpbmdQb2xpY2llc0FuZEJpbmRSZXF1ZXN0VG9JbmZl cmZhY2VJZk5lZWRlZChwcm90ZWN0ZWROU1JlcXVlc3QsIHBhcmFtZXRlcnMuY29udGVudFNuaWZm aW5nUG9saWN5ID09IFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGljeTo6U25pZmZDb250ZW50 ICYmICF1cmwuaXNMb2NhbEZpbGUoKSwgcGFyYW1ldGVycy5jb250ZW50RW5jb2RpbmdTbmlmZmlu Z1BvbGljeSA9PSBXZWJDb3JlOjpDb250ZW50RW5jb2RpbmdTbmlmZmluZ1BvbGljeTo6U25pZmYp OwogCiAgICAgbV90YXNrID0gW21fc2Vzc2lvbldyYXBwZXItPnNlc3Npb24gZGF0YVRhc2tXaXRo UmVxdWVzdDpwcm90ZWN0ZWROU1JlcXVlc3QuZ2V0KCldOwogCi0gICAgV1RGQmVnaW5TaWducG9z dChtX3Rhc2suZ2V0KCksICJEYXRhVGFzayIsICIle3B1YmxpY31zIHByaTogJS4yZiBwcmVjb25u ZWN0OiAlZCIsIHVybC5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSwgdG9OU1VSTFNlc3Npb25UYXNr UHJpb3JpdHkocmVxdWVzdC5wcmlvcml0eSgpKSwgc2hvdWxkUHJlY29ubmVjdE9ubHkgPT0gUHJl Y29ubmVjdE9ubHk6Olllcyk7CisgICAgV1RGQmVnaW5TaWducG9zdChtX3Rhc2suZ2V0KCksICJE YXRhVGFzayIsICIle3B1YmxpY31zIHByaTogJS4yZiBwcmVjb25uZWN0OiAlZCIsIHVybC5zdHJp bmcoKS5hc2NpaSgpLmRhdGEoKSwgdG9OU1VSTFNlc3Npb25UYXNrUHJpb3JpdHkocmVxdWVzdC5w cmlvcml0eSgpKSwgcGFyYW1ldGVycy5zaG91bGRQcmVjb25uZWN0T25seSA9PSBQcmVjb25uZWN0 T25seTo6WWVzKTsKIAogICAgIFJFTEVBU0VfQVNTRVJUKCFtX3Nlc3Npb25XcmFwcGVyLT5kYXRh VGFza01hcC5jb250YWlucyhbbV90YXNrIHRhc2tJZGVudGlmaWVyXSkpOwogICAgIG1fc2Vzc2lv bldyYXBwZXItPmRhdGFUYXNrTWFwLmFkZChbbV90YXNrIHRhc2tJZGVudGlmaWVyXSwgdGhpcyk7 CiAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiJWx1IENyZWF0aW5nIE5ldHdvcmtEYXRhVGFzayB3 aXRoIFVSTCAlcyIsICh1bnNpZ25lZCBsb25nKVttX3Rhc2sgdGFza0lkZW50aWZpZXJdLCBbcHJv dGVjdGVkTlNSZXF1ZXN0IFVSTF0uYWJzb2x1dGVTdHJpbmcuVVRGOFN0cmluZyk7CiAKLSAgICBp ZiAoc2hvdWxkUHJlY29ubmVjdE9ubHkgPT0gUHJlY29ubmVjdE9ubHk6OlllcykgeworICAgIGlm IChwYXJhbWV0ZXJzLnNob3VsZFByZWNvbm5lY3RPbmx5ID09IFByZWNvbm5lY3RPbmx5OjpZZXMp IHsKICNpZiBFTkFCTEUoU0VSVkVSX1BSRUNPTk5FQ1QpCiAgICAgICAgIG1fdGFzay5nZXQoKS5f cHJlY29ubmVjdCA9IHRydWU7CiAjZWxzZQpAQCAtMzY5LDcgKzM3MCw3IEBAIE5ldHdvcmtEYXRh VGFza0NvY29hOjpOZXR3b3JrRGF0YVRhc2tDb2NvYShOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwg TmV0d29ya0RhdGFUCiAgICAgaWYgKHNob3VsZEJsb2NrQ29va2llcykgewogI2lmICFSRUxFQVNF X0xPR19ESVNBQkxFRAogICAgICAgICBpZiAobV9zZXNzaW9uLT5zaG91bGRMb2dDb29raWVJbmZv cm1hdGlvbigpKQotICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUYoaXNBbHdheXNPbkxvZ2dpbmdB bGxvd2VkKCksIE5ldHdvcmssICIlcCAtIE5ldHdvcmtEYXRhVGFza0NvY29hOjpsb2dDb29raWVJ bmZvcm1hdGlvbjogcGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCB0YXNr SUQ9JWx1OiBCbG9ja2luZyBjb29raWVzIGZvciBVUkwgJXMiLCB0aGlzLCBwYWdlSUQudG9VSW50 NjQoKSwgZnJhbWVJRC50b1VJbnQ2NCgpLCAodW5zaWduZWQgbG9uZylbbV90YXNrIHRhc2tJZGVu dGlmaWVyXSwgW3Byb3RlY3RlZE5TUmVxdWVzdCBVUkxdLmFic29sdXRlU3RyaW5nLlVURjhTdHJp bmcpOworICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUYoaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2Vk KCksIE5ldHdvcmssICIlcCAtIE5ldHdvcmtEYXRhVGFza0NvY29hOjpsb2dDb29raWVJbmZvcm1h dGlvbjogcGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCB0YXNrSUQ9JWx1 OiBCbG9ja2luZyBjb29raWVzIGZvciBVUkwgJXMiLCB0aGlzLCBwYWdlSUQoKS50b1VJbnQ2NCgp LCBmcmFtZUlEKCkudG9VSW50NjQoKSwgKHVuc2lnbmVkIGxvbmcpW21fdGFzayB0YXNrSWRlbnRp Zmllcl0sIFtwcm90ZWN0ZWROU1JlcXVlc3QgVVJMXS5hYnNvbHV0ZVN0cmluZy5VVEY4U3RyaW5n KTsKICNlbHNlCiAgICAgICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwgIiVsdSBCbG9ja2luZyBjb29r aWVzIGZvciBVUkwgJXMiLCAodW5zaWduZWQgbG9uZylbbV90YXNrIHRhc2tJZGVudGlmaWVyXSwg W3Byb3RlY3RlZE5TUmVxdWVzdCBVUkxdLmFic29sdXRlU3RyaW5nLlVURjhTdHJpbmcpOwogI2Vu ZGlmCkBAIC0zODMsOCArMzg0LDggQEAgTmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRh VGFza0NvY29hKE5ldHdvcmtTZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0YVQKICAgICB1cGRh dGVUYXNrV2l0aEZpcnN0UGFydHlGb3JTYW1lU2l0ZUNvb2tpZXMobV90YXNrLmdldCgpLCByZXF1 ZXN0KTsKIAogI2lmIEhBVkUoTldfQUNUSVZJVFkpCi0gICAgaWYgKG5ldHdvcmtBY3Rpdml0eVRy YWNrZXIpCi0gICAgICAgIG1fdGFzay5nZXQoKS5fbndfYWN0aXZpdHkgPSBuZXR3b3JrQWN0aXZp dHlUcmFja2VyLnZhbHVlKCkuZ2V0UGxhdGZvcm1PYmplY3QoKTsKKyAgICBpZiAocGFyYW1ldGVy cy5uZXR3b3JrQWN0aXZpdHlUcmFja2VyKQorICAgICAgICBtX3Rhc2suZ2V0KCkuX253X2FjdGl2 aXR5ID0gcGFyYW1ldGVycy5uZXR3b3JrQWN0aXZpdHlUcmFja2VyLT5nZXRQbGF0Zm9ybU9iamVj dCgpOwogI2VuZGlmCiB9CiAK