209190 2020-03-17 11:57:35 -0700 Add internal debugging when initializing an app-bound session 2020-03-17 14:37:13 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney bfulgham commit-queue webkit-bug-importer wilander oldest_to_newest 1630827 0 katherine_cheney 2020-03-17 11:57:35 -0700 We need internal debugging for app-bound sessions. 1630828 1 katherine_cheney 2020-03-17 11:57:50 -0700 <rdar://problem/60371620> 1630829 2 katherine_cheney 2020-03-17 11:57:54 -0700 <rdar://problem/60371620> 1630853 3 393779 katherine_cheney 2020-03-17 12:55:33 -0700 Created attachment 393779 Patch 1630866 4 393779 bfulgham 2020-03-17 13:45:27 -0700 Comment on attachment 393779 Patch r=me 1630899 5 393779 commit-queue 2020-03-17 14:36:47 -0700 Comment on attachment 393779 Patch Clearing flags on attachment: 393779 Committed r258600: <https://trac.webkit.org/changeset/258600> 1630900 6 commit-queue 2020-03-17 14:36:48 -0700 All reviewed patches have been landed. Closing bug. 1630901 7 webkit-bug-importer 2020-03-17 14:37:13 -0700 <rdar://problem/60555444> 393779 2020-03-17 12:55:33 -0700 2020-03-17 14:36:47 -0700 Patch bug-209190-20200317125532.patch text/plain 13380 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY4ZjcwMjQ1MGQ1ODNmMzdh OTZlYTlhMmEwYjdkNTAxNDRmMTRlNjQuLjBhZDkwZWYwNTI2MDk3ZTU4NmYwYWNhZTlhY2YwNjY4 Y2ZjMTNjNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDMtMTcgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICBBZGQgaW50ZXJuYWwg ZGVidWdnaW5nIHdoZW4gaW5pdGlhbGl6aW5nIGFuIGFwcC1ib3VuZCBzZXNzaW9uCisgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwOTE5MAorICAgICAgIDxy ZGFyOi8vcHJvYmxlbS82MDM3MTYyMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0Nv Y29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2tDb2NvYTo6TmV0d29ya0Rh dGFUYXNrQ29jb2EpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz aW9uQ29jb2EuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lv bkNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpTZXNzaW9uV3JhcHBlcjo6aW5pdGlhbGl6ZSk6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ29jb2E6Ok5ldHdvcmtTZXNzaW9uQ29j b2EpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNvY29hOjppbml0aWFsaXplRXBo ZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9u Q29jb2E6OnNlc3Npb25XcmFwcGVyRm9yVGFzayk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtT ZXNzaW9uQ29jb2E6OmFwcEJvdW5kU2Vzc2lvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtT ZXNzaW9uQ29jb2E6Omlzb2xhdGVkU2Vzc2lvbik6CisKIDIwMjAtMDMtMTYgIHlvdWVubiBmYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVuaXF1ZSBvcmlnaW5zIHNob3VsZCBu b3QgYmUgUG90ZW50aWFsbHkgVHJ1c3R3b3J0aHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0gYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCmluZGV4IDYx YTM5MjJmNzBkN2VjZDcwZjQ2OGJlYzY5YTYyZWU1ZDliYWRiYTguLjk0YzQzMzNiMGY0OGI0YjI5 NGMyYWQyNmI2YWY2OGYxMTgzMWQwNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQpAQCAtNTIsMTIg KzUyLDYgQEAKICNpbXBvcnQgPENGTmV0d29yay9DRk5TVVJMQ29ubmVjdGlvbi5oPgogI2VuZGlm CiAKLSNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQotI2luY2x1ZGUgPFdlYktpdEFkZGl0aW9u cy9OZXR3b3JrRGF0YVRhc2tDb2NvYUFkZGl0aW9ucy5oPgotI2Vsc2UKLSNkZWZpbmUgTkVUV09S S19EQVRBX1RBU0tfQ09DT0FfQURESVRJT05TCi0jZW5kaWYKLQogbmFtZXNwYWNlIFdlYktpdCB7 CiAKICNpZiBVU0UoQ1JFREVOVElBTF9TVE9SQUdFX1dJVEhfTkVUV09SS19TRVNTSU9OKQpAQCAt MTg3LDggKzE4MSw2IEBAIE5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3b3JrRGF0YVRhc2tDb2Nv YShOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFUCiAgICAgLCBtX2lzRm9yTWFp blJlc291cmNlTmF2aWdhdGlvbkZvckFueUZyYW1lKGRhdGFUYXNrSXNGb3JNYWluUmVzb3VyY2VO YXZpZ2F0aW9uRm9yQW55RnJhbWUpCiAgICAgLCBtX2lzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZChj b21wdXRlSXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKHNlc3Npb24pKQogewotICAgIE5FVFdPUktf REFUQV9UQVNLX0NPQ09BX0FERElUSU9OUwotCiAgICAgaWYgKG1fc2NoZWR1bGVkRmFpbHVyZVR5 cGUgIT0gTm9GYWlsdXJlKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgKaW5kZXgg MTk4YWFhY2I0ODQ3YzkzNDE5MWE1ZGY4ZTZiNjljMWYzZTU2NTY0Ny4uNjBiMzU4MTdkMDhhOTcz NzcwY2E5ZWI1YTM5Y2VlMzRiOWI0OGRkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgKKysrIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgKQEAgLTUwLDcgKzUw LDcgQEAgY2xhc3MgTGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOwogY2xhc3MgTmV0d29ya1Nl c3Npb25Db2NvYTsKIAogc3RydWN0IFNlc3Npb25XcmFwcGVyIDogcHVibGljIENhbk1ha2VXZWFr UHRyPFNlc3Npb25XcmFwcGVyPiB7Ci0gICAgdm9pZCBpbml0aWFsaXplKE5TVVJMU2Vzc2lvbkNv bmZpZ3VyYXRpb24gKiwgTmV0d29ya1Nlc3Npb25Db2NvYSYsIFdlYkNvcmU6OlN0b3JlZENyZWRl bnRpYWxzUG9saWN5KTsKKyAgICB2b2lkIGluaXRpYWxpemUoTlNVUkxTZXNzaW9uQ29uZmlndXJh dGlvbiAqLCBOZXR3b3JrU2Vzc2lvbkNvY29hJiwgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQ b2xpY3ksIE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKTsKIAogICAgIFJldGFpblB0cjxOU1VS TFNlc3Npb24+IHNlc3Npb247CiAgICAgUmV0YWluUHRyPFdLTmV0d29ya1Nlc3Npb25EZWxlZ2F0 ZT4gZGVsZWdhdGU7CkBAIC02OCw3ICs2OCw3IEBAIHB1YmxpYzoKICAgICBOZXR3b3JrU2Vzc2lv bkNvY29hKE5ldHdvcmtQcm9jZXNzJiwgTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMm Jik7CiAgICAgfk5ldHdvcmtTZXNzaW9uQ29jb2EoKTsKIAotICAgIHZvaWQgaW5pdGlhbGl6ZUVw aGVtZXJhbFN0YXRlbGVzc1Nlc3Npb24oKTsKKyAgICB2b2lkIGluaXRpYWxpemVFcGhlbWVyYWxT dGF0ZWxlc3NTZXNzaW9uKE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKTsKIAogICAgIGNvbnN0 IFN0cmluZyYgYm91bmRJbnRlcmZhY2VJZGVudGlmaWVyKCkgY29uc3Q7CiAgICAgY29uc3QgU3Ry aW5nJiBzb3VyY2VBcHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIoKSBjb25zdDsKQEAgLTEwNCw3 ICsxMDQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgY2xlYXJDcmVkZW50aWFscygpIG92ZXJyaWRl OwogICAgIGJvb2wgc2hvdWxkTG9nQ29va2llSW5mb3JtYXRpb24oKSBjb25zdCBvdmVycmlkZSB7 IHJldHVybiBtX3Nob3VsZExvZ0Nvb2tpZUluZm9ybWF0aW9uOyB9CiAgICAgU2Vjb25kcyBsb2Fk VGhyb3R0bGVMYXRlbmN5KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9sb2FkVGhyb3R0bGVM YXRlbmN5OyB9Ci0gICAgU2Vzc2lvbldyYXBwZXImIGlzb2xhdGVkU2Vzc2lvbihXZWJDb3JlOjpT dG9yZWRDcmVkZW50aWFsc1BvbGljeSwgY29uc3QgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4p OworICAgIFNlc3Npb25XcmFwcGVyJiBpc29sYXRlZFNlc3Npb24oV2ViQ29yZTo6U3RvcmVkQ3Jl ZGVudGlhbHNQb2xpY3ksIGNvbnN0IFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluLCBOYXZpZ2F0 aW5nVG9BcHBCb3VuZERvbWFpbik7CiAgICAgU2Vzc2lvbldyYXBwZXImIGFwcEJvdW5kU2Vzc2lv bihXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSk7CiAKICAgICBWZWN0b3I8V2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiBob3N0TmFtZXNXaXRoQWx0ZXJuYXRpdmVTZXJ2aWNlcygp IGNvbnN0IG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCmluZGV4IGEzOTFjNmMxOTc0YzFhOGU1 YjY0NDcyZGQyOWZkYTk2OWNiNjZjYmYuLmQyZWZiNGI0NGZhZjA3ZjEwM2ZmZmUwYTgwNDg4MWE5 MGQxMDMyN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2Ev TmV0d29ya1Nlc3Npb25Db2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KQEAgLTYyLDcgKzYyLDggQEAKICNpZiBVU0Uo QVBQTEVfSU5URVJOQUxfU0RLKQogI2luY2x1ZGUgPFdlYktpdEFkZGl0aW9ucy9OZXR3b3JrU2Vz c2lvbkNvY29hQWRkaXRpb25zLmg+CiAjZWxzZQotI2RlZmluZSBORVRXT1JLX1NFU1NJT05fQ09D T0FfQURESVRJT05TIGZhbHNlCisjZGVmaW5lIE5FVFdPUktfU0VTU0lPTl9DT0NPQV9BRERJVElP TlNfMQorI2RlZmluZSBORVRXT1JLX1NFU1NJT05fQ09DT0FfQURESVRJT05TXzIgZmFsc2UKICNl bmRpZgogCiAjaW1wb3J0ICJEZXZpY2VNYW5hZ2VtZW50U29mdExpbmsuaCIKQEAgLTEwNTQsOCAr MTA1NSwxMCBAQCBzdGF0aWMgTlNEaWN0aW9uYXJ5ICpwcm94eURpY3Rpb25hcnkoY29uc3QgVVJM JiBodHRwUHJveHksIGNvbnN0IFVSTCYgaHR0cHNQcm94eQogICAgIEFMTE9XX0RFUFJFQ0FURURf REVDTEFSQVRJT05TX0VORAogfQogCi12b2lkIFNlc3Npb25XcmFwcGVyOjppbml0aWFsaXplKE5T VVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24gKmNvbmZpZ3VyYXRpb24sIE5ldHdvcmtTZXNzaW9uQ29j b2EmIG5ldHdvcmtTZXNzaW9uLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSBzdG9y ZWRDcmVkZW50aWFsc1BvbGljeSkKK3ZvaWQgU2Vzc2lvbldyYXBwZXI6OmluaXRpYWxpemUoTlNV UkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqY29uZmlndXJhdGlvbiwgTmV0d29ya1Nlc3Npb25Db2Nv YSYgbmV0d29ya1Nlc3Npb24sIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5IHN0b3Jl ZENyZWRlbnRpYWxzUG9saWN5LCBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbiBpc05hdmlnYXRp bmdUb0FwcEJvdW5kRG9tYWluKQogeworICAgIFVOVVNFRF9QQVJBTShpc05hdmlnYXRpbmdUb0Fw cEJvdW5kRG9tYWluKTsKKyAgICBORVRXT1JLX1NFU1NJT05fQ09DT0FfQURESVRJT05TXzEKICAg ICBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgYWxsb2NdIGlu aXRXaXRoTmV0d29ya1Nlc3Npb246bmV0d29ya1Nlc3Npb24gd3JhcHBlcjoqdGhpcyB3aXRoQ3Jl ZGVudGlhbHM6c3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kgPT0gV2ViQ29yZTo6U3RvcmVkQ3JlZGVu dGlhbHNQb2xpY3k6OlVzZV0pOwogICAgIHNlc3Npb24gPSBbTlNVUkxTZXNzaW9uIHNlc3Npb25X aXRoQ29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uIGRlbGVnYXRlOmRlbGVnYXRlLmdldCgpIGRl bGVnYXRlUXVldWU6W05TT3BlcmF0aW9uUXVldWUgbWFpblF1ZXVlXV07CiB9CkBAIC0xMTUyLDcg KzExNTUsNyBAQCBOZXR3b3JrU2Vzc2lvbkNvY29hOjpOZXR3b3JrU2Vzc2lvbkNvY29hKE5ldHdv cmtQcm9jZXNzJiBuZXR3b3JrUHJvY2VzcywgTmV0d29yawogICAgICAgICBjb29raWVTdG9yYWdl Ll9vdmVycmlkZVNlc3Npb25Db29raWVBY2NlcHRQb2xpY3kgPSBZRVM7CiAjZW5kaWYKIAotICAg IG1fc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKGNvbmZpZ3VyYXRpb24s ICp0aGlzLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlKTsKKyAgICBtX3Nl c3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2UuaW5pdGlhbGl6ZShjb25maWd1cmF0aW9uLCAqdGhp cywgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OlVzZSwgTmF2aWdhdGluZ1RvQXBw Qm91bmREb21haW46Ok5vKTsKICAgICBMT0coTmV0d29ya1Nlc3Npb24sICJDcmVhdGVkIE5ldHdv cmtTZXNzaW9uIHdpdGggY29va2llQWNjZXB0UG9saWN5ICVsdSIsIGNvbmZpZ3VyYXRpb24uSFRU UENvb2tpZVN0b3JhZ2UuY29va2llQWNjZXB0UG9saWN5KTsKIAogICAgIGNvbmZpZ3VyYXRpb24u VVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7CkBAIC0xMTYxLDcgKzExNjQsNyBAQCBOZXR3b3Jr U2Vzc2lvbkNvY29hOjpOZXR3b3JrU2Vzc2lvbkNvY29hKE5ldHdvcmtQcm9jZXNzJiBuZXR3b3Jr UHJvY2VzcywgTmV0d29yawogICAgIC8vIGNvbmZpZ3VyYXRpb24uSFRUUENvb2tpZVN0b3JhZ2Ug PSBuaWw7CiAgICAgLy8gY29uZmlndXJhdGlvbi5IVFRQQ29va2llQWNjZXB0UG9saWN5ID0gTlNI VFRQQ29va2llQWNjZXB0UG9saWN5TmV2ZXI7CiAKLSAgICBtX3Nlc3Npb25XaXRob3V0Q3JlZGVu dGlhbFN0b3JhZ2UuaW5pdGlhbGl6ZShjb25maWd1cmF0aW9uLCAqdGhpcywgV2ViQ29yZTo6U3Rv cmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlKTsKKyAgICBtX3Nlc3Npb25XaXRob3V0Q3Jl ZGVudGlhbFN0b3JhZ2UuaW5pdGlhbGl6ZShjb25maWd1cmF0aW9uLCAqdGhpcywgV2ViQ29yZTo6 U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlLCBOYXZpZ2F0aW5nVG9BcHBCb3VuZERv bWFpbjo6Tm8pOwogCiAgICAgbV9kZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25zRW5hYmxlZCA9 IHBhcmFtZXRlcnMuZGV2aWNlTWFuYWdlbWVudFJlc3RyaWN0aW9uc0VuYWJsZWQ7CiAgICAgbV9h bGxMb2Fkc0Jsb2NrZWRCeURldmljZU1hbmFnZW1lbnRSZXN0cmljdGlvbnNGb3JUZXN0aW5nID0g cGFyYW1ldGVycy5hbGxMb2Fkc0Jsb2NrZWRCeURldmljZU1hbmFnZW1lbnRSZXN0cmljdGlvbnNG b3JUZXN0aW5nOwpAQCAtMTE4Myw3ICsxMTg2LDcgQEAgTmV0d29ya1Nlc3Npb25Db2NvYTo6TmV0 d29ya1Nlc3Npb25Db2NvYShOZXR3b3JrUHJvY2VzcyYgbmV0d29ya1Byb2Nlc3MsIE5ldHdvcmsK IAogTmV0d29ya1Nlc3Npb25Db2NvYTo6fk5ldHdvcmtTZXNzaW9uQ29jb2EoKSA9IGRlZmF1bHQ7 CiAKLXZvaWQgTmV0d29ya1Nlc3Npb25Db2NvYTo6aW5pdGlhbGl6ZUVwaGVtZXJhbFN0YXRlbGVz c1Nlc3Npb24oKQordm9pZCBOZXR3b3JrU2Vzc2lvbkNvY29hOjppbml0aWFsaXplRXBoZW1lcmFs U3RhdGVsZXNzU2Vzc2lvbihOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbiBpc05hdmlnYXRpbmdU b0FwcEJvdW5kRG9tYWluKQogewogICAgIE5TVVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24gKmNvbmZp Z3VyYXRpb24gPSBbTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiBlcGhlbWVyYWxTZXNzaW9uQ29u ZmlndXJhdGlvbl07CiAgICAgTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqZXhpc3RpbmdDb25m aWd1cmF0aW9uID0gbV9zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24uZ2V0 KCkuY29uZmlndXJhdGlvbjsKQEAgLTEyMDEsNyArMTIwNCw3IEBAIHZvaWQgTmV0d29ya1Nlc3Np b25Db2NvYTo6aW5pdGlhbGl6ZUVwaGVtZXJhbFN0YXRlbGVzc1Nlc3Npb24oKQogICAgIGNvbmZp Z3VyYXRpb24uX0NURGF0YUNvbm5lY3Rpb25TZXJ2aWNlVHlwZSA9IGV4aXN0aW5nQ29uZmlndXJh dGlvbi5fQ1REYXRhQ29ubmVjdGlvblNlcnZpY2VUeXBlOwogI2VuZGlmCiAKLSAgICBtX2VwaGVt ZXJhbFN0YXRlbGVzc1Nlc3Npb24uaW5pdGlhbGl6ZShjb25maWd1cmF0aW9uLCAqdGhpcywgV2Vi Q29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkVwaGVtZXJhbFN0YXRlbGVzcyk7CisgICAg bV9lcGhlbWVyYWxTdGF0ZWxlc3NTZXNzaW9uLmluaXRpYWxpemUoY29uZmlndXJhdGlvbiwgKnRo aXMsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0ZWxlc3Ms IGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4pOwogfQogCiBTZXNzaW9uV3JhcHBlciYgTmV0 d29ya1Nlc3Npb25Db2NvYTo6c2Vzc2lvbldyYXBwZXJGb3JUYXNrKGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYgcmVxdWVzdCwgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kg c3RvcmVkQ3JlZGVudGlhbHNQb2xpY3ksIE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluIGlzTmF2 aWdhdGluZ1RvQXBwQm91bmREb21haW4pCkBAIC0xMjEwLDEzICsxMjEzLDEzIEBAIFNlc3Npb25X cmFwcGVyJiBOZXR3b3JrU2Vzc2lvbkNvY29hOjpzZXNzaW9uV3JhcHBlckZvclRhc2soY29uc3Qg V2ViQ29yZTo6UmVzb3VyCiAgICAgaWYgKGF1dG8qIHN0b3JhZ2VTZXNzaW9uID0gbmV0d29ya1N0 b3JhZ2VTZXNzaW9uKCkpIHsKICAgICAgICAgYXV0byBmaXJzdFBhcnR5ID0gV2ViQ29yZTo6UmVn aXN0cmFibGVEb21haW4ocmVxdWVzdC5maXJzdFBhcnR5Rm9yQ29va2llcygpKTsKICAgICAgICAg aWYgKHN0b3JhZ2VTZXNzaW9uLT5zaG91bGRCbG9ja1RoaXJkUGFydHlDb29raWVzQnV0S2VlcEZp cnN0UGFydHlDb29raWVzRm9yKGZpcnN0UGFydHkpKQotICAgICAgICAgICAgcmV0dXJuIGlzb2xh dGVkU2Vzc2lvbihzdG9yZWRDcmVkZW50aWFsc1BvbGljeSwgZmlyc3RQYXJ0eSk7CisgICAgICAg ICAgICByZXR1cm4gaXNvbGF0ZWRTZXNzaW9uKHN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBmaXJz dFBhcnR5LCBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKTsKICAgICB9IGVsc2UKICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAjZW5kaWYKIAogICAgIGlmIChpc05hdmlnYXRpbmdU b0FwcEJvdW5kRG9tYWluID09IE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluOjpZZXMpIHsKLSAg ICAgICAgaWYgKG1faXNJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZCB8fCBORVRXT1JLX1NFU1NJ T05fQ09DT0FfQURESVRJT05TKQorICAgICAgICBpZiAobV9pc0luQXBwQnJvd3NlclByaXZhY3lF bmFibGVkIHx8IE5FVFdPUktfU0VTU0lPTl9DT0NPQV9BRERJVElPTlNfMikKICAgICAgICAgICAg IHJldHVybiBhcHBCb3VuZFNlc3Npb24oc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kpOwogICAgIH0K IApAQCAtMTIyNyw3ICsxMjMwLDcgQEAgU2Vzc2lvbldyYXBwZXImIE5ldHdvcmtTZXNzaW9uQ29j b2E6OnNlc3Npb25XcmFwcGVyRm9yVGFzayhjb25zdCBXZWJDb3JlOjpSZXNvdXIKICAgICAgICAg cmV0dXJuIG1fc2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZTsKICAgICBjYXNlIFdlYkNv cmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0ZWxlc3M6CiAgICAgICAg IGlmICghbV9lcGhlbWVyYWxTdGF0ZWxlc3NTZXNzaW9uLnNlc3Npb24pCi0gICAgICAgICAgICBp bml0aWFsaXplRXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbigpOworICAgICAgICAgICAgaW5pdGlh bGl6ZUVwaGVtZXJhbFN0YXRlbGVzc1Nlc3Npb24oTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW46 Ok5vKTsKICAgICAgICAgcmV0dXJuIG1fZXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbjsKICAgICB9 CiB9CkBAIC0xMjM2LDggKzEyMzksOCBAQCBTZXNzaW9uV3JhcHBlciYgTmV0d29ya1Nlc3Npb25D b2NvYTo6YXBwQm91bmRTZXNzaW9uKFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUAogewogICAg IGlmICghbV9hcHBCb3VuZFNlc3Npb24pIHsKICAgICAgICAgbV9hcHBCb3VuZFNlc3Npb24gPSBt YWtlVW5pcXVlPElzb2xhdGVkU2Vzc2lvbj4oKTsKLSAgICAgICAgbV9hcHBCb3VuZFNlc3Npb24t PnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2UuaW5pdGlhbGl6ZShtX3Nlc3Npb25XaXRoQ3Jl ZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbi5nZXQoKS5jb25maWd1cmF0aW9uLCAqdGhpcywgV2ViQ29y ZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OlVzZSk7Ci0gICAgICAgIG1fYXBwQm91bmRTZXNz aW9uLT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUobV9zZXNzaW9u V2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbiwgKnRo aXMsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpEb05vdFVzZSk7CisgICAgICAg IG1fYXBwQm91bmRTZXNzaW9uLT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxp emUobV9zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJh dGlvbiwgKnRoaXMsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2UsIE5hdmln YXRpbmdUb0FwcEJvdW5kRG9tYWluOjpZZXMpOworICAgICAgICBtX2FwcEJvdW5kU2Vzc2lvbi0+ c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKG1fc2Vzc2lvbldpdGhv dXRDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24sICp0aGlzLCBX ZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2UsIE5hdmlnYXRpbmdUb0Fw cEJvdW5kRG9tYWluOjpZZXMpOwogICAgIH0KIAogICAgIGF1dG8mIHNlc3Npb25XcmFwcGVyID0g WyZdIChhdXRvIHN0b3JlZENyZWRlbnRpYWxzUG9saWN5KSAtPiBTZXNzaW9uV3JhcHBlciYgewpA QCAtMTI1MCw3ICsxMjUzLDcgQEAgU2Vzc2lvbldyYXBwZXImIE5ldHdvcmtTZXNzaW9uQ29jb2E6 OmFwcEJvdW5kU2Vzc2lvbihXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1AKICAgICAgICAgICAg IHJldHVybiBtX2FwcEJvdW5kU2Vzc2lvbi0+c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFn ZTsKICAgICAgICAgY2FzZSBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RXBoZW1l cmFsU3RhdGVsZXNzOgogICAgICAgICAgICAgaWYgKCFtX2VwaGVtZXJhbFN0YXRlbGVzc1Nlc3Np b24uc2Vzc2lvbikKLSAgICAgICAgICAgICAgICBpbml0aWFsaXplRXBoZW1lcmFsU3RhdGVsZXNz U2Vzc2lvbigpOworICAgICAgICAgICAgICAgIGluaXRpYWxpemVFcGhlbWVyYWxTdGF0ZWxlc3NT ZXNzaW9uKE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluOjpZZXMpOwogICAgICAgICAgICAgcmV0 dXJuIG1fZXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbjsKICAgICAgICAgfQogICAgIH0gKHN0b3Jl ZENyZWRlbnRpYWxzUG9saWN5KTsKQEAgLTEyNTgsMTIgKzEyNjEsMTIgQEAgU2Vzc2lvbldyYXBw ZXImIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmFwcEJvdW5kU2Vzc2lvbihXZWJDb3JlOjpTdG9yZWRD cmVkZW50aWFsc1AKICAgICByZXR1cm4gc2Vzc2lvbldyYXBwZXI7CiB9CiAKLVNlc3Npb25XcmFw cGVyJiBOZXR3b3JrU2Vzc2lvbkNvY29hOjppc29sYXRlZFNlc3Npb24oV2ViQ29yZTo6U3RvcmVk Q3JlZGVudGlhbHNQb2xpY3kgc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3ksIGNvbnN0IFdlYkNvcmU6 OlJlZ2lzdHJhYmxlRG9tYWluIGZpcnN0UGFydHlEb21haW4pCitTZXNzaW9uV3JhcHBlciYgTmV0 d29ya1Nlc3Npb25Db2NvYTo6aXNvbGF0ZWRTZXNzaW9uKFdlYkNvcmU6OlN0b3JlZENyZWRlbnRp YWxzUG9saWN5IHN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBjb25zdCBXZWJDb3JlOjpSZWdpc3Ry YWJsZURvbWFpbiBmaXJzdFBhcnR5RG9tYWluLCBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbiBp c05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKQogewotICAgIGF1dG8mIGVudHJ5ID0gbV9pc29s YXRlZFNlc3Npb25zLmVuc3VyZShmaXJzdFBhcnR5RG9tYWluLCBbdGhpc10geworICAgIGF1dG8m IGVudHJ5ID0gbV9pc29sYXRlZFNlc3Npb25zLmVuc3VyZShmaXJzdFBhcnR5RG9tYWluLCBbdGhp cywgaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbl0gewogICAgICAgICBhdXRvIG5ld0VudHJ5 ID0gbWFrZVVuaXF1ZTxJc29sYXRlZFNlc3Npb24+KCk7Ci0gICAgICAgIG5ld0VudHJ5LT5zZXNz aW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUobV9zZXNzaW9uV2l0aENyZWRlbnRp YWxTdG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbiwgKnRoaXMsIFdlYkNvcmU6OlN0 b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2UpOwotICAgICAgICBuZXdFbnRyeS0+c2Vzc2lvbldp dGhvdXRDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKG1fc2Vzc2lvbldpdGhvdXRDcmVkZW50 aWFsU3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24sICp0aGlzLCBXZWJDb3JlOjpT dG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2UpOworICAgICAgICBuZXdFbnRyeS0+c2Vz c2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKG1fc2Vzc2lvbldpdGhDcmVkZW50 aWFsU3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24sICp0aGlzLCBXZWJDb3JlOjpT dG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlLCBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWlu KTsKKyAgICAgICAgbmV3RW50cnktPnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2UuaW5p dGlhbGl6ZShtX3Nlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbi5nZXQoKS5j b25maWd1cmF0aW9uLCAqdGhpcywgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRv Tm90VXNlLCBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKTsKICAgICAgICAgcmV0dXJuIG5l d0VudHJ5OwogICAgIH0pLml0ZXJhdG9yLT52YWx1ZTsKIApAQCAtMTI3OSw3ICsxMjgyLDcgQEAg U2Vzc2lvbldyYXBwZXImIE5ldHdvcmtTZXNzaW9uQ29jb2E6Omlzb2xhdGVkU2Vzc2lvbihXZWJD b3JlOjpTdG9yZWRDcmVkZW50aWFsc1AKICAgICAgICAgICAgIHJldHVybiBlbnRyeS0+c2Vzc2lv bldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZTsKICAgICAgICAgY2FzZSBXZWJDb3JlOjpTdG9yZWRD cmVkZW50aWFsc1BvbGljeTo6RXBoZW1lcmFsU3RhdGVsZXNzOgogICAgICAgICAgICAgaWYgKCFt X2VwaGVtZXJhbFN0YXRlbGVzc1Nlc3Npb24uc2Vzc2lvbikKLSAgICAgICAgICAgICAgICBpbml0 aWFsaXplRXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbigpOworICAgICAgICAgICAgICAgIGluaXRp YWxpemVFcGhlbWVyYWxTdGF0ZWxlc3NTZXNzaW9uKGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21h aW4pOwogICAgICAgICAgICAgcmV0dXJuIG1fZXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbjsKICAg ICAgICAgfQogICAgIH0gKHN0b3JlZENyZWRlbnRpYWxzUG9saWN5KTsK