227080 2021-06-16 10:33:52 -0700 REGRESSION (r273329): Logging of most errors like CSP and promise rejections fail logging to the system console 2021-06-16 12:01:53 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 222279 1 timothy timothy cdumez esprehn+autocc ews-watchlist hi kangil.han mkwst webkit-bug-importer oldest_to_newest 1770258 0 timothy 2021-06-16 10:33:52 -0700 This regressed by bug 222279 (https://commits.webkit.org/r273329) since many places log directly through Document::addConsoleMessage() directly, they do not go through Document::didLogMessage(). 1770288 1 431569 timothy 2021-06-16 11:15:14 -0700 Created attachment 431569 Patch 1770289 2 431570 timothy 2021-06-16 11:16:39 -0700 Created attachment 431570 Patch 1770290 3 webkit-bug-importer 2021-06-16 11:17:32 -0700 <rdar://problem/79407076> 1770325 4 ews-feeder 2021-06-16 12:01:50 -0700 Committed r278947 (238876@main): <https://commits.webkit.org/238876@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431570. 431569 2021-06-16 11:15:14 -0700 2021-06-16 11:16:38 -0700 Patch bug-227080-20210616111513.patch text/plain 4637 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M0ZmQzOWYxYjdjYTQ2 ZTJkODRmYjhjZjY5NTQ1N2YxNWViODlhYy4uMjg3ODVlMmNkOWIzN2ExZTUyYTFmYzhkNzVmMWUx MTUxMjk0MjJlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA2LTE2ICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChy MjczMzI5KTogTG9nZ2luZyBvZiBtb3N0IGVycm9ycyBsaWtlIENTUCBhbmQgcHJvbWlzZSByZWpl Y3Rpb25zIGZhaWwgbG9nZ2luZyB0byB0aGUgc3lzdGVtIGNvbnNvbGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzA4MAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJldmVydCByMjczMzI5LgorCisgICAg ICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpkaWRM b2dNZXNzYWdlKToKKyAgICAgICAgKiBwYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlBhZ2VDb25zb2xlQ2xpZW50OjphZGRNZXNzYWdlKToKKwogMjAyMS0wNi0x NSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BV IFByb2Nlc3NdIEFkZCBhIGJvdW5kcyBjaGVjayBiZWZvcmUgcmVhZGluZyBkYXRhIGxlbmd0aCBm b3Igb3V0LW9mLWxpbmUgZGlzcGxheSBsaXN0IGl0ZW1zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApp bmRleCBmNDJhNTU4OTk1OWYyMjRmMDk2YjIzMTdjNWMxZGFlNGY4OGQzN2IwLi42MDgwY2NjMGYy NzU0NDQyYWI4ZmI4ZDZiZjNkNDY5ODRjMDdiNjVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAK QEAgLTI1NywxMCArMjU3LDggQEAKICNpbmNsdWRlICJYUGF0aEV4cHJlc3Npb24uaCIKICNpbmNs dWRlICJYUGF0aE5TUmVzb2x2ZXIuaCIKICNpbmNsdWRlICJYUGF0aFJlc3VsdC5oIgotI2luY2x1 ZGUgPEphdmFTY3JpcHRDb3JlL0NvbnNvbGVDbGllbnQuaD4KICNpbmNsdWRlIDxKYXZhU2NyaXB0 Q29yZS9Db25zb2xlTWVzc2FnZS5oPgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL1JlZ3VsYXJF eHByZXNzaW9uLmg+Ci0jaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvU2NyaXB0QXJndW1lbnRzLmg+ CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvU2NyaXB0Q2FsbFN0YWNrLmg+CiAjaW5jbHVkZSA8 SmF2YVNjcmlwdENvcmUvVk0uaD4KICNpbmNsdWRlIDxjdGltZT4KQEAgLTg1MDMsMjAgKzg1MDEs MTMgQEAgdm9pZCBEb2N1bWVudDo6ZGlkTG9nTWVzc2FnZShjb25zdCBXVEZMb2dDaGFubmVsJiBj aGFubmVsLCBXVEZMb2dMZXZlbCBsZXZlbCwgVmUKICAgICBpZiAobWVzc2FnZVNvdXJjZSA9PSBN ZXNzYWdlU291cmNlOjpPdGhlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgYXV0byBtZXNzYWdl TGV2ZWwgPSBtZXNzYWdlTGV2ZWxGcm9tV1RGTG9nTGV2ZWwobGV2ZWwpOwotICAgIGF1dG8gbWVz c2FnZSA9IG1ha2VVbmlxdWU8SW5zcGVjdG9yOjpDb25zb2xlTWVzc2FnZT4obWVzc2FnZVNvdXJj ZSwgTWVzc2FnZVR5cGU6OkxvZywgbWVzc2FnZUxldmVsLCBXVEZNb3ZlKGxvZ01lc3NhZ2VzKSwg bWFpbldvcmxkRXhlY1N0YXRlKGZyYW1lKCkpKTsKLQotICAgIGlmIChVTkxJS0VMWShwYWdlLT5z ZXR0aW5ncygpLmxvZ3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkKCkgfHwgUGFn ZUNvbnNvbGVDbGllbnQ6OnNob3VsZFByaW50RXhjZXB0aW9ucygpKSkgewotICAgICAgICBpZiAo bWVzc2FnZS0+dHlwZSgpID09IE1lc3NhZ2VUeXBlOjpJbWFnZSkgewotICAgICAgICAgICAgQVNT RVJUKG1lc3NhZ2UtPmFyZ3VtZW50cygpKTsKLSAgICAgICAgICAgIEpTQzo6Q29uc29sZUNsaWVu dDo6cHJpbnRDb25zb2xlTWVzc2FnZVdpdGhBcmd1bWVudHMobWVzc2FnZS0+c291cmNlKCksIG1l c3NhZ2UtPnR5cGUoKSwgbWVzc2FnZS0+bGV2ZWwoKSwgbWVzc2FnZS0+YXJndW1lbnRzKCktPmds b2JhbE9iamVjdCgpLCAqbWVzc2FnZS0+YXJndW1lbnRzKCkpOwotICAgICAgICB9IGVsc2UKLSAg ICAgICAgICAgIEpTQzo6Q29uc29sZUNsaWVudDo6cHJpbnRDb25zb2xlTWVzc2FnZShtZXNzYWdl LT5zb3VyY2UoKSwgbWVzc2FnZS0+dHlwZSgpLCBtZXNzYWdlLT5sZXZlbCgpLCBtZXNzYWdlLT50 b1N0cmluZygpLCBtZXNzYWdlLT51cmwoKSwgbWVzc2FnZS0+bGluZSgpLCBtZXNzYWdlLT5jb2x1 bW4oKSk7Ci0gICAgfQotCi0gICAgZXZlbnRMb29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6Oklu dGVybmFsQXN5bmNUYXNrLCBbd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyksIG1lc3NhZ2Ug PSBXVEZNb3ZlKG1lc3NhZ2UpXSgpIG11dGFibGUgeworICAgIGV2ZW50TG9vcCgpLnF1ZXVlVGFz ayhUYXNrU291cmNlOjpJbnRlcm5hbEFzeW5jVGFzaywgW3dlYWtUaGlzID0gbWFrZVdlYWtQdHIo KnRoaXMpLCBsZXZlbCwgbWVzc2FnZVNvdXJjZSwgbG9nTWVzc2FnZXMgPSBXVEZNb3ZlKGxvZ01l c3NhZ2VzKV0oKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCF3ZWFrVGhpcyB8fCAhd2Vha1RoaXMt PnBhZ2UoKSkKICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBhdXRvIG1lc3NhZ2VMZXZl bCA9IG1lc3NhZ2VMZXZlbEZyb21XVEZMb2dMZXZlbChsZXZlbCk7CisgICAgICAgIGF1dG8gbWVz c2FnZSA9IG1ha2VVbmlxdWU8SW5zcGVjdG9yOjpDb25zb2xlTWVzc2FnZT4obWVzc2FnZVNvdXJj ZSwgTWVzc2FnZVR5cGU6OkxvZywgbWVzc2FnZUxldmVsLCBXVEZNb3ZlKGxvZ01lc3NhZ2VzKSwg bWFpbldvcmxkRXhlY1N0YXRlKHdlYWtUaGlzLT5mcmFtZSgpKSk7CisKICAgICAgICAgd2Vha1Ro aXMtPmFkZENvbnNvbGVNZXNzYWdlKFdURk1vdmUobWVzc2FnZSkpOwogICAgIH0pOwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZUNsaWVudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcAppbmRleCBlNzE2NjBlMWYyMmVk ZDljYWU4YjhkM2I3MjFkMGQ1NDc3Y2NkNjdjLi41NTNhMWNmZDc5ZTIwMTkzNjZmM2VjMzcwYzgz Yzk4MzhkMzExOTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25zb2xl Q2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNw cApAQCAtMTI3LDYgKzEyNywxNCBAQCB2b2lkIFBhZ2VDb25zb2xlQ2xpZW50OjphZGRNZXNzYWdl KHN0ZDo6dW5pcXVlX3B0cjxJbnNwZWN0b3I6OkNvbnNvbGVNZXNzYWdlPiYmCiAgICAgICAgIH0g ZWxzZQogICAgICAgICAgICAgbWVzc2FnZSA9IGNvbnNvbGVNZXNzYWdlLT5tZXNzYWdlKCk7CiAg ICAgICAgIG1fcGFnZS5jaHJvbWUoKS5jbGllbnQoKS5hZGRNZXNzYWdlVG9Db25zb2xlKGNvbnNv bGVNZXNzYWdlLT5zb3VyY2UoKSwgY29uc29sZU1lc3NhZ2UtPmxldmVsKCksIG1lc3NhZ2UsIGNv bnNvbGVNZXNzYWdlLT5saW5lKCksIGNvbnNvbGVNZXNzYWdlLT5jb2x1bW4oKSwgY29uc29sZU1l c3NhZ2UtPnVybCgpKTsKKworICAgICAgICBpZiAoVU5MSUtFTFkobV9wYWdlLnNldHRpbmdzKCku bG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQoKSB8fCBzaG91bGRQcmludEV4 Y2VwdGlvbnMoKSkpIHsKKyAgICAgICAgICAgIGlmIChjb25zb2xlTWVzc2FnZS0+dHlwZSgpID09 IE1lc3NhZ2VUeXBlOjpJbWFnZSkgeworICAgICAgICAgICAgICAgIEFTU0VSVChjb25zb2xlTWVz c2FnZS0+YXJndW1lbnRzKCkpOworICAgICAgICAgICAgICAgIENvbnNvbGVDbGllbnQ6OnByaW50 Q29uc29sZU1lc3NhZ2VXaXRoQXJndW1lbnRzKGNvbnNvbGVNZXNzYWdlLT5zb3VyY2UoKSwgY29u c29sZU1lc3NhZ2UtPnR5cGUoKSwgY29uc29sZU1lc3NhZ2UtPmxldmVsKCksIGNvbnNvbGVNZXNz YWdlLT5hcmd1bWVudHMoKS0+Z2xvYmFsT2JqZWN0KCksICpjb25zb2xlTWVzc2FnZS0+YXJndW1l bnRzKCkpOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgQ29uc29sZUNsaWVu dDo6cHJpbnRDb25zb2xlTWVzc2FnZShjb25zb2xlTWVzc2FnZS0+c291cmNlKCksIGNvbnNvbGVN ZXNzYWdlLT50eXBlKCksIGNvbnNvbGVNZXNzYWdlLT5sZXZlbCgpLCBjb25zb2xlTWVzc2FnZS0+ dG9TdHJpbmcoKSwgY29uc29sZU1lc3NhZ2UtPnVybCgpLCBjb25zb2xlTWVzc2FnZS0+bGluZSgp LCBjb25zb2xlTWVzc2FnZS0+Y29sdW1uKCkpOworICAgICAgICB9CiAgICAgfQogCiAgICAgSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKG1fcGFnZSwgV1RGTW92 ZShjb25zb2xlTWVzc2FnZSkpOwo= 431570 2021-06-16 11:16:39 -0700 2021-06-16 12:01:52 -0700 Patch bug-227080-20210616111639.patch text/plain 4613 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M0ZmQzOWYxYjdjYTQ2 ZTJkODRmYjhjZjY5NTQ1N2YxNWViODlhYy4uYzFhN2Y1YjNmZjliNGRkZDBhODEyN2U2MDA1Mzk3 MmZmOTkwYzA4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA2LTE2ICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChy MjczMzI5KTogTG9nZ2luZyBvZiBtb3N0IGVycm9ycyBsaWtlIENTUCBhbmQgcHJvbWlzZSByZWpl Y3Rpb25zIGZhaWwgbG9nZ2luZyB0byB0aGUgc3lzdGVtIGNvbnNvbGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzA4MAorCisgICAgICAgIFVucmV2 aWV3ZWQsIHJldmVydGluZyByMjczMzI5LgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpkaWRMb2dNZXNzYWdlKToKKyAgICAgICAgKiBw YWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDb25zb2xl Q2xpZW50OjphZGRNZXNzYWdlKToKKwogMjAyMS0wNi0xNSAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFByb2Nlc3NdIEFkZCBhIGJvdW5kcyBj aGVjayBiZWZvcmUgcmVhZGluZyBkYXRhIGxlbmd0aCBmb3Igb3V0LW9mLWxpbmUgZGlzcGxheSBs aXN0IGl0ZW1zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCBmNDJhNTU4OTk1OWYyMjRmMDk2 YjIzMTdjNWMxZGFlNGY4OGQzN2IwLi42MDgwY2NjMGYyNzU0NDQyYWI4ZmI4ZDZiZjNkNDY5ODRj MDdiNjVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTI1NywxMCArMjU3LDggQEAKICNp bmNsdWRlICJYUGF0aEV4cHJlc3Npb24uaCIKICNpbmNsdWRlICJYUGF0aE5TUmVzb2x2ZXIuaCIK ICNpbmNsdWRlICJYUGF0aFJlc3VsdC5oIgotI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0NvbnNv bGVDbGllbnQuaD4KICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9Db25zb2xlTWVzc2FnZS5oPgog I2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL1JlZ3VsYXJFeHByZXNzaW9uLmg+Ci0jaW5jbHVkZSA8 SmF2YVNjcmlwdENvcmUvU2NyaXB0QXJndW1lbnRzLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENv cmUvU2NyaXB0Q2FsbFN0YWNrLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvVk0uaD4KICNp bmNsdWRlIDxjdGltZT4KQEAgLTg1MDMsMjAgKzg1MDEsMTMgQEAgdm9pZCBEb2N1bWVudDo6ZGlk TG9nTWVzc2FnZShjb25zdCBXVEZMb2dDaGFubmVsJiBjaGFubmVsLCBXVEZMb2dMZXZlbCBsZXZl bCwgVmUKICAgICBpZiAobWVzc2FnZVNvdXJjZSA9PSBNZXNzYWdlU291cmNlOjpPdGhlcikKICAg ICAgICAgcmV0dXJuOwogCi0gICAgYXV0byBtZXNzYWdlTGV2ZWwgPSBtZXNzYWdlTGV2ZWxGcm9t V1RGTG9nTGV2ZWwobGV2ZWwpOwotICAgIGF1dG8gbWVzc2FnZSA9IG1ha2VVbmlxdWU8SW5zcGVj dG9yOjpDb25zb2xlTWVzc2FnZT4obWVzc2FnZVNvdXJjZSwgTWVzc2FnZVR5cGU6OkxvZywgbWVz c2FnZUxldmVsLCBXVEZNb3ZlKGxvZ01lc3NhZ2VzKSwgbWFpbldvcmxkRXhlY1N0YXRlKGZyYW1l KCkpKTsKLQotICAgIGlmIChVTkxJS0VMWShwYWdlLT5zZXR0aW5ncygpLmxvZ3NQYWdlTWVzc2Fn ZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkKCkgfHwgUGFnZUNvbnNvbGVDbGllbnQ6OnNob3VsZFBy aW50RXhjZXB0aW9ucygpKSkgewotICAgICAgICBpZiAobWVzc2FnZS0+dHlwZSgpID09IE1lc3Nh Z2VUeXBlOjpJbWFnZSkgewotICAgICAgICAgICAgQVNTRVJUKG1lc3NhZ2UtPmFyZ3VtZW50cygp KTsKLSAgICAgICAgICAgIEpTQzo6Q29uc29sZUNsaWVudDo6cHJpbnRDb25zb2xlTWVzc2FnZVdp dGhBcmd1bWVudHMobWVzc2FnZS0+c291cmNlKCksIG1lc3NhZ2UtPnR5cGUoKSwgbWVzc2FnZS0+ bGV2ZWwoKSwgbWVzc2FnZS0+YXJndW1lbnRzKCktPmdsb2JhbE9iamVjdCgpLCAqbWVzc2FnZS0+ YXJndW1lbnRzKCkpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIEpTQzo6Q29uc29sZUNs aWVudDo6cHJpbnRDb25zb2xlTWVzc2FnZShtZXNzYWdlLT5zb3VyY2UoKSwgbWVzc2FnZS0+dHlw ZSgpLCBtZXNzYWdlLT5sZXZlbCgpLCBtZXNzYWdlLT50b1N0cmluZygpLCBtZXNzYWdlLT51cmwo KSwgbWVzc2FnZS0+bGluZSgpLCBtZXNzYWdlLT5jb2x1bW4oKSk7Ci0gICAgfQotCi0gICAgZXZl bnRMb29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6OkludGVybmFsQXN5bmNUYXNrLCBbd2Vha1Ro aXMgPSBtYWtlV2Vha1B0cigqdGhpcyksIG1lc3NhZ2UgPSBXVEZNb3ZlKG1lc3NhZ2UpXSgpIG11 dGFibGUgeworICAgIGV2ZW50TG9vcCgpLnF1ZXVlVGFzayhUYXNrU291cmNlOjpJbnRlcm5hbEFz eW5jVGFzaywgW3dlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBsZXZlbCwgbWVzc2FnZVNv dXJjZSwgbG9nTWVzc2FnZXMgPSBXVEZNb3ZlKGxvZ01lc3NhZ2VzKV0oKSBtdXRhYmxlIHsKICAg ICAgICAgaWYgKCF3ZWFrVGhpcyB8fCAhd2Vha1RoaXMtPnBhZ2UoKSkKICAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICBhdXRvIG1lc3NhZ2VMZXZlbCA9IG1lc3NhZ2VMZXZlbEZyb21XVEZM b2dMZXZlbChsZXZlbCk7CisgICAgICAgIGF1dG8gbWVzc2FnZSA9IG1ha2VVbmlxdWU8SW5zcGVj dG9yOjpDb25zb2xlTWVzc2FnZT4obWVzc2FnZVNvdXJjZSwgTWVzc2FnZVR5cGU6OkxvZywgbWVz c2FnZUxldmVsLCBXVEZNb3ZlKGxvZ01lc3NhZ2VzKSwgbWFpbldvcmxkRXhlY1N0YXRlKHdlYWtU aGlzLT5mcmFtZSgpKSk7CisKICAgICAgICAgd2Vha1RoaXMtPmFkZENvbnNvbGVNZXNzYWdlKFdU Rk1vdmUobWVzc2FnZSkpOwogICAgIH0pOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlQ29uc29sZUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25z b2xlQ2xpZW50LmNwcAppbmRleCBlNzE2NjBlMWYyMmVkZDljYWU4YjhkM2I3MjFkMGQ1NDc3Y2Nk NjdjLi41NTNhMWNmZDc5ZTIwMTkzNjZmM2VjMzcwYzgzYzk4MzhkMzExOTczIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcApAQCAtMTI3LDYgKzEyNywxNCBAQCB2 b2lkIFBhZ2VDb25zb2xlQ2xpZW50OjphZGRNZXNzYWdlKHN0ZDo6dW5pcXVlX3B0cjxJbnNwZWN0 b3I6OkNvbnNvbGVNZXNzYWdlPiYmCiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgbWVzc2Fn ZSA9IGNvbnNvbGVNZXNzYWdlLT5tZXNzYWdlKCk7CiAgICAgICAgIG1fcGFnZS5jaHJvbWUoKS5j bGllbnQoKS5hZGRNZXNzYWdlVG9Db25zb2xlKGNvbnNvbGVNZXNzYWdlLT5zb3VyY2UoKSwgY29u c29sZU1lc3NhZ2UtPmxldmVsKCksIG1lc3NhZ2UsIGNvbnNvbGVNZXNzYWdlLT5saW5lKCksIGNv bnNvbGVNZXNzYWdlLT5jb2x1bW4oKSwgY29uc29sZU1lc3NhZ2UtPnVybCgpKTsKKworICAgICAg ICBpZiAoVU5MSUtFTFkobV9wYWdlLnNldHRpbmdzKCkubG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVt Q29uc29sZUVuYWJsZWQoKSB8fCBzaG91bGRQcmludEV4Y2VwdGlvbnMoKSkpIHsKKyAgICAgICAg ICAgIGlmIChjb25zb2xlTWVzc2FnZS0+dHlwZSgpID09IE1lc3NhZ2VUeXBlOjpJbWFnZSkgewor ICAgICAgICAgICAgICAgIEFTU0VSVChjb25zb2xlTWVzc2FnZS0+YXJndW1lbnRzKCkpOworICAg ICAgICAgICAgICAgIENvbnNvbGVDbGllbnQ6OnByaW50Q29uc29sZU1lc3NhZ2VXaXRoQXJndW1l bnRzKGNvbnNvbGVNZXNzYWdlLT5zb3VyY2UoKSwgY29uc29sZU1lc3NhZ2UtPnR5cGUoKSwgY29u c29sZU1lc3NhZ2UtPmxldmVsKCksIGNvbnNvbGVNZXNzYWdlLT5hcmd1bWVudHMoKS0+Z2xvYmFs T2JqZWN0KCksICpjb25zb2xlTWVzc2FnZS0+YXJndW1lbnRzKCkpOworICAgICAgICAgICAgfSBl bHNlCisgICAgICAgICAgICAgICAgQ29uc29sZUNsaWVudDo6cHJpbnRDb25zb2xlTWVzc2FnZShj b25zb2xlTWVzc2FnZS0+c291cmNlKCksIGNvbnNvbGVNZXNzYWdlLT50eXBlKCksIGNvbnNvbGVN ZXNzYWdlLT5sZXZlbCgpLCBjb25zb2xlTWVzc2FnZS0+dG9TdHJpbmcoKSwgY29uc29sZU1lc3Nh Z2UtPnVybCgpLCBjb25zb2xlTWVzc2FnZS0+bGluZSgpLCBjb25zb2xlTWVzc2FnZS0+Y29sdW1u KCkpOworICAgICAgICB9CiAgICAgfQogCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjph ZGRNZXNzYWdlVG9Db25zb2xlKG1fcGFnZSwgV1RGTW92ZShjb25zb2xlTWVzc2FnZSkpOwo=