222279 2021-02-22 11:07:33 -0800 Make system console logging synchronous 2021-06-16 11:34:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified REOPENED InRadar P2 Normal --- 227080 1 aboya aboya achristensen cdumez esprehn+autocc ews-watchlist kangil.han mkwst timothy webkit-bug-importer oldest_to_newest 1732212 0 aboya 2021-02-22 11:07:33 -0800 Previously, the logging of messages to the system console was done in PageConsoleClient::addMessage(), which was called by Document::addConsoleMessage(). The latter was called in a TaskQueue callback. This had the unfortunate side effect of adding a delay from the time a macro such as ALWAYS_LOG() is called and the text being printed to the console. This is particularly a problem when logging 3rd party libraries that don't use the WebKit logging API to log to stderr, such as GStreamer, since it causes messages logged by WebKit to not be synchronized with messages logged by 3rd party libraries or logging systems. As a consequence the usefulness of WebKit logs is noticeably reduced. This patch fixes the issue by moving the code logging to the system console to the synchronous part of Document::didLogMessage(), while still handling the rest in the m_logMessageTaskQueue callback. 1732215 1 421214 aboya 2021-02-22 11:11:39 -0800 Created attachment 421214 Patch 1732470 2 421294 aboya 2021-02-23 02:21:35 -0800 Created attachment 421294 Patch 1732645 3 ews-feeder 2021-02-23 12:10:01 -0800 Committed r273329: <https://commits.webkit.org/r273329> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421294. 1732646 4 webkit-bug-importer 2021-02-23 12:11:13 -0800 <rdar://problem/74654614> 1770235 5 timothy 2021-06-16 10:06:19 -0700 This change broke logging most errors like CSP and promise rejections to the system console. Those do not go through Document::didLogMessage(), they call Document::addConsoleMessage() directly. 1770260 6 timothy 2021-06-16 10:35:23 -0700 Re-opened since this is blocked by bug 227060. 1770263 7 timothy 2021-06-16 10:36:55 -0700 Re-opened since this is blocked by bug 227080. 1770299 8 aboya 2021-06-16 11:34:23 -0700 Can reproduce. Will investigate. 421214 2021-02-22 11:11:39 -0800 2021-02-23 02:21:31 -0800 Patch bug-222279-20210222201139.patch text/plain 5430 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzkxZmM0MmZmOWM5NmVk NWRmOGU0MTVhMzI3MWJhMmYzOTRkNjg1OS4uNjQ5ZmFiZWUyZTBiMmRjM2M1ODBjMGNkNWI4MTc4 ODdhZGI3NTc3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTAyLTIyICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBNYWtlIHN5c3Rl bSBjb25zb2xlIGxvZ2dpbmcgc3luY2hyb25vdXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjI3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFByZXZpb3VzbHksIHRoZSBsb2dnaW5nIG9mIG1lc3NhZ2Vz IHRvIHRoZSBzeXN0ZW0gY29uc29sZSB3YXMgZG9uZSBpbgorICAgICAgICBQYWdlQ29uc29sZUNs aWVudDo6YWRkTWVzc2FnZSgpLCB3aGljaCB3YXMgY2FsbGVkIGJ5CisgICAgICAgIERvY3VtZW50 OjphZGRDb25zb2xlTWVzc2FnZSgpLiBUaGUgbGF0dGVyIHdhcyBjYWxsZWQgaW4gYSBUYXNrUXVl dWUKKyAgICAgICAgY2FsbGJhY2suCisKKyAgICAgICAgVGhpcyBoYWQgdGhlIHVuZm9ydHVuYXRl IHNpZGUgZWZmZWN0IG9mIGFkZGluZyBhIGRlbGF5IGZyb20gdGhlIHRpbWUgYQorICAgICAgICBt YWNybyBzdWNoIGFzIEFMV0FZU19MT0coKSBpcyBjYWxsZWQgYW5kIHRoZSB0ZXh0IGJlaW5nIHBy aW50ZWQgdG8gdGhlCisgICAgICAgIGNvbnNvbGUuIFRoaXMgaXMgcGFydGljdWxhcmx5IGEgcHJv YmxlbSB3aGVuIGxvZ2dpbmcgM3JkIHBhcnR5CisgICAgICAgIGxpYnJhcmllcyB0aGF0IGRvbid0 IHVzZSB0aGUgV2ViS2l0IGxvZ2dpbmcgQVBJIHRvIGxvZyB0byBzdGRlcnIsIHN1Y2gKKyAgICAg ICAgYXMgR1N0cmVhbWVyLCBzaW5jZSBpdCBjYXVzZXMgbWVzc2FnZXMgbG9nZ2VkIGJ5IFdlYktp dCB0byBub3QgYmUKKyAgICAgICAgc3luY2hyb25pemVkIHdpdGggbWVzc2FnZXMgbG9nZ2VkIGJ5 IDNyZCBwYXJ0eSBsaWJyYXJpZXMgb3IgbG9nZ2luZworICAgICAgICBzeXN0ZW1zLiBBcyBhIGNv bnNlcXVlbmNlIHRoZSB1c2VmdWxuZXNzIG9mIFdlYktpdCBsb2dzIGlzIG5vdGljZWFibHkKKyAg ICAgICAgcmVkdWNlZC4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIHRoZSBpc3N1ZSBieSBt b3ZpbmcgdGhlIGNvZGUgbG9nZ2luZyB0byB0aGUgc3lzdGVtCisgICAgICAgIGNvbnNvbGUgdG8g dGhlIHN5bmNocm9ub3VzIHBhcnQgb2YgRG9jdW1lbnQ6OmRpZExvZ01lc3NhZ2UoKSwgd2hpbGUK KyAgICAgICAgc3RpbGwgaGFuZGxpbmcgdGhlIHJlc3QgaW4gdGhlIG1fbG9nTWVzc2FnZVRhc2tR dWV1ZSBjYWxsYmFjay4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEb2N1bWVudDo6ZGlkTG9nTWVzc2FnZSk6CisgICAgICAgICogcGFnZS9QYWdlQ29u c29sZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ29uc29sZUNsaWVudDo6YWRk TWVzc2FnZSk6CisKIDIwMjEtMDItMTEgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAog ICAgICAgICBIYW5kbGUgbWluLXdpZHRoL21pbi1oZWlnaHQ6YXV0byBmb3IgYXNwZWN0LXJhdGlv CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA0NGY5ZDBlYTUwNTJjMDE5ZTc4YmFlYmU4MDhi OGYyYzc1ZDMxOTk1Li5mOWY0MjljYTJlOTEwZjEzZjFlMmY2ZTM3MTQ2MDcyOTc4ODk2MTFiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTI0OSw4ICsyNDksMTAgQEAKICNpbmNsdWRlICJY UGF0aEV4cHJlc3Npb24uaCIKICNpbmNsdWRlICJYUGF0aE5TUmVzb2x2ZXIuaCIKICNpbmNsdWRl ICJYUGF0aFJlc3VsdC5oIgorI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0NvbnNvbGVDbGllbnQu aD4KICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9Db25zb2xlTWVzc2FnZS5oPgogI2luY2x1ZGUg PEphdmFTY3JpcHRDb3JlL1JlZ3VsYXJFeHByZXNzaW9uLmg+CisjaW5jbHVkZSA8SmF2YVNjcmlw dENvcmUvU2NyaXB0QXJndW1lbnRzLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvU2NyaXB0 Q2FsbFN0YWNrLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvVk0uaD4KICNpbmNsdWRlIDxj dGltZT4KQEAgLTg0MjgsMTUgKzg0MzAsMjQgQEAgdm9pZCBEb2N1bWVudDo6ZGlkTG9nTWVzc2Fn ZShjb25zdCBXVEZMb2dDaGFubmVsJiBjaGFubmVsLCBXVEZMb2dMZXZlbCBsZXZlbCwgVmUKICAg ICBpZiAobWVzc2FnZVNvdXJjZSA9PSBNZXNzYWdlU291cmNlOjpPdGhlcikKICAgICAgICAgcmV0 dXJuOwogCi0gICAgbV9sb2dNZXNzYWdlVGFza1F1ZXVlLmVucXVldWVUYXNrKFt0aGlzLCBsZXZl bCwgbWVzc2FnZVNvdXJjZSwgbG9nTWVzc2FnZXMgPSBXVEZNb3ZlKGxvZ01lc3NhZ2VzKV0oKSBt dXRhYmxlIHsKKyAgICBhdXRvIG1lc3NhZ2VMZXZlbCA9IG1lc3NhZ2VMZXZlbEZyb21XVEZMb2dM ZXZlbChsZXZlbCk7CisgICAgYXV0byBtZXNzYWdlID0gbWFrZVVuaXF1ZTxJbnNwZWN0b3I6OkNv bnNvbGVNZXNzYWdlPihtZXNzYWdlU291cmNlLCBNZXNzYWdlVHlwZTo6TG9nLCBtZXNzYWdlTGV2 ZWwsIFdURk1vdmUobG9nTWVzc2FnZXMpLCBtYWluV29ybGRFeGVjU3RhdGUoZnJhbWUoKSkpOwor CisgICAgaWYgKFVOTElLRUxZKHBhZ2UtPnNldHRpbmdzKCkubG9nc1BhZ2VNZXNzYWdlc1RvU3lz dGVtQ29uc29sZUVuYWJsZWQoKSB8fCBQYWdlQ29uc29sZUNsaWVudDo6c2hvdWxkUHJpbnRFeGNl cHRpb25zKCkpKSB7CisgICAgICAgIGlmIChtZXNzYWdlLT50eXBlKCkgPT0gTWVzc2FnZVR5cGU6 OkltYWdlKSB7CisgICAgICAgICAgICBBU1NFUlQobWVzc2FnZS0+YXJndW1lbnRzKCkpOworICAg ICAgICAgICAgSlNDOjpDb25zb2xlQ2xpZW50OjpwcmludENvbnNvbGVNZXNzYWdlV2l0aEFyZ3Vt ZW50cyhtZXNzYWdlLT5zb3VyY2UoKSwgbWVzc2FnZS0+dHlwZSgpLCBtZXNzYWdlLT5sZXZlbCgp LCBtZXNzYWdlLT5hcmd1bWVudHMoKS0+Z2xvYmFsT2JqZWN0KCksICptZXNzYWdlLT5hcmd1bWVu dHMoKSk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgSlNDOjpDb25zb2xlQ2xpZW50Ojpw cmludENvbnNvbGVNZXNzYWdlKG1lc3NhZ2UtPnNvdXJjZSgpLCBtZXNzYWdlLT50eXBlKCksIG1l c3NhZ2UtPmxldmVsKCksIG1lc3NhZ2UtPnRvU3RyaW5nKCksIG1lc3NhZ2UtPnVybCgpLCBtZXNz YWdlLT5saW5lKCksIG1lc3NhZ2UtPmNvbHVtbigpKTsKKyAgICB9CisKKyAgICBtX2xvZ01lc3Nh Z2VUYXNrUXVldWUuZW5xdWV1ZVRhc2soW3RoaXMsIGxldmVsLCBtZXNzYWdlID0gV1RGTW92ZSht ZXNzYWdlKV0oKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCF0aGlzLT5wYWdlKCkpCiAgICAgICAg ICAgICByZXR1cm47CiAKLSAgICAgICAgYXV0byBtZXNzYWdlTGV2ZWwgPSBtZXNzYWdlTGV2ZWxG cm9tV1RGTG9nTGV2ZWwobGV2ZWwpOwotICAgICAgICBhdXRvIG1lc3NhZ2UgPSBtYWtlVW5pcXVl PEluc3BlY3Rvcjo6Q29uc29sZU1lc3NhZ2U+KG1lc3NhZ2VTb3VyY2UsIE1lc3NhZ2VUeXBlOjpM b2csIG1lc3NhZ2VMZXZlbCwgV1RGTW92ZShsb2dNZXNzYWdlcyksIG1haW5Xb3JsZEV4ZWNTdGF0 ZShmcmFtZSgpKSk7Ci0KICAgICAgICAgYWRkQ29uc29sZU1lc3NhZ2UoV1RGTW92ZShtZXNzYWdl KSk7CiAgICAgfSk7CisKIH0KIAogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGVDbGllbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlQ29uc29sZUNsaWVudC5jcHAKaW5kZXggY2NjOThkY2E5ZmVlODVhZjZk NTRmYzg1MzY2NTc4NDM0OTk4MGFjMC4uOGUyMzZhMDg0MDU5YjQxN2RlZTk4NmNlNWM2MmI2Mjg2 ZTQxNzdjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZUNsaWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZUNsaWVudC5jcHAKQEAg LTEyNywxNCArMTI3LDYgQEAgdm9pZCBQYWdlQ29uc29sZUNsaWVudDo6YWRkTWVzc2FnZShzdGQ6 OnVuaXF1ZV9wdHI8SW5zcGVjdG9yOjpDb25zb2xlTWVzc2FnZT4mJgogICAgICAgICB9IGVsc2UK ICAgICAgICAgICAgIG1lc3NhZ2UgPSBjb25zb2xlTWVzc2FnZS0+bWVzc2FnZSgpOwogICAgICAg ICBtX3BhZ2UuY2hyb21lKCkuY2xpZW50KCkuYWRkTWVzc2FnZVRvQ29uc29sZShjb25zb2xlTWVz c2FnZS0+c291cmNlKCksIGNvbnNvbGVNZXNzYWdlLT5sZXZlbCgpLCBtZXNzYWdlLCBjb25zb2xl TWVzc2FnZS0+bGluZSgpLCBjb25zb2xlTWVzc2FnZS0+Y29sdW1uKCksIGNvbnNvbGVNZXNzYWdl LT51cmwoKSk7Ci0KLSAgICAgICAgaWYgKFVOTElLRUxZKG1fcGFnZS5zZXR0aW5ncygpLmxvZ3NQ YWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkKCkgfHwgc2hvdWxkUHJpbnRFeGNlcHRp b25zKCkpKSB7Ci0gICAgICAgICAgICBpZiAoY29uc29sZU1lc3NhZ2UtPnR5cGUoKSA9PSBNZXNz YWdlVHlwZTo6SW1hZ2UpIHsKLSAgICAgICAgICAgICAgICBBU1NFUlQoY29uc29sZU1lc3NhZ2Ut PmFyZ3VtZW50cygpKTsKLSAgICAgICAgICAgICAgICBDb25zb2xlQ2xpZW50OjpwcmludENvbnNv bGVNZXNzYWdlV2l0aEFyZ3VtZW50cyhjb25zb2xlTWVzc2FnZS0+c291cmNlKCksIGNvbnNvbGVN ZXNzYWdlLT50eXBlKCksIGNvbnNvbGVNZXNzYWdlLT5sZXZlbCgpLCBjb25zb2xlTWVzc2FnZS0+ YXJndW1lbnRzKCktPmdsb2JhbE9iamVjdCgpLCAqY29uc29sZU1lc3NhZ2UtPmFyZ3VtZW50cygp KTsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAgIENvbnNvbGVDbGllbnQ6OnBy aW50Q29uc29sZU1lc3NhZ2UoY29uc29sZU1lc3NhZ2UtPnNvdXJjZSgpLCBjb25zb2xlTWVzc2Fn ZS0+dHlwZSgpLCBjb25zb2xlTWVzc2FnZS0+bGV2ZWwoKSwgY29uc29sZU1lc3NhZ2UtPnRvU3Ry aW5nKCksIGNvbnNvbGVNZXNzYWdlLT51cmwoKSwgY29uc29sZU1lc3NhZ2UtPmxpbmUoKSwgY29u c29sZU1lc3NhZ2UtPmNvbHVtbigpKTsKLSAgICAgICAgfQogICAgIH0KIAogICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShtX3BhZ2UsIFdURk1vdmUoY29u c29sZU1lc3NhZ2UpKTsK 421294 2021-02-23 02:21:35 -0800 2021-02-23 12:10:02 -0800 Patch bug-222279-20210223112134.patch text/plain 5391 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzkxZmM0MmZmOWM5NmVk NWRmOGU0MTVhMzI3MWJhMmYzOTRkNjg1OS4uNjQ5ZmFiZWUyZTBiMmRjM2M1ODBjMGNkNWI4MTc4 ODdhZGI3NTc3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTAyLTIyICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBNYWtlIHN5c3Rl bSBjb25zb2xlIGxvZ2dpbmcgc3luY2hyb25vdXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjI3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFByZXZpb3VzbHksIHRoZSBsb2dnaW5nIG9mIG1lc3NhZ2Vz IHRvIHRoZSBzeXN0ZW0gY29uc29sZSB3YXMgZG9uZSBpbgorICAgICAgICBQYWdlQ29uc29sZUNs aWVudDo6YWRkTWVzc2FnZSgpLCB3aGljaCB3YXMgY2FsbGVkIGJ5CisgICAgICAgIERvY3VtZW50 OjphZGRDb25zb2xlTWVzc2FnZSgpLiBUaGUgbGF0dGVyIHdhcyBjYWxsZWQgaW4gYSBUYXNrUXVl dWUKKyAgICAgICAgY2FsbGJhY2suCisKKyAgICAgICAgVGhpcyBoYWQgdGhlIHVuZm9ydHVuYXRl IHNpZGUgZWZmZWN0IG9mIGFkZGluZyBhIGRlbGF5IGZyb20gdGhlIHRpbWUgYQorICAgICAgICBt YWNybyBzdWNoIGFzIEFMV0FZU19MT0coKSBpcyBjYWxsZWQgYW5kIHRoZSB0ZXh0IGJlaW5nIHBy aW50ZWQgdG8gdGhlCisgICAgICAgIGNvbnNvbGUuIFRoaXMgaXMgcGFydGljdWxhcmx5IGEgcHJv YmxlbSB3aGVuIGxvZ2dpbmcgM3JkIHBhcnR5CisgICAgICAgIGxpYnJhcmllcyB0aGF0IGRvbid0 IHVzZSB0aGUgV2ViS2l0IGxvZ2dpbmcgQVBJIHRvIGxvZyB0byBzdGRlcnIsIHN1Y2gKKyAgICAg ICAgYXMgR1N0cmVhbWVyLCBzaW5jZSBpdCBjYXVzZXMgbWVzc2FnZXMgbG9nZ2VkIGJ5IFdlYktp dCB0byBub3QgYmUKKyAgICAgICAgc3luY2hyb25pemVkIHdpdGggbWVzc2FnZXMgbG9nZ2VkIGJ5 IDNyZCBwYXJ0eSBsaWJyYXJpZXMgb3IgbG9nZ2luZworICAgICAgICBzeXN0ZW1zLiBBcyBhIGNv bnNlcXVlbmNlIHRoZSB1c2VmdWxuZXNzIG9mIFdlYktpdCBsb2dzIGlzIG5vdGljZWFibHkKKyAg ICAgICAgcmVkdWNlZC4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIHRoZSBpc3N1ZSBieSBt b3ZpbmcgdGhlIGNvZGUgbG9nZ2luZyB0byB0aGUgc3lzdGVtCisgICAgICAgIGNvbnNvbGUgdG8g dGhlIHN5bmNocm9ub3VzIHBhcnQgb2YgRG9jdW1lbnQ6OmRpZExvZ01lc3NhZ2UoKSwgd2hpbGUK KyAgICAgICAgc3RpbGwgaGFuZGxpbmcgdGhlIHJlc3QgaW4gdGhlIG1fbG9nTWVzc2FnZVRhc2tR dWV1ZSBjYWxsYmFjay4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEb2N1bWVudDo6ZGlkTG9nTWVzc2FnZSk6CisgICAgICAgICogcGFnZS9QYWdlQ29u c29sZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ29uc29sZUNsaWVudDo6YWRk TWVzc2FnZSk6CisKIDIwMjEtMDItMTEgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAog ICAgICAgICBIYW5kbGUgbWluLXdpZHRoL21pbi1oZWlnaHQ6YXV0byBmb3IgYXNwZWN0LXJhdGlv CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA0NGY5ZDBlYTUwNTJjMDE5ZTc4YmFlYmU4MDhi OGYyYzc1ZDMxOTk1Li45M2U2ZGM1NzMwNGE5MjM3MGYzNzczZjYxM2ViYTM5N2RjMzYxM2JiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTI0OSw4ICsyNDksMTAgQEAKICNpbmNsdWRlICJY UGF0aEV4cHJlc3Npb24uaCIKICNpbmNsdWRlICJYUGF0aE5TUmVzb2x2ZXIuaCIKICNpbmNsdWRl ICJYUGF0aFJlc3VsdC5oIgorI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0NvbnNvbGVDbGllbnQu aD4KICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9Db25zb2xlTWVzc2FnZS5oPgogI2luY2x1ZGUg PEphdmFTY3JpcHRDb3JlL1JlZ3VsYXJFeHByZXNzaW9uLmg+CisjaW5jbHVkZSA8SmF2YVNjcmlw dENvcmUvU2NyaXB0QXJndW1lbnRzLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvU2NyaXB0 Q2FsbFN0YWNrLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvVk0uaD4KICNpbmNsdWRlIDxj dGltZT4KQEAgLTg0MjgsMTMgKzg0MzAsMjEgQEAgdm9pZCBEb2N1bWVudDo6ZGlkTG9nTWVzc2Fn ZShjb25zdCBXVEZMb2dDaGFubmVsJiBjaGFubmVsLCBXVEZMb2dMZXZlbCBsZXZlbCwgVmUKICAg ICBpZiAobWVzc2FnZVNvdXJjZSA9PSBNZXNzYWdlU291cmNlOjpPdGhlcikKICAgICAgICAgcmV0 dXJuOwogCi0gICAgbV9sb2dNZXNzYWdlVGFza1F1ZXVlLmVucXVldWVUYXNrKFt0aGlzLCBsZXZl bCwgbWVzc2FnZVNvdXJjZSwgbG9nTWVzc2FnZXMgPSBXVEZNb3ZlKGxvZ01lc3NhZ2VzKV0oKSBt dXRhYmxlIHsKKyAgICBhdXRvIG1lc3NhZ2VMZXZlbCA9IG1lc3NhZ2VMZXZlbEZyb21XVEZMb2dM ZXZlbChsZXZlbCk7CisgICAgYXV0byBtZXNzYWdlID0gbWFrZVVuaXF1ZTxJbnNwZWN0b3I6OkNv bnNvbGVNZXNzYWdlPihtZXNzYWdlU291cmNlLCBNZXNzYWdlVHlwZTo6TG9nLCBtZXNzYWdlTGV2 ZWwsIFdURk1vdmUobG9nTWVzc2FnZXMpLCBtYWluV29ybGRFeGVjU3RhdGUoZnJhbWUoKSkpOwor CisgICAgaWYgKFVOTElLRUxZKHBhZ2UtPnNldHRpbmdzKCkubG9nc1BhZ2VNZXNzYWdlc1RvU3lz dGVtQ29uc29sZUVuYWJsZWQoKSB8fCBQYWdlQ29uc29sZUNsaWVudDo6c2hvdWxkUHJpbnRFeGNl cHRpb25zKCkpKSB7CisgICAgICAgIGlmIChtZXNzYWdlLT50eXBlKCkgPT0gTWVzc2FnZVR5cGU6 OkltYWdlKSB7CisgICAgICAgICAgICBBU1NFUlQobWVzc2FnZS0+YXJndW1lbnRzKCkpOworICAg ICAgICAgICAgSlNDOjpDb25zb2xlQ2xpZW50OjpwcmludENvbnNvbGVNZXNzYWdlV2l0aEFyZ3Vt ZW50cyhtZXNzYWdlLT5zb3VyY2UoKSwgbWVzc2FnZS0+dHlwZSgpLCBtZXNzYWdlLT5sZXZlbCgp LCBtZXNzYWdlLT5hcmd1bWVudHMoKS0+Z2xvYmFsT2JqZWN0KCksICptZXNzYWdlLT5hcmd1bWVu dHMoKSk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgSlNDOjpDb25zb2xlQ2xpZW50Ojpw cmludENvbnNvbGVNZXNzYWdlKG1lc3NhZ2UtPnNvdXJjZSgpLCBtZXNzYWdlLT50eXBlKCksIG1l c3NhZ2UtPmxldmVsKCksIG1lc3NhZ2UtPnRvU3RyaW5nKCksIG1lc3NhZ2UtPnVybCgpLCBtZXNz YWdlLT5saW5lKCksIG1lc3NhZ2UtPmNvbHVtbigpKTsKKyAgICB9CisKKyAgICBtX2xvZ01lc3Nh Z2VUYXNrUXVldWUuZW5xdWV1ZVRhc2soW3RoaXMsIG1lc3NhZ2UgPSBXVEZNb3ZlKG1lc3NhZ2Up XSgpIG11dGFibGUgewogICAgICAgICBpZiAoIXRoaXMtPnBhZ2UoKSkKICAgICAgICAgICAgIHJl dHVybjsKIAotICAgICAgICBhdXRvIG1lc3NhZ2VMZXZlbCA9IG1lc3NhZ2VMZXZlbEZyb21XVEZM b2dMZXZlbChsZXZlbCk7Ci0gICAgICAgIGF1dG8gbWVzc2FnZSA9IG1ha2VVbmlxdWU8SW5zcGVj dG9yOjpDb25zb2xlTWVzc2FnZT4obWVzc2FnZVNvdXJjZSwgTWVzc2FnZVR5cGU6OkxvZywgbWVz c2FnZUxldmVsLCBXVEZNb3ZlKGxvZ01lc3NhZ2VzKSwgbWFpbldvcmxkRXhlY1N0YXRlKGZyYW1l KCkpKTsKLQogICAgICAgICBhZGRDb25zb2xlTWVzc2FnZShXVEZNb3ZlKG1lc3NhZ2UpKTsKICAg ICB9KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGVDbGll bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZUNsaWVudC5jcHAKaW5kZXgg Y2NjOThkY2E5ZmVlODVhZjZkNTRmYzg1MzY2NTc4NDM0OTk4MGFjMC4uOGUyMzZhMDg0MDU5YjQx N2RlZTk4NmNlNWM2MmI2Mjg2ZTQxNzdjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlQ29uc29sZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29u c29sZUNsaWVudC5jcHAKQEAgLTEyNywxNCArMTI3LDYgQEAgdm9pZCBQYWdlQ29uc29sZUNsaWVu dDo6YWRkTWVzc2FnZShzdGQ6OnVuaXF1ZV9wdHI8SW5zcGVjdG9yOjpDb25zb2xlTWVzc2FnZT4m JgogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIG1lc3NhZ2UgPSBjb25zb2xlTWVzc2FnZS0+ bWVzc2FnZSgpOwogICAgICAgICBtX3BhZ2UuY2hyb21lKCkuY2xpZW50KCkuYWRkTWVzc2FnZVRv Q29uc29sZShjb25zb2xlTWVzc2FnZS0+c291cmNlKCksIGNvbnNvbGVNZXNzYWdlLT5sZXZlbCgp LCBtZXNzYWdlLCBjb25zb2xlTWVzc2FnZS0+bGluZSgpLCBjb25zb2xlTWVzc2FnZS0+Y29sdW1u KCksIGNvbnNvbGVNZXNzYWdlLT51cmwoKSk7Ci0KLSAgICAgICAgaWYgKFVOTElLRUxZKG1fcGFn ZS5zZXR0aW5ncygpLmxvZ3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkKCkgfHwg c2hvdWxkUHJpbnRFeGNlcHRpb25zKCkpKSB7Ci0gICAgICAgICAgICBpZiAoY29uc29sZU1lc3Nh Z2UtPnR5cGUoKSA9PSBNZXNzYWdlVHlwZTo6SW1hZ2UpIHsKLSAgICAgICAgICAgICAgICBBU1NF UlQoY29uc29sZU1lc3NhZ2UtPmFyZ3VtZW50cygpKTsKLSAgICAgICAgICAgICAgICBDb25zb2xl Q2xpZW50OjpwcmludENvbnNvbGVNZXNzYWdlV2l0aEFyZ3VtZW50cyhjb25zb2xlTWVzc2FnZS0+ c291cmNlKCksIGNvbnNvbGVNZXNzYWdlLT50eXBlKCksIGNvbnNvbGVNZXNzYWdlLT5sZXZlbCgp LCBjb25zb2xlTWVzc2FnZS0+YXJndW1lbnRzKCktPmdsb2JhbE9iamVjdCgpLCAqY29uc29sZU1l c3NhZ2UtPmFyZ3VtZW50cygpKTsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAg IENvbnNvbGVDbGllbnQ6OnByaW50Q29uc29sZU1lc3NhZ2UoY29uc29sZU1lc3NhZ2UtPnNvdXJj ZSgpLCBjb25zb2xlTWVzc2FnZS0+dHlwZSgpLCBjb25zb2xlTWVzc2FnZS0+bGV2ZWwoKSwgY29u c29sZU1lc3NhZ2UtPnRvU3RyaW5nKCksIGNvbnNvbGVNZXNzYWdlLT51cmwoKSwgY29uc29sZU1l c3NhZ2UtPmxpbmUoKSwgY29uc29sZU1lc3NhZ2UtPmNvbHVtbigpKTsKLSAgICAgICAgfQogICAg IH0KIAogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZSht X3BhZ2UsIFdURk1vdmUoY29uc29sZU1lc3NhZ2UpKTsK