239754 2022-04-25 21:15:19 -0700 Add object addresses to IPC logging 2022-04-26 09:01:14 -0700 1 1 1 Unclassified WebKit WebKit Process Model WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser heycam simon.fraser webkit-bug-importer oldest_to_newest 1864344 0 simon.fraser 2022-04-25 21:15:19 -0700 Add object addresses to IPC logging 1864346 1 458324 simon.fraser 2022-04-25 21:21:50 -0700 Created attachment 458324 Patch 1864347 2 458324 heycam 2022-04-25 21:25:19 -0700 Comment on attachment 458324 Patch r=me though maybe inside the square brackets, and explicitly saying it's the receiver? So it looks like: [SourceProcess nnn -> DestProcess mmm receiver 0x...] MessageName ... 1864350 3 458326 simon.fraser 2022-04-25 21:46:37 -0700 Created attachment 458326 Patch 1864476 4 ews-feeder 2022-04-26 09:00:33 -0700 Committed r293426 (249986@main): <https://commits.webkit.org/249986@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458326. 1864477 5 webkit-bug-importer 2022-04-26 09:01:14 -0700 <rdar://problem/92337065> 458324 2022-04-25 21:21:50 -0700 2022-04-25 21:25:19 -0700 Patch bug-239754-20220425212149.patch text/plain 9003 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRhNGQ5ZTliZjZlNjNiYmNj ZmVmMDhkZDQ4Yjc4Y2FhYWYxNTlhYjEuLjdlYzBmOGZiMTMzNDRlYTdhMTAwZDhhZGJjYmRkM2Rl YjUxOTNkZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjItMDQtMjUgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG9iamVjdCBhZGRy ZXNzZXMgdG8gSVBDIGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzOTc1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEl0J3MgdXNlZnVsIGlmIElQQyBsb2dnaW5nIHNob3dzIHRoZSByZWNlaXZl ciBhZGRyZXNzLCBzbyB5b3UgY2FuIGRpc3Rpbmd1aXNoIGRpZmZlcmVudAorICAgICAgICByZWNl aXZlcnMuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvSGFuZGxlTWVzc2FnZS5oOgorICAgICAg ICAoSVBDOjp0ZXh0U3RyZWFtRm9yTG9nZ2luZyk6CisgICAgICAgIChJUEM6OmxvZ01lc3NhZ2VJ bXBsKToKKyAgICAgICAgKElQQzo6bG9nTWVzc2FnZSk6CisgICAgICAgIChJUEM6OmxvZ1JlcGx5 KToKKyAgICAgICAgKElQQzo6aGFuZGxlTWVzc2FnZSk6CisgICAgICAgIChJUEM6OmhhbmRsZU1l c3NhZ2VXYW50c0Nvbm5lY3Rpb24pOgorICAgICAgICAoSVBDOjpoYW5kbGVNZXNzYWdlU3luY2hy b25vdXMpOgorICAgICAgICAoSVBDOjpoYW5kbGVNZXNzYWdlU3luY2hyb25vdXNXYW50c0Nvbm5l Y3Rpb24pOgorICAgICAgICAoSVBDOjpoYW5kbGVNZXNzYWdlQXN5bmMpOgorICAgICAgICAoSVBD OjpoYW5kbGVNZXNzYWdlQXN5bmNXYW50c0Nvbm5lY3Rpb24pOgorCiAyMDIyLTA0LTI1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBjcmFzaGVz IHVuZGVyIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjphcHBseUJhY2tpbmdTdG9yZVRvTGF5ZXIo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvSGFuZGxlTWVzc2FnZS5o IGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvSGFuZGxlTWVzc2FnZS5oCmluZGV4IDA4ZDg5 NWYyZjc1NTZkNjY3OGQzNjdlNzU2NGNmMGI2ZmM1MzAwODIuLmMxM2IzYjQ3M2RhMDhlYzU1N2Zm ODM1ZTQwNGIzMmFhZDc1ZDBjZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0v SVBDL0hhbmRsZU1lc3NhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9IYW5k bGVNZXNzYWdlLmgKQEAgLTUwLDcgKzUwLDcgQEAgY29uc3RleHByIHVuc2lnbmVkIGxvZ2dpbmdD b250YWluZXJTaXplTGltaXQgPSAyMDA7CiAjaWYgIUxPR19ESVNBQkxFRAogZW51bSBjbGFzcyBG b3JSZXBseSA6IGJvb2wgeyBObywgWWVzIH07CiAKLWlubGluZSBUZXh0U3RyZWFtIHRleHRTdHJl YW1Gb3JMb2dnaW5nKGNvbnN0IENvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIE1lc3NhZ2VOYW1lIG1l c3NhZ2VOYW1lLCBGb3JSZXBseSBmb3JSZXBseSkKK2lubGluZSBUZXh0U3RyZWFtIHRleHRTdHJl YW1Gb3JMb2dnaW5nKGNvbnN0IENvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIE1lc3NhZ2VOYW1lIG1l c3NhZ2VOYW1lLCB2b2lkKiBvYmplY3QsIEZvclJlcGx5IGZvclJlcGx5KQogewogICAgIFRleHRT dHJlYW0gc3RyZWFtKFRleHRTdHJlYW06OkxpbmVNb2RlOjpTaW5nbGVMaW5lLCB7IH0sIGxvZ2dp bmdDb250YWluZXJTaXplTGltaXQpOwogICAgIHN0cmVhbSA8PCAnWyc7CkBAIC02MiwyMiArNjIs MjggQEAgaW5saW5lIFRleHRTdHJlYW0gdGV4dFN0cmVhbUZvckxvZ2dpbmcoY29uc3QgQ29ubmVj dGlvbiYgY29ubmVjdGlvbiwgTWVzc2FnZU5hbWUKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKGNv bm5lY3Rpb24pOwogI2VuZGlmCi0gICAgYXV0byBhcnJvdyA9IGZvclJlcGx5ID09IEZvclJlcGx5 OjpZZXMgPyAiPC0gIiA6ICItPiAiOwotICAgIHN0cmVhbSA8PCBhcnJvdyA8PCBXZWJDb3JlOjpw cm9jZXNzVHlwZURlc2NyaXB0aW9uKFdlYkNvcmU6OnByb2Nlc3NUeXBlKCkpIDw8ICcgJyA8PCBn ZXRDdXJyZW50UHJvY2Vzc0lEKCkgPDwgIl0gIiA8PCBkZXNjcmlwdGlvbihtZXNzYWdlTmFtZSk7 Ci0gICAgaWYgKGZvclJlcGx5ID09IEZvclJlcGx5OjpZZXMpCi0gICAgICAgIHN0cmVhbSA8PCAi IFJlcGx5IjsKKworICAgIHN3aXRjaCAoZm9yUmVwbHkpIHsKKyAgICBjYXNlIEZvclJlcGx5OjpO bzoKKyAgICAgICAgc3RyZWFtIDw8ICItPiAiIDw8IFdlYkNvcmU6OnByb2Nlc3NUeXBlRGVzY3Jp cHRpb24oV2ViQ29yZTo6cHJvY2Vzc1R5cGUoKSkgPDwgJyAnIDw8IGdldEN1cnJlbnRQcm9jZXNz SUQoKSA8PCAiXSAiIDw8IG9iamVjdCA8PCAnICcgPDwgZGVzY3JpcHRpb24obWVzc2FnZU5hbWUp OworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZvclJlcGx5OjpZZXM6CisgICAgICAgIHN0cmVh bSA8PCAiPC0gIiA8PCBXZWJDb3JlOjpwcm9jZXNzVHlwZURlc2NyaXB0aW9uKFdlYkNvcmU6OnBy b2Nlc3NUeXBlKCkpIDw8ICcgJyA8PCBnZXRDdXJyZW50UHJvY2Vzc0lEKCkgPDwgIl0gIiA8PCBk ZXNjcmlwdGlvbihtZXNzYWdlTmFtZSkgPDwgIiBSZXBseSI7CisgICAgICAgIGJyZWFrOworICAg IH0KKwogICAgIHJldHVybiBzdHJlYW07CiB9CiAjZW5kaWYKIAogdGVtcGxhdGU8dHlwZW5hbWUg QXJnc1R1cGxlLCBzaXplX3QuLi4gQXJnc0luZGV4Pgotdm9pZCBsb2dNZXNzYWdlSW1wbChjb25z dCBDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBNZXNzYWdlTmFtZSBtZXNzYWdlTmFtZSwgY29uc3Qg QXJnc1R1cGxlJiBhcmdzLCBzdGQ6OmluZGV4X3NlcXVlbmNlPEFyZ3NJbmRleC4uLj4pCit2b2lk IGxvZ01lc3NhZ2VJbXBsKGNvbnN0IENvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIE1lc3NhZ2VOYW1l IG1lc3NhZ2VOYW1lLCB2b2lkKiBvYmplY3QsIGNvbnN0IEFyZ3NUdXBsZSYgYXJncywgc3RkOjpp bmRleF9zZXF1ZW5jZTxBcmdzSW5kZXguLi4+KQogewogI2lmICFMT0dfRElTQUJMRUQKICAgICBp ZiAoTE9HX0NIQU5ORUwoSVBDTWVzc2FnZXMpLnN0YXRlICE9IFdURkxvZ0NoYW5uZWxTdGF0ZTo6 T24pCiAgICAgICAgIHJldHVybjsKIAotICAgIGF1dG8gc3RyZWFtID0gdGV4dFN0cmVhbUZvckxv Z2dpbmcoY29ubmVjdGlvbiwgbWVzc2FnZU5hbWUsIEZvclJlcGx5OjpObyk7CisgICAgYXV0byBz dHJlYW0gPSB0ZXh0U3RyZWFtRm9yTG9nZ2luZyhjb25uZWN0aW9uLCBtZXNzYWdlTmFtZSwgb2Jq ZWN0LCBGb3JSZXBseTo6Tm8pOwogCiAgICAgaWYgKGF1dG8gYXJndW1lbnREZXNjcmlwdGlvbnMg PSBtZXNzYWdlQXJndW1lbnREZXNjcmlwdGlvbnMobWVzc2FnZU5hbWUpKQogICAgICAgICAoc3Ry ZWFtLmR1bXBQcm9wZXJ0eSgoKmFyZ3VtZW50RGVzY3JpcHRpb25zKVtBcmdzSW5kZXhdLm5hbWUs IFZhbHVlT3JFbGxpcHNpcyhzdGQ6OmdldDxBcmdzSW5kZXg+KGFyZ3MpKSksIC4uLik7CkBAIC05 MSw5ICs5Nyw5IEBAIHZvaWQgbG9nTWVzc2FnZUltcGwoY29uc3QgQ29ubmVjdGlvbiYgY29ubmVj dGlvbiwgTWVzc2FnZU5hbWUgbWVzc2FnZU5hbWUsIGNvbnN0CiB9CiAKIHRlbXBsYXRlPHR5cGVu YW1lIEFyZ3NUdXBsZSwgdHlwZW5hbWUgQXJnc0luZGljZXMgPSBzdGQ6Om1ha2VfaW5kZXhfc2Vx dWVuY2U8c3RkOjp0dXBsZV9zaXplPEFyZ3NUdXBsZT46OnZhbHVlPj4KLXZvaWQgbG9nTWVzc2Fn ZShjb25zdCBDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBNZXNzYWdlTmFtZSBtZXNzYWdlTmFtZSwg Y29uc3QgQXJnc1R1cGxlJiBhcmdzKQordm9pZCBsb2dNZXNzYWdlKGNvbnN0IENvbm5lY3Rpb24m IGNvbm5lY3Rpb24sIE1lc3NhZ2VOYW1lIG1lc3NhZ2VOYW1lLCB2b2lkKiBvYmplY3QsIGNvbnN0 IEFyZ3NUdXBsZSYgYXJncykKIHsKLSAgICBsb2dNZXNzYWdlSW1wbChjb25uZWN0aW9uLCBtZXNz YWdlTmFtZSwgYXJncywgQXJnc0luZGljZXMoKSk7CisgICAgbG9nTWVzc2FnZUltcGwoY29ubmVj dGlvbiwgbWVzc2FnZU5hbWUsIG9iamVjdCwgYXJncywgQXJnc0luZGljZXMoKSk7CiB9CiAKIHRl bXBsYXRlPHR5cGVuYW1lLi4uIFQ+CkBAIC0xMDMsNyArMTA5LDcgQEAgdm9pZCBsb2dSZXBseShj b25zdCBDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBNZXNzYWdlTmFtZSBtZXNzYWdlTmFtZSwgY29u c3QgVCYuLi4KICAgICBpZiAoIXNpemVvZi4uLihUKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg YXV0byBzdHJlYW0gPSB0ZXh0U3RyZWFtRm9yTG9nZ2luZyhjb25uZWN0aW9uLCBtZXNzYWdlTmFt ZSwgRm9yUmVwbHk6Olllcyk7CisgICAgYXV0byBzdHJlYW0gPSB0ZXh0U3RyZWFtRm9yTG9nZ2lu Zyhjb25uZWN0aW9uLCBtZXNzYWdlTmFtZSwgbnVsbHB0ciwgRm9yUmVwbHk6Olllcyk7CiAKICAg ICB1bnNpZ25lZCBhcmdJbmRleCA9IDA7CiAgICAgaWYgKGF1dG8gYXJndW1lbnREZXNjcmlwdGlv bnMgPSBtZXNzYWdlUmVwbHlBcmd1bWVudERlc2NyaXB0aW9ucyhtZXNzYWdlTmFtZSkpCkBAIC0y NDksNyArMjU1LDcgQEAgdm9pZCBoYW5kbGVNZXNzYWdlKENvbm5lY3Rpb24mIGNvbm5lY3Rpb24s IERlY29kZXImIGRlY29kZXIsIEMqIG9iamVjdCwgTUYgZnVuY3QKICAgICBpZiAoVU5MSUtFTFko IWFyZ3VtZW50cykpCiAgICAgICAgIHJldHVybjsKIAotICAgIGxvZ01lc3NhZ2UoY29ubmVjdGlv biwgVDo6bmFtZSgpLCAqYXJndW1lbnRzKTsKKyAgICBsb2dNZXNzYWdlKGNvbm5lY3Rpb24sIFQ6 Om5hbWUoKSwgb2JqZWN0LCAqYXJndW1lbnRzKTsKICAgICBjYWxsTWVtYmVyRnVuY3Rpb24oV1RG TW92ZSgqYXJndW1lbnRzKSwgb2JqZWN0LCBmdW5jdGlvbik7CiB9CiAKQEAgLTI2MCw3ICsyNjYs NyBAQCB2b2lkIGhhbmRsZU1lc3NhZ2VXYW50c0Nvbm5lY3Rpb24oQ29ubmVjdGlvbiYgY29ubmVj dGlvbiwgRGVjb2RlciYgZGVjb2RlciwgQyogbwogICAgIGlmIChVTkxJS0VMWSghYXJndW1lbnRz KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbG9nTWVzc2FnZShjb25uZWN0aW9uLCBUOjpuYW1l KCksICphcmd1bWVudHMpOworICAgIGxvZ01lc3NhZ2UoY29ubmVjdGlvbiwgVDo6bmFtZSgpLCBv YmplY3QsICphcmd1bWVudHMpOwogICAgIGNhbGxNZW1iZXJGdW5jdGlvbihjb25uZWN0aW9uLCBX VEZNb3ZlKCphcmd1bWVudHMpLCBvYmplY3QsIGZ1bmN0aW9uKTsKIH0KIApAQCAtMjc0LDcgKzI4 MCw3IEBAIGJvb2wgaGFuZGxlTWVzc2FnZVN5bmNocm9ub3VzKENvbm5lY3Rpb24mIGNvbm5lY3Rp b24sIERlY29kZXImIGRlY29kZXIsIFVuaXF1ZVJlCiAgICAgdXNpbmcgQ29tcGxldGlvbkhhbmRs ZXJGcm9tTUYgPSB0eXBlbmFtZSBDb21wbGV0aW9uSGFuZGxlclR5cGVEZWR1Y3Rpb248TUY+Ojp0 ZW1wbGF0ZSBUeXBlPHN0ZDo6dHVwbGVfc2l6ZV92PHR5cGVuYW1lIFQ6OkFyZ3VtZW50cz4+Owog ICAgIHN0YXRpY19hc3NlcnQoQ29tcGxldGlvbkhhbmRsZXJWYWxpZGF0aW9uOjp0ZW1wbGF0ZSBt YXRjaGluZ1R5cGVzPENvbXBsZXRpb25IYW5kbGVyRnJvbU1GLCB0eXBlbmFtZSBUOjpEZWxheWVk UmVwbHk+KCkpOwogCi0gICAgbG9nTWVzc2FnZShjb25uZWN0aW9uLCBUOjpuYW1lKCksICphcmd1 bWVudHMpOworICAgIGxvZ01lc3NhZ2UoY29ubmVjdGlvbiwgVDo6bmFtZSgpLCBvYmplY3QsICph cmd1bWVudHMpOwogICAgIGNhbGxNZW1iZXJGdW5jdGlvbihXVEZNb3ZlKCphcmd1bWVudHMpLAog ICAgICAgICBDb21wbGV0aW9uSGFuZGxlckZyb21NRihbcmVwbHlFbmNvZGVyID0gV1RGTW92ZShy ZXBseUVuY29kZXIpLCBjb25uZWN0aW9uID0gUmVmIHsgY29ubmVjdGlvbiB9XSAoYXV0byYmLi4u IGFyZ3MpIG11dGFibGUgewogICAgICAgICAgICAgbG9nUmVwbHkoY29ubmVjdGlvbiwgVDo6bmFt ZSgpLCBhcmdzLi4uKTsKQEAgLTI5NSw3ICszMDEsNyBAQCBib29sIGhhbmRsZU1lc3NhZ2VTeW5j aHJvbm91c1dhbnRzQ29ubmVjdGlvbihDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBEZWNvZGVyJiBk ZQogICAgIHVzaW5nIENvbXBsZXRpb25IYW5kbGVyRnJvbU1GID0gdHlwZW5hbWUgQ29tcGxldGlv bkhhbmRsZXJUeXBlRGVkdWN0aW9uPE1GPjo6dGVtcGxhdGUgVHlwZTwxICsgc3RkOjp0dXBsZV9z aXplX3Y8dHlwZW5hbWUgVDo6QXJndW1lbnRzPj47CiAgICAgc3RhdGljX2Fzc2VydChDb21wbGV0 aW9uSGFuZGxlclZhbGlkYXRpb246OnRlbXBsYXRlIG1hdGNoaW5nVHlwZXM8Q29tcGxldGlvbkhh bmRsZXJGcm9tTUYsIHR5cGVuYW1lIFQ6OkRlbGF5ZWRSZXBseT4oKSk7CiAKLSAgICBsb2dNZXNz YWdlKGNvbm5lY3Rpb24sIFQ6Om5hbWUoKSwgKmFyZ3VtZW50cyk7CisgICAgbG9nTWVzc2FnZShj b25uZWN0aW9uLCBUOjpuYW1lKCksIG9iamVjdCwgKmFyZ3VtZW50cyk7CiAgICAgY2FsbE1lbWJl ckZ1bmN0aW9uKGNvbm5lY3Rpb24sIFdURk1vdmUoKmFyZ3VtZW50cyksCiAgICAgICAgIENvbXBs ZXRpb25IYW5kbGVyRnJvbU1GKFtyZXBseUVuY29kZXIgPSBXVEZNb3ZlKHJlcGx5RW5jb2Rlciks IGNvbm5lY3Rpb24gPSBSZWYgeyBjb25uZWN0aW9uIH1dIChhdXRvJiYuLi4gYXJncykgbXV0YWJs ZSB7CiAgICAgICAgICAgICBsb2dSZXBseShjb25uZWN0aW9uLCBUOjpuYW1lKCksIGFyZ3MuLi4p OwpAQCAtMzIwLDcgKzMyNiw3IEBAIHZvaWQgaGFuZGxlTWVzc2FnZVN5bmNocm9ub3VzKFN0cmVh bVNlcnZlckNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIERlY29kZXImIGRlY29kCiAgICAgdXNpbmcg Q29tcGxldGlvbkhhbmRsZXJGcm9tTUYgPSB0eXBlbmFtZSBDb21wbGV0aW9uSGFuZGxlclR5cGVE ZWR1Y3Rpb248TUY+Ojp0ZW1wbGF0ZSBUeXBlPHN0ZDo6dHVwbGVfc2l6ZV92PHR5cGVuYW1lIFQ6 OkFyZ3VtZW50cz4+OwogICAgIHN0YXRpY19hc3NlcnQoQ29tcGxldGlvbkhhbmRsZXJWYWxpZGF0 aW9uOjp0ZW1wbGF0ZSBtYXRjaGluZ1R5cGVzPENvbXBsZXRpb25IYW5kbGVyRnJvbU1GLCB0eXBl bmFtZSBUOjpEZWxheWVkUmVwbHk+KCkpOwogCi0gICAgbG9nTWVzc2FnZShjb25uZWN0aW9uLmNv bm5lY3Rpb24oKSwgVDo6bmFtZSgpLCAqYXJndW1lbnRzKTsKKyAgICBsb2dNZXNzYWdlKGNvbm5l Y3Rpb24uY29ubmVjdGlvbigpLCBUOjpuYW1lKCksIG9iamVjdCwgKmFyZ3VtZW50cyk7CiAgICAg Y2FsbE1lbWJlckZ1bmN0aW9uKFdURk1vdmUoKmFyZ3VtZW50cyksCiAgICAgICAgIENvbXBsZXRp b25IYW5kbGVyRnJvbU1GKFtzeW5jUmVxdWVzdElELCBjb25uZWN0aW9uID0gUmVmIHsgY29ubmVj dGlvbiB9XSAoYXV0byYmLi4uIGFyZ3MpIG11dGFibGUgewogICAgICAgICAgICAgbG9nUmVwbHko Y29ubmVjdGlvbi0+Y29ubmVjdGlvbigpLCBUOjpuYW1lKCksIGFyZ3MuLi4pOwpAQCAtMzQzLDcg KzM0OSw3IEBAIHZvaWQgaGFuZGxlTWVzc2FnZUFzeW5jKENvbm5lY3Rpb24mIGNvbm5lY3Rpb24s IERlY29kZXImIGRlY29kZXIsIEMqIG9iamVjdCwgTUYKICAgICB1c2luZyBDb21wbGV0aW9uSGFu ZGxlckZyb21NRiA9IHR5cGVuYW1lIENvbXBsZXRpb25IYW5kbGVyVHlwZURlZHVjdGlvbjxNRj46 OnRlbXBsYXRlIFR5cGU8c3RkOjp0dXBsZV9zaXplX3Y8dHlwZW5hbWUgVDo6QXJndW1lbnRzPj47 CiAgICAgc3RhdGljX2Fzc2VydChDb21wbGV0aW9uSGFuZGxlclZhbGlkYXRpb246OnRlbXBsYXRl IG1hdGNoaW5nVHlwZXM8Q29tcGxldGlvbkhhbmRsZXJGcm9tTUYsIHR5cGVuYW1lIFQ6OkFzeW5j UmVwbHk+KCkpOwogCi0gICAgbG9nTWVzc2FnZShjb25uZWN0aW9uLCBUOjpuYW1lKCksICphcmd1 bWVudHMpOworICAgIGxvZ01lc3NhZ2UoY29ubmVjdGlvbiwgVDo6bmFtZSgpLCBvYmplY3QsICph cmd1bWVudHMpOwogICAgIGNhbGxNZW1iZXJGdW5jdGlvbihXVEZNb3ZlKCphcmd1bWVudHMpLAog ICAgICAgICBDb21wbGV0aW9uSGFuZGxlckZyb21NRiB7IFtsaXN0ZW5lcklEID0gKmxpc3RlbmVy SUQsIGNvbm5lY3Rpb24gPSBSZWYgeyBjb25uZWN0aW9uIH1dIChhdXRvJiYuLi4gYXJncykgbXV0 YWJsZSB7CiAgICAgICAgICAgICBhdXRvIGVuY29kZXIgPSBtYWtlVW5pcXVlUmVmPEVuY29kZXI+ KFQ6OmFzeW5jTWVzc2FnZVJlcGx5TmFtZSgpLCBsaXN0ZW5lcklEKTsKQEAgLTM2OCw3ICszNzQs NyBAQCB2b2lkIGhhbmRsZU1lc3NhZ2VBc3luY1dhbnRzQ29ubmVjdGlvbihDb25uZWN0aW9uJiBj b25uZWN0aW9uLCBEZWNvZGVyJiBkZWNvZGVyLAogICAgIHVzaW5nIENvbXBsZXRpb25IYW5kbGVy RnJvbU1GID0gdHlwZW5hbWUgQ29tcGxldGlvbkhhbmRsZXJUeXBlRGVkdWN0aW9uPE1GPjo6dGVt cGxhdGUgVHlwZTwxICsgc3RkOjp0dXBsZV9zaXplX3Y8dHlwZW5hbWUgVDo6QXJndW1lbnRzPj47 CiAgICAgc3RhdGljX2Fzc2VydChDb21wbGV0aW9uSGFuZGxlclZhbGlkYXRpb246OnRlbXBsYXRl IG1hdGNoaW5nVHlwZXM8Q29tcGxldGlvbkhhbmRsZXJGcm9tTUYsIHR5cGVuYW1lIFQ6OkFzeW5j UmVwbHk+KCkpOwogCi0gICAgbG9nTWVzc2FnZShjb25uZWN0aW9uLCBUOjpuYW1lKCksICphcmd1 bWVudHMpOworICAgIGxvZ01lc3NhZ2UoY29ubmVjdGlvbiwgVDo6bmFtZSgpLCBvYmplY3QsICph cmd1bWVudHMpOwogICAgIGNhbGxNZW1iZXJGdW5jdGlvbihjb25uZWN0aW9uLCBXVEZNb3ZlKCph cmd1bWVudHMpLAogICAgICAgICBDb21wbGV0aW9uSGFuZGxlckZyb21NRiB7IFtsaXN0ZW5lcklE ID0gKmxpc3RlbmVySUQsIGNvbm5lY3Rpb24gPSBSZWYgeyBjb25uZWN0aW9uIH1dIChhdXRvJiYu Li4gYXJncykgbXV0YWJsZSB7CiAgICAgICAgICAgICBhdXRvIGVuY29kZXIgPSBtYWtlVW5pcXVl UmVmPEVuY29kZXI+KFQ6OmFzeW5jTWVzc2FnZVJlcGx5TmFtZSgpLCBsaXN0ZW5lcklEKTsK 458326 2022-04-25 21:46:37 -0700 2022-04-26 09:00:34 -0700 Patch bug-239754-20220425214636.patch text/plain 9015 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRhNGQ5ZTliZjZlNjNiYmNj ZmVmMDhkZDQ4Yjc4Y2FhYWYxNTlhYjEuLmE2MDljYTFmMTU1NWU4YWQ5NThjNWQxMDBhOTZjNjkz ODczZDJiZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjItMDQtMjUgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG9iamVjdCBhZGRy ZXNzZXMgdG8gSVBDIGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzOTc1NAorCisgICAgICAgIFJldmlld2VkIGJ5IENhbWVyb24gTWNDb3Jt YWNrLgorCisgICAgICAgIEl0J3MgdXNlZnVsIGlmIElQQyBsb2dnaW5nIHNob3dzIHRoZSByZWNl aXZlciBhZGRyZXNzLCBzbyB5b3UgY2FuIGRpc3Rpbmd1aXNoIGRpZmZlcmVudAorICAgICAgICBy ZWNlaXZlcnMuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvSGFuZGxlTWVzc2FnZS5oOgorICAg ICAgICAoSVBDOjp0ZXh0U3RyZWFtRm9yTG9nZ2luZyk6CisgICAgICAgIChJUEM6OmxvZ01lc3Nh Z2VJbXBsKToKKyAgICAgICAgKElQQzo6bG9nTWVzc2FnZSk6CisgICAgICAgIChJUEM6OmxvZ1Jl cGx5KToKKyAgICAgICAgKElQQzo6aGFuZGxlTWVzc2FnZSk6CisgICAgICAgIChJUEM6OmhhbmRs ZU1lc3NhZ2VXYW50c0Nvbm5lY3Rpb24pOgorICAgICAgICAoSVBDOjpoYW5kbGVNZXNzYWdlU3lu Y2hyb25vdXMpOgorICAgICAgICAoSVBDOjpoYW5kbGVNZXNzYWdlU3luY2hyb25vdXNXYW50c0Nv bm5lY3Rpb24pOgorICAgICAgICAoSVBDOjpoYW5kbGVNZXNzYWdlQXN5bmMpOgorICAgICAgICAo SVBDOjpoYW5kbGVNZXNzYWdlQXN5bmNXYW50c0Nvbm5lY3Rpb24pOgorCiAyMDIyLTA0LTI1ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBjcmFz aGVzIHVuZGVyIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjphcHBseUJhY2tpbmdTdG9yZVRvTGF5 ZXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvSGFuZGxlTWVzc2Fn ZS5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvSGFuZGxlTWVzc2FnZS5oCmluZGV4IDA4 ZDg5NWYyZjc1NTZkNjY3OGQzNjdlNzU2NGNmMGI2ZmM1MzAwODIuLjczM2FkMWFkNDc2NGE2NGU1 ZGNjYTQ1ZWIzMDc3MzY1NmQwYTQzMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZv cm0vSVBDL0hhbmRsZU1lc3NhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9I YW5kbGVNZXNzYWdlLmgKQEAgLTUwLDcgKzUwLDcgQEAgY29uc3RleHByIHVuc2lnbmVkIGxvZ2dp bmdDb250YWluZXJTaXplTGltaXQgPSAyMDA7CiAjaWYgIUxPR19ESVNBQkxFRAogZW51bSBjbGFz cyBGb3JSZXBseSA6IGJvb2wgeyBObywgWWVzIH07CiAKLWlubGluZSBUZXh0U3RyZWFtIHRleHRT dHJlYW1Gb3JMb2dnaW5nKGNvbnN0IENvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIE1lc3NhZ2VOYW1l IG1lc3NhZ2VOYW1lLCBGb3JSZXBseSBmb3JSZXBseSkKK2lubGluZSBUZXh0U3RyZWFtIHRleHRT dHJlYW1Gb3JMb2dnaW5nKGNvbnN0IENvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIE1lc3NhZ2VOYW1l IG1lc3NhZ2VOYW1lLCB2b2lkKiBvYmplY3QsIEZvclJlcGx5IGZvclJlcGx5KQogewogICAgIFRl eHRTdHJlYW0gc3RyZWFtKFRleHRTdHJlYW06OkxpbmVNb2RlOjpTaW5nbGVMaW5lLCB7IH0sIGxv Z2dpbmdDb250YWluZXJTaXplTGltaXQpOwogICAgIHN0cmVhbSA8PCAnWyc7CkBAIC02MiwyMiAr NjIsMjggQEAgaW5saW5lIFRleHRTdHJlYW0gdGV4dFN0cmVhbUZvckxvZ2dpbmcoY29uc3QgQ29u bmVjdGlvbiYgY29ubmVjdGlvbiwgTWVzc2FnZU5hbWUKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFN KGNvbm5lY3Rpb24pOwogI2VuZGlmCi0gICAgYXV0byBhcnJvdyA9IGZvclJlcGx5ID09IEZvclJl cGx5OjpZZXMgPyAiPC0gIiA6ICItPiAiOwotICAgIHN0cmVhbSA8PCBhcnJvdyA8PCBXZWJDb3Jl Ojpwcm9jZXNzVHlwZURlc2NyaXB0aW9uKFdlYkNvcmU6OnByb2Nlc3NUeXBlKCkpIDw8ICcgJyA8 PCBnZXRDdXJyZW50UHJvY2Vzc0lEKCkgPDwgIl0gIiA8PCBkZXNjcmlwdGlvbihtZXNzYWdlTmFt ZSk7Ci0gICAgaWYgKGZvclJlcGx5ID09IEZvclJlcGx5OjpZZXMpCi0gICAgICAgIHN0cmVhbSA8 PCAiIFJlcGx5IjsKKworICAgIHN3aXRjaCAoZm9yUmVwbHkpIHsKKyAgICBjYXNlIEZvclJlcGx5 OjpObzoKKyAgICAgICAgc3RyZWFtIDw8ICItPiAiIDw8IFdlYkNvcmU6OnByb2Nlc3NUeXBlRGVz Y3JpcHRpb24oV2ViQ29yZTo6cHJvY2Vzc1R5cGUoKSkgPDwgJyAnIDw8IGdldEN1cnJlbnRQcm9j ZXNzSUQoKSA8PCAiIHJlY2VpdmVyICIgPDwgb2JqZWN0IDw8ICJdICIgPDwgZGVzY3JpcHRpb24o bWVzc2FnZU5hbWUpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZvclJlcGx5OjpZZXM6Cisg ICAgICAgIHN0cmVhbSA8PCAiPC0gIiA8PCBXZWJDb3JlOjpwcm9jZXNzVHlwZURlc2NyaXB0aW9u KFdlYkNvcmU6OnByb2Nlc3NUeXBlKCkpIDw8ICcgJyA8PCBnZXRDdXJyZW50UHJvY2Vzc0lEKCkg PDwgIl0gIiA8PCBkZXNjcmlwdGlvbihtZXNzYWdlTmFtZSkgPDwgIiBSZXBseSI7CisgICAgICAg IGJyZWFrOworICAgIH0KKwogICAgIHJldHVybiBzdHJlYW07CiB9CiAjZW5kaWYKIAogdGVtcGxh dGU8dHlwZW5hbWUgQXJnc1R1cGxlLCBzaXplX3QuLi4gQXJnc0luZGV4Pgotdm9pZCBsb2dNZXNz YWdlSW1wbChjb25zdCBDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBNZXNzYWdlTmFtZSBtZXNzYWdl TmFtZSwgY29uc3QgQXJnc1R1cGxlJiBhcmdzLCBzdGQ6OmluZGV4X3NlcXVlbmNlPEFyZ3NJbmRl eC4uLj4pCit2b2lkIGxvZ01lc3NhZ2VJbXBsKGNvbnN0IENvbm5lY3Rpb24mIGNvbm5lY3Rpb24s IE1lc3NhZ2VOYW1lIG1lc3NhZ2VOYW1lLCB2b2lkKiBvYmplY3QsIGNvbnN0IEFyZ3NUdXBsZSYg YXJncywgc3RkOjppbmRleF9zZXF1ZW5jZTxBcmdzSW5kZXguLi4+KQogewogI2lmICFMT0dfRElT QUJMRUQKICAgICBpZiAoTE9HX0NIQU5ORUwoSVBDTWVzc2FnZXMpLnN0YXRlICE9IFdURkxvZ0No YW5uZWxTdGF0ZTo6T24pCiAgICAgICAgIHJldHVybjsKIAotICAgIGF1dG8gc3RyZWFtID0gdGV4 dFN0cmVhbUZvckxvZ2dpbmcoY29ubmVjdGlvbiwgbWVzc2FnZU5hbWUsIEZvclJlcGx5OjpObyk7 CisgICAgYXV0byBzdHJlYW0gPSB0ZXh0U3RyZWFtRm9yTG9nZ2luZyhjb25uZWN0aW9uLCBtZXNz YWdlTmFtZSwgb2JqZWN0LCBGb3JSZXBseTo6Tm8pOwogCiAgICAgaWYgKGF1dG8gYXJndW1lbnRE ZXNjcmlwdGlvbnMgPSBtZXNzYWdlQXJndW1lbnREZXNjcmlwdGlvbnMobWVzc2FnZU5hbWUpKQog ICAgICAgICAoc3RyZWFtLmR1bXBQcm9wZXJ0eSgoKmFyZ3VtZW50RGVzY3JpcHRpb25zKVtBcmdz SW5kZXhdLm5hbWUsIFZhbHVlT3JFbGxpcHNpcyhzdGQ6OmdldDxBcmdzSW5kZXg+KGFyZ3MpKSks IC4uLik7CkBAIC05MSw5ICs5Nyw5IEBAIHZvaWQgbG9nTWVzc2FnZUltcGwoY29uc3QgQ29ubmVj dGlvbiYgY29ubmVjdGlvbiwgTWVzc2FnZU5hbWUgbWVzc2FnZU5hbWUsIGNvbnN0CiB9CiAKIHRl bXBsYXRlPHR5cGVuYW1lIEFyZ3NUdXBsZSwgdHlwZW5hbWUgQXJnc0luZGljZXMgPSBzdGQ6Om1h a2VfaW5kZXhfc2VxdWVuY2U8c3RkOjp0dXBsZV9zaXplPEFyZ3NUdXBsZT46OnZhbHVlPj4KLXZv aWQgbG9nTWVzc2FnZShjb25zdCBDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBNZXNzYWdlTmFtZSBt ZXNzYWdlTmFtZSwgY29uc3QgQXJnc1R1cGxlJiBhcmdzKQordm9pZCBsb2dNZXNzYWdlKGNvbnN0 IENvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIE1lc3NhZ2VOYW1lIG1lc3NhZ2VOYW1lLCB2b2lkKiBv YmplY3QsIGNvbnN0IEFyZ3NUdXBsZSYgYXJncykKIHsKLSAgICBsb2dNZXNzYWdlSW1wbChjb25u ZWN0aW9uLCBtZXNzYWdlTmFtZSwgYXJncywgQXJnc0luZGljZXMoKSk7CisgICAgbG9nTWVzc2Fn ZUltcGwoY29ubmVjdGlvbiwgbWVzc2FnZU5hbWUsIG9iamVjdCwgYXJncywgQXJnc0luZGljZXMo KSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lLi4uIFQ+CkBAIC0xMDMsNyArMTA5LDcgQEAgdm9p ZCBsb2dSZXBseShjb25zdCBDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBNZXNzYWdlTmFtZSBtZXNz YWdlTmFtZSwgY29uc3QgVCYuLi4KICAgICBpZiAoIXNpemVvZi4uLihUKSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgYXV0byBzdHJlYW0gPSB0ZXh0U3RyZWFtRm9yTG9nZ2luZyhjb25uZWN0aW9u LCBtZXNzYWdlTmFtZSwgRm9yUmVwbHk6Olllcyk7CisgICAgYXV0byBzdHJlYW0gPSB0ZXh0U3Ry ZWFtRm9yTG9nZ2luZyhjb25uZWN0aW9uLCBtZXNzYWdlTmFtZSwgbnVsbHB0ciwgRm9yUmVwbHk6 Olllcyk7CiAKICAgICB1bnNpZ25lZCBhcmdJbmRleCA9IDA7CiAgICAgaWYgKGF1dG8gYXJndW1l bnREZXNjcmlwdGlvbnMgPSBtZXNzYWdlUmVwbHlBcmd1bWVudERlc2NyaXB0aW9ucyhtZXNzYWdl TmFtZSkpCkBAIC0yNDksNyArMjU1LDcgQEAgdm9pZCBoYW5kbGVNZXNzYWdlKENvbm5lY3Rpb24m IGNvbm5lY3Rpb24sIERlY29kZXImIGRlY29kZXIsIEMqIG9iamVjdCwgTUYgZnVuY3QKICAgICBp ZiAoVU5MSUtFTFkoIWFyZ3VtZW50cykpCiAgICAgICAgIHJldHVybjsKIAotICAgIGxvZ01lc3Nh Z2UoY29ubmVjdGlvbiwgVDo6bmFtZSgpLCAqYXJndW1lbnRzKTsKKyAgICBsb2dNZXNzYWdlKGNv bm5lY3Rpb24sIFQ6Om5hbWUoKSwgb2JqZWN0LCAqYXJndW1lbnRzKTsKICAgICBjYWxsTWVtYmVy RnVuY3Rpb24oV1RGTW92ZSgqYXJndW1lbnRzKSwgb2JqZWN0LCBmdW5jdGlvbik7CiB9CiAKQEAg LTI2MCw3ICsyNjYsNyBAQCB2b2lkIGhhbmRsZU1lc3NhZ2VXYW50c0Nvbm5lY3Rpb24oQ29ubmVj dGlvbiYgY29ubmVjdGlvbiwgRGVjb2RlciYgZGVjb2RlciwgQyogbwogICAgIGlmIChVTkxJS0VM WSghYXJndW1lbnRzKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbG9nTWVzc2FnZShjb25uZWN0 aW9uLCBUOjpuYW1lKCksICphcmd1bWVudHMpOworICAgIGxvZ01lc3NhZ2UoY29ubmVjdGlvbiwg VDo6bmFtZSgpLCBvYmplY3QsICphcmd1bWVudHMpOwogICAgIGNhbGxNZW1iZXJGdW5jdGlvbihj b25uZWN0aW9uLCBXVEZNb3ZlKCphcmd1bWVudHMpLCBvYmplY3QsIGZ1bmN0aW9uKTsKIH0KIApA QCAtMjc0LDcgKzI4MCw3IEBAIGJvb2wgaGFuZGxlTWVzc2FnZVN5bmNocm9ub3VzKENvbm5lY3Rp b24mIGNvbm5lY3Rpb24sIERlY29kZXImIGRlY29kZXIsIFVuaXF1ZVJlCiAgICAgdXNpbmcgQ29t cGxldGlvbkhhbmRsZXJGcm9tTUYgPSB0eXBlbmFtZSBDb21wbGV0aW9uSGFuZGxlclR5cGVEZWR1 Y3Rpb248TUY+Ojp0ZW1wbGF0ZSBUeXBlPHN0ZDo6dHVwbGVfc2l6ZV92PHR5cGVuYW1lIFQ6OkFy Z3VtZW50cz4+OwogICAgIHN0YXRpY19hc3NlcnQoQ29tcGxldGlvbkhhbmRsZXJWYWxpZGF0aW9u Ojp0ZW1wbGF0ZSBtYXRjaGluZ1R5cGVzPENvbXBsZXRpb25IYW5kbGVyRnJvbU1GLCB0eXBlbmFt ZSBUOjpEZWxheWVkUmVwbHk+KCkpOwogCi0gICAgbG9nTWVzc2FnZShjb25uZWN0aW9uLCBUOjpu YW1lKCksICphcmd1bWVudHMpOworICAgIGxvZ01lc3NhZ2UoY29ubmVjdGlvbiwgVDo6bmFtZSgp LCBvYmplY3QsICphcmd1bWVudHMpOwogICAgIGNhbGxNZW1iZXJGdW5jdGlvbihXVEZNb3ZlKCph cmd1bWVudHMpLAogICAgICAgICBDb21wbGV0aW9uSGFuZGxlckZyb21NRihbcmVwbHlFbmNvZGVy ID0gV1RGTW92ZShyZXBseUVuY29kZXIpLCBjb25uZWN0aW9uID0gUmVmIHsgY29ubmVjdGlvbiB9 XSAoYXV0byYmLi4uIGFyZ3MpIG11dGFibGUgewogICAgICAgICAgICAgbG9nUmVwbHkoY29ubmVj dGlvbiwgVDo6bmFtZSgpLCBhcmdzLi4uKTsKQEAgLTI5NSw3ICszMDEsNyBAQCBib29sIGhhbmRs ZU1lc3NhZ2VTeW5jaHJvbm91c1dhbnRzQ29ubmVjdGlvbihDb25uZWN0aW9uJiBjb25uZWN0aW9u LCBEZWNvZGVyJiBkZQogICAgIHVzaW5nIENvbXBsZXRpb25IYW5kbGVyRnJvbU1GID0gdHlwZW5h bWUgQ29tcGxldGlvbkhhbmRsZXJUeXBlRGVkdWN0aW9uPE1GPjo6dGVtcGxhdGUgVHlwZTwxICsg c3RkOjp0dXBsZV9zaXplX3Y8dHlwZW5hbWUgVDo6QXJndW1lbnRzPj47CiAgICAgc3RhdGljX2Fz c2VydChDb21wbGV0aW9uSGFuZGxlclZhbGlkYXRpb246OnRlbXBsYXRlIG1hdGNoaW5nVHlwZXM8 Q29tcGxldGlvbkhhbmRsZXJGcm9tTUYsIHR5cGVuYW1lIFQ6OkRlbGF5ZWRSZXBseT4oKSk7CiAK LSAgICBsb2dNZXNzYWdlKGNvbm5lY3Rpb24sIFQ6Om5hbWUoKSwgKmFyZ3VtZW50cyk7CisgICAg bG9nTWVzc2FnZShjb25uZWN0aW9uLCBUOjpuYW1lKCksIG9iamVjdCwgKmFyZ3VtZW50cyk7CiAg ICAgY2FsbE1lbWJlckZ1bmN0aW9uKGNvbm5lY3Rpb24sIFdURk1vdmUoKmFyZ3VtZW50cyksCiAg ICAgICAgIENvbXBsZXRpb25IYW5kbGVyRnJvbU1GKFtyZXBseUVuY29kZXIgPSBXVEZNb3ZlKHJl cGx5RW5jb2RlciksIGNvbm5lY3Rpb24gPSBSZWYgeyBjb25uZWN0aW9uIH1dIChhdXRvJiYuLi4g YXJncykgbXV0YWJsZSB7CiAgICAgICAgICAgICBsb2dSZXBseShjb25uZWN0aW9uLCBUOjpuYW1l KCksIGFyZ3MuLi4pOwpAQCAtMzIwLDcgKzMyNiw3IEBAIHZvaWQgaGFuZGxlTWVzc2FnZVN5bmNo cm9ub3VzKFN0cmVhbVNlcnZlckNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIERlY29kZXImIGRlY29k CiAgICAgdXNpbmcgQ29tcGxldGlvbkhhbmRsZXJGcm9tTUYgPSB0eXBlbmFtZSBDb21wbGV0aW9u SGFuZGxlclR5cGVEZWR1Y3Rpb248TUY+Ojp0ZW1wbGF0ZSBUeXBlPHN0ZDo6dHVwbGVfc2l6ZV92 PHR5cGVuYW1lIFQ6OkFyZ3VtZW50cz4+OwogICAgIHN0YXRpY19hc3NlcnQoQ29tcGxldGlvbkhh bmRsZXJWYWxpZGF0aW9uOjp0ZW1wbGF0ZSBtYXRjaGluZ1R5cGVzPENvbXBsZXRpb25IYW5kbGVy RnJvbU1GLCB0eXBlbmFtZSBUOjpEZWxheWVkUmVwbHk+KCkpOwogCi0gICAgbG9nTWVzc2FnZShj b25uZWN0aW9uLmNvbm5lY3Rpb24oKSwgVDo6bmFtZSgpLCAqYXJndW1lbnRzKTsKKyAgICBsb2dN ZXNzYWdlKGNvbm5lY3Rpb24uY29ubmVjdGlvbigpLCBUOjpuYW1lKCksIG9iamVjdCwgKmFyZ3Vt ZW50cyk7CiAgICAgY2FsbE1lbWJlckZ1bmN0aW9uKFdURk1vdmUoKmFyZ3VtZW50cyksCiAgICAg ICAgIENvbXBsZXRpb25IYW5kbGVyRnJvbU1GKFtzeW5jUmVxdWVzdElELCBjb25uZWN0aW9uID0g UmVmIHsgY29ubmVjdGlvbiB9XSAoYXV0byYmLi4uIGFyZ3MpIG11dGFibGUgewogICAgICAgICAg ICAgbG9nUmVwbHkoY29ubmVjdGlvbi0+Y29ubmVjdGlvbigpLCBUOjpuYW1lKCksIGFyZ3MuLi4p OwpAQCAtMzQzLDcgKzM0OSw3IEBAIHZvaWQgaGFuZGxlTWVzc2FnZUFzeW5jKENvbm5lY3Rpb24m IGNvbm5lY3Rpb24sIERlY29kZXImIGRlY29kZXIsIEMqIG9iamVjdCwgTUYKICAgICB1c2luZyBD b21wbGV0aW9uSGFuZGxlckZyb21NRiA9IHR5cGVuYW1lIENvbXBsZXRpb25IYW5kbGVyVHlwZURl ZHVjdGlvbjxNRj46OnRlbXBsYXRlIFR5cGU8c3RkOjp0dXBsZV9zaXplX3Y8dHlwZW5hbWUgVDo6 QXJndW1lbnRzPj47CiAgICAgc3RhdGljX2Fzc2VydChDb21wbGV0aW9uSGFuZGxlclZhbGlkYXRp b246OnRlbXBsYXRlIG1hdGNoaW5nVHlwZXM8Q29tcGxldGlvbkhhbmRsZXJGcm9tTUYsIHR5cGVu YW1lIFQ6OkFzeW5jUmVwbHk+KCkpOwogCi0gICAgbG9nTWVzc2FnZShjb25uZWN0aW9uLCBUOjpu YW1lKCksICphcmd1bWVudHMpOworICAgIGxvZ01lc3NhZ2UoY29ubmVjdGlvbiwgVDo6bmFtZSgp LCBvYmplY3QsICphcmd1bWVudHMpOwogICAgIGNhbGxNZW1iZXJGdW5jdGlvbihXVEZNb3ZlKCph cmd1bWVudHMpLAogICAgICAgICBDb21wbGV0aW9uSGFuZGxlckZyb21NRiB7IFtsaXN0ZW5lcklE ID0gKmxpc3RlbmVySUQsIGNvbm5lY3Rpb24gPSBSZWYgeyBjb25uZWN0aW9uIH1dIChhdXRvJiYu Li4gYXJncykgbXV0YWJsZSB7CiAgICAgICAgICAgICBhdXRvIGVuY29kZXIgPSBtYWtlVW5pcXVl UmVmPEVuY29kZXI+KFQ6OmFzeW5jTWVzc2FnZVJlcGx5TmFtZSgpLCBsaXN0ZW5lcklEKTsKQEAg LTM2OCw3ICszNzQsNyBAQCB2b2lkIGhhbmRsZU1lc3NhZ2VBc3luY1dhbnRzQ29ubmVjdGlvbihD b25uZWN0aW9uJiBjb25uZWN0aW9uLCBEZWNvZGVyJiBkZWNvZGVyLAogICAgIHVzaW5nIENvbXBs ZXRpb25IYW5kbGVyRnJvbU1GID0gdHlwZW5hbWUgQ29tcGxldGlvbkhhbmRsZXJUeXBlRGVkdWN0 aW9uPE1GPjo6dGVtcGxhdGUgVHlwZTwxICsgc3RkOjp0dXBsZV9zaXplX3Y8dHlwZW5hbWUgVDo6 QXJndW1lbnRzPj47CiAgICAgc3RhdGljX2Fzc2VydChDb21wbGV0aW9uSGFuZGxlclZhbGlkYXRp b246OnRlbXBsYXRlIG1hdGNoaW5nVHlwZXM8Q29tcGxldGlvbkhhbmRsZXJGcm9tTUYsIHR5cGVu YW1lIFQ6OkFzeW5jUmVwbHk+KCkpOwogCi0gICAgbG9nTWVzc2FnZShjb25uZWN0aW9uLCBUOjpu YW1lKCksICphcmd1bWVudHMpOworICAgIGxvZ01lc3NhZ2UoY29ubmVjdGlvbiwgVDo6bmFtZSgp LCBvYmplY3QsICphcmd1bWVudHMpOwogICAgIGNhbGxNZW1iZXJGdW5jdGlvbihjb25uZWN0aW9u LCBXVEZNb3ZlKCphcmd1bWVudHMpLAogICAgICAgICBDb21wbGV0aW9uSGFuZGxlckZyb21NRiB7 IFtsaXN0ZW5lcklEID0gKmxpc3RlbmVySUQsIGNvbm5lY3Rpb24gPSBSZWYgeyBjb25uZWN0aW9u IH1dIChhdXRvJiYuLi4gYXJncykgbXV0YWJsZSB7CiAgICAgICAgICAgICBhdXRvIGVuY29kZXIg PSBtYWtlVW5pcXVlUmVmPEVuY29kZXI+KFQ6OmFzeW5jTWVzc2FnZVJlcGx5TmFtZSgpLCBsaXN0 ZW5lcklEKTsK