107157 2013-01-17 12:19:59 -0800 Make Console::shouldPrintExceptions work in WebKit2 2013-01-17 15:28:03 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 timothy timothy benjamin joepeck oldest_to_newest 809614 0 timothy 2013-01-17 12:19:59 -0800 Logging console messages to stdout helps working on the Web Inspector. 809619 1 183244 timothy 2013-01-17 12:26:56 -0800 Created attachment 183244 Proposed Change 809652 2 183244 joepeck 2013-01-17 12:46:15 -0800 Comment on attachment 183244 Proposed Change View in context: https://bugs.webkit.org/attachment.cgi?id=183244&action=review r=me with the switch to Settings.in > Source/WebCore/page/Console.cpp:218 > + for (unsigned i = 0; i < arguments->argumentCount(); ++i) { NiT: You might as well update `i` to size_t here. ScriptArguments::argumentCount returns a size_t. > Source/WebCore/page/Console.cpp:227 > for (unsigned i = 0; i < callStack->size(); ++i) { Ditto for ScriptCallstack::size. > Source/WebCore/page/Settings.h:372 > + bool m_logsPageMessagesToSystemConsoleEnabled : 1; For simple boolean settings like this you should use probably declare it in "Source/WebCore/page/Settings.in". A single line: logsPageMessagesToSystemConsoleEnabled initial=false That would also take care of initialization this in the constructor, which appears to be missing from this patch. And getters should be const. 809794 3 timothy 2013-01-17 14:34:22 -0800 r140044 809886 4 benjamin 2013-01-17 15:28:03 -0800 + http://trac.webkit.org/changeset/140060 183244 2013-01-17 12:26:56 -0800 2013-01-17 12:46:15 -0800 Proposed Change 0001-Make-logging-console-messages-to-STDOUT-work-in-WebK.patch text/plain 16337 timothy RnJvbSA2OTg5NTVlOGJiNmJkNGU4MGQ5Mzg3ZDdhY2EzZDE5NThlZTU1YzEzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBUaHUsIDE3IEphbiAyMDEzIDE1OjIzOjIzIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gTWFr ZSBsb2dnaW5nIGNvbnNvbGUgbWVzc2FnZXMgdG8gU1RET1VUIHdvcmsgaW4gV2ViS2l0MiB2aWEK IGEgbmV3IHNldHRpbmcuCgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA3MTU3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClNvdXJjZS9XZWJDb3JlOgoKKiBX ZWJDb3JlLmV4cC5pbjogQWRkZWQgV2ViQ29yZTo6U2V0dGluZ3M6OnNldExvZ3NQYWdlTWVzc2Fn ZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkLgoqIHBhZ2UvQ29uc29sZS5jcHA6CihXZWJDb3JlOjpD b25zb2xlOjphZGRNZXNzYWdlKTogQ2hlY2sgbG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29s ZUVuYWJsZWQoKS4KKFdlYkNvcmU6OmludGVybmFsQWRkTWVzc2FnZSk6IERpdHRvLiBSZWZhY3Rv cmVkIHRvIHJldHVybiBlYXJseSBhbmQgZHJvcCBwcmludEV4Y2VwdGlvbnMgYXJndW1lbnQuCihX ZWJDb3JlOjpDb25zb2xlOjplcnJvcik6IFJlbW92ZWQgY2FsbCB0byBzaG91bGRQcmludEV4Y2Vw dGlvbnMoKS4KKFdlYkNvcmU6OkNvbnNvbGU6OmxvZyk6IERpdHRvLgooV2ViQ29yZTo6Q29uc29s ZTo6d2Fybik6IERpdHRvLgooV2ViQ29yZTo6Q29uc29sZTo6ZGlyKTogRGl0dG8uCihXZWJDb3Jl OjpDb25zb2xlOjpkaXJ4bWwpOiBEaXR0by4KKFdlYkNvcmU6OkNvbnNvbGU6OmNsZWFyKTogRGl0 dG8uCihXZWJDb3JlOjpDb25zb2xlOjp0cmFjZSk6IERpdHRvLgooV2ViQ29yZTo6Q29uc29sZTo6 YXNzZXJ0Q29uZGl0aW9uKTogRGl0dG8uCiogcGFnZS9TZXR0aW5ncy5jcHA6CihXZWJDb3JlOjpT ZXR0aW5nczo6c2V0TG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQpOiBBZGRl ZC4KKiBwYWdlL1NldHRpbmdzLmg6CihXZWJDb3JlOjpTZXR0aW5nczo6bG9nc1BhZ2VNZXNzYWdl c1RvU3lzdGVtQ29uc29sZUVuYWJsZWQpOiBBZGRlZC4KClNvdXJjZS9XZWJLaXQyOgoKKiBTaGFy ZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oOgoqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2Vz LmNwcDoKKFdLUHJlZmVyZW5jZXNTZXRMb2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1Db25zb2xlRW5h YmxlZCk6IEFkZGVkLgooV0tQcmVmZXJlbmNlc0dldExvZ3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNv bnNvbGVFbmFibGVkKTogQWRkZWQuCiogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2 YXRlLmg6CiogVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcDoKKFdlYktpdDo6Y3JlYXRl SW5zcGVjdG9yUGFnZUdyb3VwKTogRW5hYmxlIGxvZ2dpbmcgaW4gZGVidWcgYnVpbGRzLgoqIFdl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlUHJl ZmVyZW5jZXMpOiBTZXQgbmV3IHNldHRpbmcgaW4gV2ViQ29yZS4KLS0tCiBTb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjUgKysrKysrKysrKysr KwogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gICAgICAgICAgICAgICAgICAgICAgfCAg ICAxICsKIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAgICAgICAgICAgICAgICAgICAg IHwgICAzNyArKysrKysrKysrLS0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy5jcHAgICAgICAgICAgICAgICAgICAgfCAgICA1ICsrKwogU291cmNlL1dlYkNvcmUvcGFnZS9T ZXR0aW5ncy5oICAgICAgICAgICAgICAgICAgICAgfCAgICA0ICsrKwogU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE4ICsrKysrKysrKysKIFNv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmggICAgICAgIHwgICAgMSAr CiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAgICB8ICAg MTAgKysrKysrCiAuLi4vV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZh dGUuaCB8ICAgIDQgKysrCiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJv eHkuY3BwICAgICB8ICAgIDEgKwogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwICAgICAgfCAgICAyICsrCiAxMSBmaWxlcyBjaGFuZ2VkLCA5MCBpbnNlcnRpb25z KCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTMwNmVjZC4uYWExYzdlZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAxLTE3ICBUaW1vdGh5IEhhdGNoZXIgIDx0 aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIGxvZ2dpbmcgY29uc29sZSBtZXNzYWdl cyB0byBTVERPVVQgd29yayBpbiBXZWJLaXQyIHZpYSBhIG5ldyBzZXR0aW5nLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcxNTcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmlu OiBBZGRlZCBXZWJDb3JlOjpTZXR0aW5nczo6c2V0TG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29u c29sZUVuYWJsZWQuCisgICAgICAgICogcGFnZS9Db25zb2xlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNvbnNvbGU6OmFkZE1lc3NhZ2UpOiBDaGVjayBsb2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1D b25zb2xlRW5hYmxlZCgpLiAKKyAgICAgICAgKFdlYkNvcmU6OmludGVybmFsQWRkTWVzc2FnZSk6 IERpdHRvLiBSZWZhY3RvcmVkIHRvIHJldHVybiBlYXJseSBhbmQgZHJvcCBwcmludEV4Y2VwdGlv bnMgYXJndW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjplcnJvcik6IFJlbW92ZWQg Y2FsbCB0byBzaG91bGRQcmludEV4Y2VwdGlvbnMoKS4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnNv bGU6OmxvZyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZTo6d2Fybik6IERpdHRv LgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZTo6ZGlyKTogRGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpDb25zb2xlOjpkaXJ4bWwpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6 OmNsZWFyKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjp0cmFjZSk6IERpdHRv LgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZTo6YXNzZXJ0Q29uZGl0aW9uKTogRGl0dG8uCisg ICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6 c2V0TG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQpOiBBZGRlZC4KKyAgICAg ICAgKiBwYWdlL1NldHRpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6bG9nc1Bh Z2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQpOiBBZGRlZC4KKwogMjAxMy0wMS0xNiAg VGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGEgY3Jh c2ggd2hlbiBwcmludGluZyBjb25zb2xlIG1lc3NhZ2VzIHRvIFNURE9VVC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4KaW5kZXggNzk3YTdmMS4uYjg3MDA1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTk4 Nyw2ICs5ODcsNyBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MzMnNldE5lZWRzQWRvYmVGcmFtZVJl bG9hZGluZ1F1aXJrRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczMyc2V0U2NyZWVuRm9udFN1YnN0 aXR1dGlvbkVuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzNzZXRBZ2dyZXNzaXZlVGls ZVJldGVudGlvbkVuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzdzZXRTY3JvbGxpbmdQ ZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkRWIKK19fWk43V2ViQ29yZThTZXR0aW5nczQxc2V0TG9n c1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNldHRp bmdzNDVzZXRTaG91bGRSZXNwZWN0UHJpb3JpdHlJbkNTU0F0dHJpYnV0ZVNldHRlcnNFYgogX19a TjdXZWJDb3JlOFNldHRpbmdzMjFzZXRSZXNvbHV0aW9uT3ZlcnJpZGVFUktOU183SW50U2l6ZUUK IF9fWk43V2ViQ29yZThTZXR0aW5nczIwc2V0TWVkaWFUeXBlT3ZlcnJpZGVFUktOM1dURjZTdHJp bmdFCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAppbmRleCAwOTc3MTA5Li4yYzcxZTg3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvQ29uc29sZS5jcHAKQEAgLTE3Niw3ICsxNzYsNyBAQCB2b2lkIENvbnNvbGU6OmFkZE1l c3NhZ2UoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgY29uc3QgU3Ry aW5nJgogCiAgICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hZGRNZXNzYWdlVG9Db25zb2xl KHNvdXJjZSwgbGV2ZWwsIG1lc3NhZ2UsIGxpbmVOdW1iZXIsIHVybCk7CiAKLSAgICBpZiAoIXNo b3VsZFByaW50RXhjZXB0aW9ucygpKQorICAgIGlmICghbV9mcmFtZS0+c2V0dGluZ3MoKS0+bG9n c1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQoKSAmJiAhc2hvdWxkUHJpbnRFeGNl cHRpb25zKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIHByaW50U291cmNlVVJMQW5kTGluZSh1 cmwsIGxpbmVOdW1iZXIpOwpAQCAtMTg1LDcgKzE4NSw3IEBAIHZvaWQgQ29uc29sZTo6YWRkTWVz c2FnZShNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZUxldmVsIGxldmVsLCBjb25zdCBTdHJp bmcmCiAgICAgcHJpbnRmKCIgJXNcbiIsIG1lc3NhZ2UudXRmOCgpLmRhdGEoKSk7CiB9CiAKLXN0 YXRpYyB2b2lkIGludGVybmFsQWRkTWVzc2FnZShQYWdlKiBwYWdlLCBNZXNzYWdlVHlwZSB0eXBl LCBNZXNzYWdlTGV2ZWwgbGV2ZWwsIFNjcmlwdFN0YXRlKiBzdGF0ZSwgUGFzc1JlZlB0cjxTY3Jp cHRBcmd1bWVudHM+IHBycEFyZ3VtZW50cywgYm9vbCBwcmludEV4Y2VwdGlvbnMsIGJvb2wgYWNj ZXB0Tm9Bcmd1bWVudHMgPSBmYWxzZSwgYm9vbCBwcmludFRyYWNlID0gZmFsc2UpCitzdGF0aWMg dm9pZCBpbnRlcm5hbEFkZE1lc3NhZ2UoUGFnZSogcGFnZSwgTWVzc2FnZVR5cGUgdHlwZSwgTWVz c2FnZUxldmVsIGxldmVsLCBTY3JpcHRTdGF0ZSogc3RhdGUsIFBhc3NSZWZQdHI8U2NyaXB0QXJn dW1lbnRzPiBwcnBBcmd1bWVudHMsIGJvb2wgYWNjZXB0Tm9Bcmd1bWVudHMgPSBmYWxzZSwgYm9v bCBwcmludFRyYWNlID0gZmFsc2UpCiB7CiAgICAgUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXJn dW1lbnRzID0gcHJwQXJndW1lbnRzOwogCkBAIC0yMDksMTggKzIwOSwxOSBAQCBzdGF0aWMgdm9p ZCBpbnRlcm5hbEFkZE1lc3NhZ2UoUGFnZSogcGFnZSwgTWVzc2FnZVR5cGUgdHlwZSwgTWVzc2Fn ZUxldmVsIGxldmVsLAogICAgIGlmIChnb3RNZXNzYWdlKQogICAgICAgICBwYWdlLT5jaHJvbWUo KS0+Y2xpZW50KCktPmFkZE1lc3NhZ2VUb0NvbnNvbGUoQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2Us IHR5cGUsIGxldmVsLCBtZXNzYWdlLCBsYXN0Q2FsbGVyLmxpbmVOdW1iZXIoKSwgbGFzdENhbGxl ci5zb3VyY2VVUkwoKSk7CiAKLSAgICBpZiAocHJpbnRFeGNlcHRpb25zKSB7Ci0gICAgICAgIHBy aW50U291cmNlVVJMQW5kTGluZShsYXN0Q2FsbGVyLnNvdXJjZVVSTCgpLCBsYXN0Q2FsbGVyLmxp bmVOdW1iZXIoKSk7Ci0gICAgICAgIHByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KENv bnNvbGVBUElNZXNzYWdlU291cmNlLCBsZXZlbCk7CisgICAgaWYgKCFwYWdlLT5zZXR0aW5ncygp LT5sb2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1Db25zb2xlRW5hYmxlZCgpICYmICFDb25zb2xlOjpz aG91bGRQcmludEV4Y2VwdGlvbnMoKSkKKyAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCBhcmd1bWVudHMtPmFyZ3VtZW50Q291bnQoKTsgKytpKSB7Ci0g ICAgICAgICAgICBTdHJpbmcgYXJnQXNTdHJpbmcgPSBhcmd1bWVudHMtPmFyZ3VtZW50QXQoaSku dG9TdHJpbmcoYXJndW1lbnRzLT5nbG9iYWxTdGF0ZSgpKTsKLSAgICAgICAgICAgIHByaW50Zigi ICVzIiwgYXJnQXNTdHJpbmcudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgIH0KKyAgICBwcmludFNv dXJjZVVSTEFuZExpbmUobGFzdENhbGxlci5zb3VyY2VVUkwoKSwgbGFzdENhbGxlci5saW5lTnVt YmVyKCkpOworICAgIHByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KENvbnNvbGVBUElN ZXNzYWdlU291cmNlLCBsZXZlbCk7CiAKLSAgICAgICAgcHJpbnRmKCJcbiIpOworICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCBhcmd1bWVudHMtPmFyZ3VtZW50Q291bnQoKTsgKytpKSB7Cisg ICAgICAgIFN0cmluZyBhcmdBc1N0cmluZyA9IGFyZ3VtZW50cy0+YXJndW1lbnRBdChpKS50b1N0 cmluZyhhcmd1bWVudHMtPmdsb2JhbFN0YXRlKCkpOworICAgICAgICBwcmludGYoIiAlcyIsIGFy Z0FzU3RyaW5nLnV0ZjgoKS5kYXRhKCkpOwogICAgIH0KIAorICAgIHByaW50ZigiXG4iKTsKKwog ICAgIGlmIChwcmludFRyYWNlKSB7CiAgICAgICAgIHByaW50ZigiU3RhY2sgVHJhY2VcbiIpOwog ICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2FsbFN0YWNrLT5zaXplKCk7ICsraSkg ewpAQCAtMjM4LDcgKzIzOSw3IEBAIHZvaWQgQ29uc29sZTo6ZGVidWcoU2NyaXB0U3RhdGUqIHN0 YXRlLCBQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXJndW1lbnRzKQogCiB2b2lkIENvbnNv bGU6OmVycm9yKFNjcmlwdFN0YXRlKiBzdGF0ZSwgUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+ IGFyZ3VtZW50cykKIHsKLSAgICBpbnRlcm5hbEFkZE1lc3NhZ2UocGFnZSgpLCBMb2dNZXNzYWdl VHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIHN0YXRlLCBhcmd1bWVudHMsIHNob3VsZFByaW50RXhj ZXB0aW9ucygpKTsKKyAgICBpbnRlcm5hbEFkZE1lc3NhZ2UocGFnZSgpLCBMb2dNZXNzYWdlVHlw ZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIHN0YXRlLCBhcmd1bWVudHMpOwogfQogCiB2b2lkIENvbnNv bGU6OmluZm8oU2NyaXB0U3RhdGUqIHN0YXRlLCBQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4g YXJndW1lbnRzKQpAQCAtMjQ4LDMyICsyNDksMzIgQEAgdm9pZCBDb25zb2xlOjppbmZvKFNjcmlw dFN0YXRlKiBzdGF0ZSwgUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+IGFyZ3VtZW50cykKIAog dm9pZCBDb25zb2xlOjpsb2coU2NyaXB0U3RhdGUqIHN0YXRlLCBQYXNzUmVmUHRyPFNjcmlwdEFy Z3VtZW50cz4gYXJndW1lbnRzKQogewotICAgIGludGVybmFsQWRkTWVzc2FnZShwYWdlKCksIExv Z01lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIHN0YXRlLCBhcmd1bWVudHMsIHNob3VsZFBy aW50RXhjZXB0aW9ucygpKTsKKyAgICBpbnRlcm5hbEFkZE1lc3NhZ2UocGFnZSgpLCBMb2dNZXNz YWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBzdGF0ZSwgYXJndW1lbnRzKTsKIH0KIAogdm9pZCBD b25zb2xlOjp3YXJuKFNjcmlwdFN0YXRlKiBzdGF0ZSwgUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVu dHM+IGFyZ3VtZW50cykKIHsKLSAgICBpbnRlcm5hbEFkZE1lc3NhZ2UocGFnZSgpLCBMb2dNZXNz YWdlVHlwZSwgV2FybmluZ01lc3NhZ2VMZXZlbCwgc3RhdGUsIGFyZ3VtZW50cywgc2hvdWxkUHJp bnRFeGNlcHRpb25zKCkpOworICAgIGludGVybmFsQWRkTWVzc2FnZShwYWdlKCksIExvZ01lc3Nh Z2VUeXBlLCBXYXJuaW5nTWVzc2FnZUxldmVsLCBzdGF0ZSwgYXJndW1lbnRzKTsKIH0KIAogdm9p ZCBDb25zb2xlOjpkaXIoU2NyaXB0U3RhdGUqIHN0YXRlLCBQYXNzUmVmUHRyPFNjcmlwdEFyZ3Vt ZW50cz4gYXJndW1lbnRzKQogewotICAgIGludGVybmFsQWRkTWVzc2FnZShwYWdlKCksIERpck1l c3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIHN0YXRlLCBhcmd1bWVudHMsIHNob3VsZFByaW50 RXhjZXB0aW9ucygpKTsKKyAgICBpbnRlcm5hbEFkZE1lc3NhZ2UocGFnZSgpLCBEaXJNZXNzYWdl VHlwZSwgTG9nTWVzc2FnZUxldmVsLCBzdGF0ZSwgYXJndW1lbnRzKTsKIH0KIAogdm9pZCBDb25z b2xlOjpkaXJ4bWwoU2NyaXB0U3RhdGUqIHN0YXRlLCBQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50 cz4gYXJndW1lbnRzKQogewotICAgIGludGVybmFsQWRkTWVzc2FnZShwYWdlKCksIERpclhNTE1l c3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIHN0YXRlLCBhcmd1bWVudHMsIHNob3VsZFByaW50 RXhjZXB0aW9ucygpKTsKKyAgICBpbnRlcm5hbEFkZE1lc3NhZ2UocGFnZSgpLCBEaXJYTUxNZXNz YWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBzdGF0ZSwgYXJndW1lbnRzKTsKIH0KIAogdm9pZCBD b25zb2xlOjpjbGVhcihTY3JpcHRTdGF0ZSogc3RhdGUsIFBhc3NSZWZQdHI8U2NyaXB0QXJndW1l bnRzPiBhcmd1bWVudHMpCiB7Ci0gICAgaW50ZXJuYWxBZGRNZXNzYWdlKHBhZ2UoKSwgQ2xlYXJN ZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBzdGF0ZSwgYXJndW1lbnRzLCBzaG91bGRQcmlu dEV4Y2VwdGlvbnMoKSwgdHJ1ZSk7CisgICAgaW50ZXJuYWxBZGRNZXNzYWdlKHBhZ2UoKSwgQ2xl YXJNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBzdGF0ZSwgYXJndW1lbnRzLCB0cnVlKTsK IH0KIAogdm9pZCBDb25zb2xlOjp0cmFjZShTY3JpcHRTdGF0ZSogc3RhdGUsIFBhc3NSZWZQdHI8 U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMpCiB7Ci0gICAgaW50ZXJuYWxBZGRNZXNzYWdlKHBh Z2UoKSwgVHJhY2VNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBzdGF0ZSwgYXJndW1lbnRz LCBzaG91bGRQcmludEV4Y2VwdGlvbnMoKSwgdHJ1ZSwgc2hvdWxkUHJpbnRFeGNlcHRpb25zKCkp OworICAgIGludGVybmFsQWRkTWVzc2FnZShwYWdlKCksIFRyYWNlTWVzc2FnZVR5cGUsIExvZ01l c3NhZ2VMZXZlbCwgc3RhdGUsIGFyZ3VtZW50cywgdHJ1ZSwgdHJ1ZSk7CiB9CiAKIHZvaWQgQ29u c29sZTo6YXNzZXJ0Q29uZGl0aW9uKFNjcmlwdFN0YXRlKiBzdGF0ZSwgUGFzc1JlZlB0cjxTY3Jp cHRBcmd1bWVudHM+IGFyZ3VtZW50cywgYm9vbCBjb25kaXRpb24pCkBAIC0yODEsNyArMjgyLDcg QEAgdm9pZCBDb25zb2xlOjphc3NlcnRDb25kaXRpb24oU2NyaXB0U3RhdGUqIHN0YXRlLCBQYXNz UmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXIKICAgICBpZiAoY29uZGl0aW9uKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBpbnRlcm5hbEFkZE1lc3NhZ2UocGFnZSgpLCBBc3NlcnRNZXNzYWdlVHlw ZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIHN0YXRlLCBhcmd1bWVudHMsIHNob3VsZFByaW50RXhjZXB0 aW9ucygpLCB0cnVlKTsKKyAgICBpbnRlcm5hbEFkZE1lc3NhZ2UocGFnZSgpLCBBc3NlcnRNZXNz YWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIHN0YXRlLCBhcmd1bWVudHMsIHRydWUpOwogfQog CiB2b2lkIENvbnNvbGU6OmNvdW50KFNjcmlwdFN0YXRlKiBzdGF0ZSwgUGFzc1JlZlB0cjxTY3Jp cHRBcmd1bWVudHM+IGFyZ3VtZW50cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv U2V0dGluZ3MuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKaW5kZXggMjY4 YzU4Mi4uZDVmMTU5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKQEAgLTY0OCw2ICs2NDgs MTEgQEAgdm9pZCBTZXR0aW5nczo6c2V0QWdncmVzc2l2ZVRpbGVSZXRlbnRpb25FbmFibGVkKGJv b2wgZW5hYmxlZCkKICAgICBtX2FnZ3Jlc3NpdmVUaWxlUmV0ZW50aW9uRW5hYmxlZCA9IGVuYWJs ZWQ7CiB9CiAKK3ZvaWQgU2V0dGluZ3M6OnNldExvZ3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNv bGVFbmFibGVkKGJvb2wgZW5hYmxlZCkKK3sKKyAgICBtX2xvZ3NQYWdlTWVzc2FnZXNUb1N5c3Rl bUNvbnNvbGVFbmFibGVkID0gZW5hYmxlZDsKK30KKwogdm9pZCBTZXR0aW5nczo6c2V0TW9ja1Nj cm9sbGJhcnNFbmFibGVkKGJvb2wgZmxhZykKIHsKICAgICBnTW9ja1Njcm9sbGJhcnNFbmFibGVk ID0gZmxhZzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAppbmRleCA1MGU2ZmY5Li4xMDFkNTA5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9TZXR0aW5ncy5oCkBAIC0yOTMsNiArMjkzLDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICB2b2lkIHNldEFnZ3Jlc3NpdmVUaWxlUmV0ZW50aW9uRW5hYmxlZChib29sKTsK ICAgICAgICAgYm9vbCBhZ2dyZXNzaXZlVGlsZVJldGVudGlvbkVuYWJsZWQoKSB7IHJldHVybiBt X2FnZ3Jlc3NpdmVUaWxlUmV0ZW50aW9uRW5hYmxlZDsgfQogCisgICAgICAgIHZvaWQgc2V0TG9n c1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQoYm9vbCk7CisgICAgICAgIGJvb2wg bG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQoKSB7IHJldHVybiBtX2xvZ3NQ YWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkOyB9CisKICNpZiBVU0UoSlNDKQogICAg ICAgICBzdGF0aWMgdm9pZCBzZXRTaG91bGRSZXNwZWN0UHJpb3JpdHlJbkNTU0F0dHJpYnV0ZVNl dHRlcnMoYm9vbCk7CiAgICAgICAgIHN0YXRpYyBib29sIHNob3VsZFJlc3BlY3RQcmlvcml0eUlu Q1NTQXR0cmlidXRlU2V0dGVycygpOwpAQCAtMzY2LDYgKzM2OSw3IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICNlbmRpZgogICAgICAgICBib29sIG1fc2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5n RW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9hZ2dyZXNzaXZlVGlsZVJldGVudGlvbkVuYWJs ZWQgOiAxOworICAgICAgICBib29sIG1fbG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVu YWJsZWQgOiAxOwogCiAgICAgICAgIFRpbWVyPFNldHRpbmdzPiBtX3NldEltYWdlTG9hZGluZ1Nl dHRpbmdzVGltZXI7CiAgICAgICAgIHZvaWQgaW1hZ2VMb2FkaW5nU2V0dGluZ3NUaW1lckZpcmVk KFRpbWVyPFNldHRpbmdzPiopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDg5MDllY2QuLjk1NTBiYTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wMS0xNyAgVGltb3RoeSBIYXRjaGVyICA8dGlt b3RoeUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBsb2dnaW5nIGNvbnNvbGUgbWVzc2FnZXMg dG8gU1RET1VUIHdvcmsgaW4gV2ViS2l0MiB2aWEgYSBuZXcgc2V0dGluZy4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MTU3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVy ZW5jZXNTdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNw cDoKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRMb2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1Db25z b2xlRW5hYmxlZCk6IEFkZGVkLgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dldExvZ3NQYWdlTWVz c2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkKTogQWRkZWQuCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYklu c3BlY3RvclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Y3JlYXRlSW5zcGVjdG9yUGFnZUdy b3VwKTogRW5hYmxlIGxvZ2dpbmcgaW4gZGVidWcgYnVpbGRzLgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRl UHJlZmVyZW5jZXMpOiBTZXQgbmV3IHNldHRpbmcgaW4gV2ViQ29yZS4KKwogMjAxMy0wMS0xMSAg QmFsYXpzIEtlbGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJd IHBsdWdpbiB0ZXN0cyBhc3NlcnQgaW4gZGVidWcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2Vi UHJlZmVyZW5jZXNTdG9yZS5oCmluZGV4IGFhYjNjY2IuLjMxN2QwMDkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgKKysrIGIvU291cmNlL1dl YktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaApAQCAtMTM3LDYgKzEzNyw3IEBAIG5h bWVzcGFjZSBXZWJLaXQgewogICAgIG1hY3JvKFVzZXNFbmNvZGluZ0RldGVjdG9yLCB1c2VzRW5j b2RpbmdEZXRlY3RvciwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhUZXh0QXV0b3Np emluZ0VuYWJsZWQsIHRleHRBdXRvc2l6aW5nRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwK ICAgICBtYWNybyhBZ2dyZXNzaXZlVGlsZVJldGVudGlvbkVuYWJsZWQsIGFnZ3Jlc3NpdmVUaWxl UmV0ZW50aW9uRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKKyAgICBtYWNybyhMb2dzUGFn ZU1lc3NhZ2VzVG9TeXN0ZW1Db25zb2xlRW5hYmxlZCwgbG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVt Q29uc29sZUVuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgXAogCiAjZGVmaW5lIEZP Ul9FQUNIX1dFQktJVF9ET1VCTEVfUFJFRkVSRU5DRShtYWNybykgXApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCmluZGV4IDAzNGJjOWUuLjI4 NDlhZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZl cmVuY2VzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJl bmNlcy5jcHAKQEAgLTEwMDMsMyArMTAwMywxMyBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXRBZ2dy ZXNzaXZlVGlsZVJldGVudGlvbkVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcwog ewogICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5hZ2dyZXNzaXZlVGlsZVJldGVu dGlvbkVuYWJsZWQoKTsKIH0KKwordm9pZCBXS1ByZWZlcmVuY2VzU2V0TG9nc1BhZ2VNZXNzYWdl c1RvU3lzdGVtQ29uc29sZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwg Ym9vbCBlbmFibGVkKQoreworICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldExvZ3NQYWdl TWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkKGVuYWJsZWQpOworfQorCitib29sIFdLUHJl ZmVyZW5jZXNHZXRMb2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1Db25zb2xlRW5hYmxlZChXS1ByZWZl cmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQoreworICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5j ZXNSZWYpLT5sb2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1Db25zb2xlRW5hYmxlZCgpOworfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2 YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZh dGUuaAppbmRleCA5MDJhYTQwLi41ODkyNGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaApAQCAtMjM5LDYgKzIzOSwx MCBAQCBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0UERGUGx1Z2luRW5hYmxlZChXS1By ZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzKTsKIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNT ZXRBZ2dyZXNzaXZlVGlsZVJldGVudGlvbkVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJl bmNlcywgYm9vbCBlbmFibGVkKTsKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRBZ2dy ZXNzaXZlVGlsZVJldGVudGlvbkVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcyk7 CiAKKy8vIERlZmF1bHRzIHRvIGZhbHNlCitXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0 TG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBw cmVmZXJlbmNlcywgYm9vbCBlbmFibGVkKTsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNH ZXRMb2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1Db25zb2xlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVm IHByZWZlcmVuY2VzKTsKKwogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1Jlc2V0VGVzdFJ1 bm5lck92ZXJyaWRlcyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKTsKIAogI2lmZGVm IF9fY3BsdXNwbHVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5z cGVjdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclBy b3h5LmNwcAppbmRleCBiMmE2YTVhLi5jOTA3MzFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKQEAgLTYyLDYgKzYyLDcgQEAgc3RhdGljIFBh c3NSZWZQdHI8V2ViUGFnZUdyb3VwPiBjcmVhdGVJbnNwZWN0b3JQYWdlR3JvdXAoKQogI2lmbmRl ZiBOREVCVUcKICAgICAvLyBBbGxvdyBkZXZlbG9wZXJzIHRvIGluc3BlY3QgdGhlIFdlYiBJbnNw ZWN0b3IgaW4gZGVidWcgYnVpbGRzLgogICAgIHBhZ2VHcm91cC0+cHJlZmVyZW5jZXMoKS0+c2V0 RGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCh0cnVlKTsKKyAgICBwYWdlR3JvdXAtPnByZWZlcmVuY2Vz KCktPnNldExvZ3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkKHRydWUpOwogI2Vu ZGlmCiAKICAgICBwYWdlR3JvdXAtPnByZWZlcmVuY2VzKCktPnNldEFwcGxpY2F0aW9uQ2hyb21l TW9kZUVuYWJsZWQodHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAKaW5kZXggMjU5MDNhOC4uOWQ4NWMzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMjQwNCw2ICsyNDA0LDggQEAgdm9p ZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBz dG9yZSkKICAgICBzZXR0aW5ncy0+c2V0VGV4dEF1dG9zaXppbmdFbmFibGVkKHN0b3JlLmdldEJv b2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6dGV4dEF1dG9zaXppbmdFbmFibGVkS2V5 KCkpKTsKICNlbmRpZgogCisgICAgc2V0dGluZ3MtPnNldExvZ3NQYWdlTWVzc2FnZXNUb1N5c3Rl bUNvbnNvbGVFbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tl eTo6bG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWRLZXkoKSkpOworCiAgICAg cGxhdGZvcm1QcmVmZXJlbmNlc0RpZENoYW5nZShzdG9yZSk7CiAKICAgICBpZiAobV9kcmF3aW5n QXJlYSkKLS0gCjEuNy4xMC4yIChBcHBsZSBHaXQtMzMpCgo=