24329 2009-03-03 10:23:53 -0800 REGRESSION: console.dirxml() Console API broken 2009-03-03 14:28:02 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy aroben kmccullough timothy oldest_to_newest 112034 0 timothy 2009-03-03 10:23:53 -0800 * SUMMARY The console.dirxml (from firebug's console API) added in r36255 seems broken in r38297 * STEPS TO REPRODUCE Type 'console.dirxml(document.body)' on google.com Expected: Should return something like https://bugs.webkit.org/attachment.cgi?id=22833 Currently (WebKit r38297 and Safari 4) doesn't print anything in the console. Works great in Firefox. <rdar://problem/6367127> 112046 1 28231 timothy 2009-03-03 10:58:41 -0800 Created attachment 28231 Proposed Patch 112073 2 28231 kmccullough 2009-03-03 13:37:18 -0800 Comment on attachment 28231 Proposed Patch > diff --git a/WebCore/page/Console.cpp b/WebCore/page/Console.cpp > index 8755f0e..697baac 100644 > --- a/WebCore/page/Console.cpp > +++ b/WebCore/page/Console.cpp > @@ -109,12 +109,13 @@ static void printMessageSourceAndLevelPrefix(MessageSource source, MessageLevel > > const char* levelString; > switch (level) { > + default: > + ASSERT_NOT_REACHED(); > + levelString = "UNKNOWN"; > + break; We usually put the default: at the end of the switch statement It would be nice if the refactoring was in a separate patch but I don't have many comments and it's good that there is a test case. 112079 3 timothy 2009-03-03 14:28:02 -0800 Fixed in r41404. 28231 2009-03-03 10:58:41 -0800 2009-03-03 13:37:18 -0800 Proposed Patch 0001--Fix-a-regression-that-broke-dirxml-and-cause.patch text/plain 24586 timothy RnJvbSAwZDI2OGZmYWU1MmJiNGQxM2ZhMzUyNDE1ODJjOGQ3M2FkMzNkNjE4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBUdWUsIDMgTWFyIDIwMDkgMTA6NTc6MzQgLTA4MDAKU3ViamVjdDogW1BBVENIXSAgICAg ICAgIEZpeCBhIHJlZ3Jlc3Npb24gdGhhdCBicm9rZSBkaXJ4bWwgYW5kIGNhdXNlZCBhbiBBU1NF UlQgaW4gZGVidWcgYnVpbGRzLiBBbHNvIHNpbXBsaWZpZWQKICAgICAgICAgdGhlIGNvbnNvbGUg Y29kZSBhbmQgcmVmYWN0b3JlZCB0aGluZ3MgdG8gaGF2ZSBmZXdlciBjb2RlIHBhdGhzIGFuZCBk dXBsaWNhdGlvbi4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAg IFRlc3Q6IG1hbnVhbC10ZXN0cy9pbnNwZWN0b3IvY29uc29sZS1kaXIuaHRtbAoKICAgICAgICAq IGJpbmRpbmdzL2pzL0pTSW5zcGVjdGVkT2JqZWN0V3JhcHBlci5jcHA6CiAgICAgICAgKFdlYkNv cmU6OkpTSW5zcGVjdGVkT2JqZWN0V3JhcHBlcjo6d3JhcCk6IFVzZSB0aGUgbGV4aWNhbEdsb2Jh bE9iamVjdCBpbnN0ZWFkIG9mIGR5bmFtaWNHbG9iYWxPYmplY3QKICAgICAgICB0byBmaXggYW4g QVNTRVJUIGFib3V0IHVzaW5nIGEgd3JhcHBlciBmcm9tIHRoZSB3cm9uZyBFeGVjU3RhdGUuCiAg ICAgICAgKiBiaW5kaW5ncy9qcy9KU1F1YXJhbnRpbmVkT2JqZWN0V3JhcHBlci5jcHA6CiAgICAg ICAgKFdlYkNvcmU6OkpTUXVhcmFudGluZWRPYmplY3RXcmFwcGVyOjpKU1F1YXJhbnRpbmVkT2Jq ZWN0V3JhcHBlcik6IERpdHRvLgogICAgICAgIChXZWJDb3JlOjpKU1F1YXJhbnRpbmVkT2JqZWN0 V3JhcHBlcjo6YWxsb3dzVW53cmFwcGVkQWNjZXNzRnJvbSk6IERpdHRvLgogICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlLmpzOgogICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29s ZS5wcm90b3R5cGUuX2Zvcm1hdCk6IFJlbW92ZSB0aGUgaW5saW5lIGFyZ3VtZW50IGFuZCBhZGQg Zm9yY2VPYmplY3RGb3JtYXQuCiAgICAgICAgV2hlbiBmb3JjZU9iamVjdEZvcm1hdCBpcyB0cnVl LCB0aGUgb25seSBmb3JtYXR0ZXIgdXNlZCBpcyBfZm9ybWF0b2JqZWN0LgogICAgICAgIChXZWJJ bnNwZWN0b3IuQ29uc29sZS5wcm90b3R5cGUuX2Zvcm1hdHZhbHVlKTogUmVtb3ZlIHRoZSBpbmxp bmUgYXJndW1lbnQuCiAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlLnByb3RvdHlwZS5fZm9y bWF0c3RyaW5nKTogRGl0dG8uCiAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlLnByb3RvdHlw ZS5fZm9ybWF0cmVnZXhwKTogRGl0dG8uCiAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlLnBy b3RvdHlwZS5fZm9ybWF0YXJyYXkpOiBEaXR0by4KICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNv bGUucHJvdG90eXBlLl9mb3JtYXRub2RlKTogUmVtb3ZlIHRoZSBpbmxpbmUgYXJndW1lbnQgYW5k IG1ha2UgYSBET00gdHJlZSBpbnN0ZWFkIG9mIGFuIGFuY2hvci4KICAgICAgICAoV2ViSW5zcGVj dG9yLkNvbnNvbGUucHJvdG90eXBlLl9mb3JtYXRvYmplY3QpOiBSZW1vdmUgdGhlIGlubGluZSBh cmd1bWVudCBhbmQgYWx3YXlzIG1ha2UgYSBwcm9wZXJ0eSBncmFwaC4KICAgICAgICAoV2ViSW5z cGVjdG9yLkNvbnNvbGUucHJvdG90eXBlLl9mb3JtYXRlcnJvcik6IFJlbW92ZSB0aGUgaW5saW5l IGFyZ3VtZW50LgogICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UpOiBSZW1vdmUg dGhlIGNhc2UgZm9yIE1lc3NhZ2VMZXZlbC5Ob2RlIGFuZAogICAgICAgIHNpbXBsaWZ5IHRoZSBj YXNlIGZvciBNZXNzYWdlTGV2ZWwuT2JqZWN0IHRvIHVzZSB0aGUgbm9ybWFsIF9mb3JtYXQgY29k ZSBwYXRoIHdpdGggdGhlICVPIGZvcm1hdHRlci4KICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNv bGVNZXNzYWdlLnByb3RvdHlwZS5fZm9ybWF0LmZvcm1hdEZvckNvbnNvbGUpOiBEb24ndCBwYXNz IGFuIGFkZGl0aW9uYWwgdHJ1ZSBhcmd1bWVudCBmb3IgaW5saW5lLgogICAgICAgIChXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlLl9mb3JtYXQuZm9ybWF0QXNPYmplY3RGb3JD b25zb2xlKTogQWRkZWQuIFBhc3MgYSB0cnVlIGFyZ3VtZW50IGZvciBmb3JjZU9iamVjdEZvcm1h dC4KICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5fZm9ybWF0 KTogQWRkZWQgc3VwcG9ydCBmb3IgdGhlICVPIGZvcm1hdHRlci4gVXNlIGZvcm1hdEZvckNvbnNv bGUgZm9yIGFsbCBhcmd1bWVudHMuCiAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5wcm90b3R5cGUudG9TdHJpbmcpOiBBZGQgdGhlIG90aGVyIG1lc3NhZ2UgbGV2ZWxzLgogICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOiBUd2VhayBzdHlsZXMgdG8g bG9vayBhbmQgd29yayBjb3JyZWN0bHkuCiAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3V0 aWxpdGllcy5qczoKICAgICAgICAoT2JqZWN0LnR5cGUpOiBSZXR1cm4gIm5vZGUiIGZvciBOb2Rl IG9iamVjdHMuCiAgICAgICAgKE9iamVjdC5kZXNjcmliZSk6IEhhbmRsZSB0aGUgIm5vZGUiIHR5 cGUuCiAgICAgICAgKiBwYWdlL0NvbnNvbGUuY3BwOgogICAgICAgIChXZWJDb3JlOjpwcmludE1l c3NhZ2VTb3VyY2VBbmRMZXZlbFByZWZpeCk6IEZpeCBhbiBhc3NlcnQgYnkgYWRkaW5nIHRoZSBv dGhlciBtZXNzYWdlIGxldmVsIHR5cGVzLgogICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjpkaXJ4 bWwpOiBVc2UgdGhlIHN0YW5kYXJkIGxvZyBmdWN0aW9uIHNpbmNlIGl0IHByaW50cyBhIERPTSB0 cmVlIGZvciBub2RlcyBieSBkZWZhdWx0LgogICAgICAgICogcGFnZS9Db25zb2xlLmg6CiAgICAg ICAgKFdlYkNvcmU6OmVudW0gTWVzc2FnZUxldmVsKTogUmVtb3ZlZCBOb2RlTWVzc2FnZUxldmVs LiBBZGRlZCBhIEZJWE1FLgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICA0MSArKysrKysrCiBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW5z cGVjdGVkT2JqZWN0V3JhcHBlci5jcHAgICB8ICAgIDIgKy0KIFdlYkNvcmUvYmluZGluZ3MvanMv SlNRdWFyYW50aW5lZE9iamVjdFdyYXBwZXIuY3BwIHwgICAgNCArLQogV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0NvbnNvbGUuanMgICAgICAgICAgICAgfCAgMTE3ICsrKysrKysrLS0tLS0t LS0tLS0tCiBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcyAgICAgICAg ICB8ICAgMzkgKysrKy0tLQogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5q cyAgICAgICAgICAgfCAgICAzICsKIFdlYkNvcmUvbWFudWFsLXRlc3RzL2luc3BlY3Rvci9jb25z b2xlLWRpci5odG1sICAgIHwgICAzMSArKysrKwogV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIyICsrKy0KIFdlYkNvcmUvcGFnZS9Db25zb2xl LmggICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgMiArLQogOSBmaWxlcyBjaGFuZ2Vk LCAxNjYgaW5zZXJ0aW9ucygrKSwgOTUgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQg V2ViQ29yZS9tYW51YWwtdGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUtZGlyLmh0bWwKCmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDQwMDYxOTYu LjU1YTk0NzIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsNDQgQEAKKzIwMDktMDMtMDMgIFRpbW90aHkgSGF0Y2hlciAgPHRp bW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBhIHJlZ3Jlc3Npb24gdGhhdCBicm9rZSBk aXJ4bWwgYW5kIGNhdXNlZCBhbiBBU1NFUlQgaW4gZGVidWcgYnVpbGRzLiBBbHNvIHNpbXBsaWZp ZWQKKyAgICAgICAgdGhlIGNvbnNvbGUgY29kZSBhbmQgcmVmYWN0b3JlZCB0aGluZ3MgdG8gaGF2 ZSBmZXdlciBjb2RlIHBhdGhzIGFuZCBkdXBsaWNhdGlvbi4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBtYW51YWwtdGVzdHMvaW5zcGVjdG9y L2NvbnNvbGUtZGlyLmh0bWwKKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTSW5zcGVjdGVkT2Jq ZWN0V3JhcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0luc3BlY3RlZE9iamVjdFdyYXBw ZXI6OndyYXApOiBVc2UgdGhlIGxleGljYWxHbG9iYWxPYmplY3QgaW5zdGVhZCBvZiBkeW5hbWlj R2xvYmFsT2JqZWN0CisgICAgICAgIHRvIGZpeCBhbiBBU1NFUlQgYWJvdXQgdXNpbmcgYSB3cmFw cGVyIGZyb20gdGhlIHdyb25nIEV4ZWNTdGF0ZS4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU1F1 YXJhbnRpbmVkT2JqZWN0V3JhcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU1F1YXJhbnRp bmVkT2JqZWN0V3JhcHBlcjo6SlNRdWFyYW50aW5lZE9iamVjdFdyYXBwZXIpOiBEaXR0by4KKyAg ICAgICAgKFdlYkNvcmU6OkpTUXVhcmFudGluZWRPYmplY3RXcmFwcGVyOjphbGxvd3NVbndyYXBw ZWRBY2Nlc3NGcm9tKTogRGl0dG8uCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25z b2xlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGUucHJvdG90eXBlLl9mb3JtYXQp OiBSZW1vdmUgdGhlIGlubGluZSBhcmd1bWVudCBhbmQgYWRkIGZvcmNlT2JqZWN0Rm9ybWF0Lgor ICAgICAgICBXaGVuIGZvcmNlT2JqZWN0Rm9ybWF0IGlzIHRydWUsIHRoZSBvbmx5IGZvcm1hdHRl ciB1c2VkIGlzIF9mb3JtYXRvYmplY3QuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZS5w cm90b3R5cGUuX2Zvcm1hdHZhbHVlKTogUmVtb3ZlIHRoZSBpbmxpbmUgYXJndW1lbnQuCisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZS5wcm90b3R5cGUuX2Zvcm1hdHN0cmluZyk6IERpdHRv LgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGUucHJvdG90eXBlLl9mb3JtYXRyZWdleHAp OiBEaXR0by4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlLnByb3RvdHlwZS5fZm9ybWF0 YXJyYXkpOiBEaXR0by4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlLnByb3RvdHlwZS5f Zm9ybWF0bm9kZSk6IFJlbW92ZSB0aGUgaW5saW5lIGFyZ3VtZW50IGFuZCBtYWtlIGEgRE9NIHRy ZWUgaW5zdGVhZCBvZiBhbiBhbmNob3IuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZS5w cm90b3R5cGUuX2Zvcm1hdG9iamVjdCk6IFJlbW92ZSB0aGUgaW5saW5lIGFyZ3VtZW50IGFuZCBh bHdheXMgbWFrZSBhIHByb3BlcnR5IGdyYXBoLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNv bGUucHJvdG90eXBlLl9mb3JtYXRlcnJvcik6IFJlbW92ZSB0aGUgaW5saW5lIGFyZ3VtZW50Lgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlKTogUmVtb3ZlIHRoZSBjYXNlIGZv ciBNZXNzYWdlTGV2ZWwuTm9kZSBhbmQKKyAgICAgICAgc2ltcGxpZnkgdGhlIGNhc2UgZm9yIE1l c3NhZ2VMZXZlbC5PYmplY3QgdG8gdXNlIHRoZSBub3JtYWwgX2Zvcm1hdCBjb2RlIHBhdGggd2l0 aCB0aGUgJU8gZm9ybWF0dGVyLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl LnByb3RvdHlwZS5fZm9ybWF0LmZvcm1hdEZvckNvbnNvbGUpOiBEb24ndCBwYXNzIGFuIGFkZGl0 aW9uYWwgdHJ1ZSBhcmd1bWVudCBmb3IgaW5saW5lLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bnNvbGVNZXNzYWdlLnByb3RvdHlwZS5fZm9ybWF0LmZvcm1hdEFzT2JqZWN0Rm9yQ29uc29sZSk6 IEFkZGVkLiBQYXNzIGEgdHJ1ZSBhcmd1bWVudCBmb3IgZm9yY2VPYmplY3RGb3JtYXQuCisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlLl9mb3JtYXQpOiBBZGRl ZCBzdXBwb3J0IGZvciB0aGUgJU8gZm9ybWF0dGVyLiBVc2UgZm9ybWF0Rm9yQ29uc29sZSBmb3Ig YWxsIGFyZ3VtZW50cy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90 b3R5cGUudG9TdHJpbmcpOiBBZGQgdGhlIG90aGVyIG1lc3NhZ2UgbGV2ZWxzLgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzczogVHdlYWsgc3R5bGVzIHRvIGxvb2sg YW5kIHdvcmsgY29ycmVjdGx5LgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0 aWVzLmpzOgorICAgICAgICAoT2JqZWN0LnR5cGUpOiBSZXR1cm4gIm5vZGUiIGZvciBOb2RlIG9i amVjdHMuCisgICAgICAgIChPYmplY3QuZGVzY3JpYmUpOiBIYW5kbGUgdGhlICJub2RlIiB0eXBl LgorICAgICAgICAqIHBhZ2UvQ29uc29sZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmludE1l c3NhZ2VTb3VyY2VBbmRMZXZlbFByZWZpeCk6IEZpeCBhbiBhc3NlcnQgYnkgYWRkaW5nIHRoZSBv dGhlciBtZXNzYWdlIGxldmVsIHR5cGVzLgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZTo6ZGly eG1sKTogVXNlIHRoZSBzdGFuZGFyZCBsb2cgZnVjdGlvbiBzaW5jZSBpdCBwcmludHMgYSBET00g dHJlZSBmb3Igbm9kZXMgYnkgZGVmYXVsdC4KKyAgICAgICAgKiBwYWdlL0NvbnNvbGUuaDoKKyAg ICAgICAgKFdlYkNvcmU6OmVudW0gTWVzc2FnZUxldmVsKTogUmVtb3ZlZCBOb2RlTWVzc2FnZUxl dmVsLiBBZGRlZCBhIEZJWE1FLgorCiAyMDA5LTAzLTAyICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1v dGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXhlcyBhIHJlZ3Jlc3Npb24gY2F1c2VkIGJ5IHNw bGl0dGluZyB0aGUgaW5wdXQgYW5kIG91dHB1dCBvZiBjb25zb2xlIGNvbW1hbmRzLgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0luc3BlY3RlZE9iamVjdFdyYXBwZXIuY3BwIGIv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU0luc3BlY3RlZE9iamVjdFdyYXBwZXIuY3BwCmluZGV4IDA5 YWQ5ZjQuLjIyMWZlZDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbnNwZWN0 ZWRPYmplY3RXcmFwcGVyLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW5zcGVjdGVk T2JqZWN0V3JhcHBlci5jcHAKQEAgLTU3LDcgKzU3LDcgQEAgSlNWYWx1ZVB0ciBKU0luc3BlY3Rl ZE9iamVjdFdyYXBwZXI6OndyYXAoRXhlY1N0YXRlKiB1bndyYXBwZWRFeGVjLCBKU1ZhbHVlUHRy IHUKICAgICBpZiAodW53cmFwcGVkT2JqZWN0LT5pbmhlcml0cygmSlNJbnNwZWN0ZWRPYmplY3RX cmFwcGVyOjpzX2luZm8pKQogICAgICAgICByZXR1cm4gdW53cmFwcGVkT2JqZWN0OwogCi0gICAg aWYgKFdyYXBwZXJNYXAqIHdyYXBwZXJNYXAgPSB3cmFwcGVycygpLmdldCh1bndyYXBwZWRFeGVj LT5keW5hbWljR2xvYmFsT2JqZWN0KCkpKQorICAgIGlmIChXcmFwcGVyTWFwKiB3cmFwcGVyTWFw ID0gd3JhcHBlcnMoKS5nZXQodW53cmFwcGVkRXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpKSkK ICAgICAgICAgaWYgKEpTSW5zcGVjdGVkT2JqZWN0V3JhcHBlciogd3JhcHBlciA9IHdyYXBwZXJN YXAtPmdldCh1bndyYXBwZWRPYmplY3QpKQogICAgICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNRdWFyYW50aW5lZE9iamVjdFdyYXBw ZXIuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1F1YXJhbnRpbmVkT2JqZWN0V3JhcHBlci5j cHAKaW5kZXggYWZkMmExOC4uMjUxNDdmMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU1F1YXJhbnRpbmVkT2JqZWN0V3JhcHBlci5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU1F1YXJhbnRpbmVkT2JqZWN0V3JhcHBlci5jcHAKQEAgLTU4LDcgKzU4LDcgQEAgSlNWYWx1 ZVB0ciBKU1F1YXJhbnRpbmVkT2JqZWN0V3JhcHBlcjo6Y2FjaGVkVmFsdWVHZXR0ZXIoRXhlY1N0 YXRlKiwgY29uc3QgSWRlbnQKIAogSlNRdWFyYW50aW5lZE9iamVjdFdyYXBwZXI6OkpTUXVhcmFu dGluZWRPYmplY3RXcmFwcGVyKEV4ZWNTdGF0ZSogdW53cmFwcGVkRXhlYywgSlNPYmplY3QqIHVu d3JhcHBlZE9iamVjdCwgUGFzc1JlZlB0cjxTdHJ1Y3R1cmU+IHN0cnVjdHVyZSkKICAgICA6IEpT T2JqZWN0KHN0cnVjdHVyZSkKLSAgICAsIG1fdW53cmFwcGVkR2xvYmFsT2JqZWN0KHVud3JhcHBl ZEV4ZWMtPmR5bmFtaWNHbG9iYWxPYmplY3QoKSkKKyAgICAsIG1fdW53cmFwcGVkR2xvYmFsT2Jq ZWN0KHVud3JhcHBlZEV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKSkKICAgICAsIG1fdW53cmFw cGVkT2JqZWN0KHVud3JhcHBlZE9iamVjdCkKIHsKICAgICBBU1NFUlRfQVJHKHVud3JhcHBlZEV4 ZWMsIHVud3JhcHBlZEV4ZWMpOwpAQCAtNzIsNyArNzIsNyBAQCBKU1F1YXJhbnRpbmVkT2JqZWN0 V3JhcHBlcjo6fkpTUXVhcmFudGluZWRPYmplY3RXcmFwcGVyKCkKIAogYm9vbCBKU1F1YXJhbnRp bmVkT2JqZWN0V3JhcHBlcjo6YWxsb3dzVW53cmFwcGVkQWNjZXNzRnJvbShFeGVjU3RhdGUqIGV4 ZWMpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fdW53cmFwcGVkR2xvYmFsT2JqZWN0LT5wcm9maWxl R3JvdXAoKSA9PSBleGVjLT5keW5hbWljR2xvYmFsT2JqZWN0KCktPnByb2ZpbGVHcm91cCgpOwor ICAgIHJldHVybiBtX3Vud3JhcHBlZEdsb2JhbE9iamVjdC0+cHJvZmlsZUdyb3VwKCkgPT0gZXhl Yy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpLT5wcm9maWxlR3JvdXAoKTsKIH0KIAogRXhlY1N0YXRl KiBKU1F1YXJhbnRpbmVkT2JqZWN0V3JhcHBlcjo6dW53cmFwcGVkRXhlY1N0YXRlKCkgY29uc3QK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlLmpzIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGUuanMKaW5kZXggOGViOTE4Ni4uYmE4Nzlh MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGUuanMKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGUuanMKQEAgLTQ2NSwyNyArNDY1 LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmFk ZE1lc3NhZ2UobmV3IFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdChyZXN1bHQsIGV4 Y2VwdGlvbiwgY29tbWFuZE1lc3NhZ2UpKTsKICAgICB9LAogCi0gICAgX21vdXNlT3Zlck5vZGU6 IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9mb3JtYXQ6IGZ1bmN0aW9uKG91dHB1dCwgZm9yY2VPYmpl Y3RGb3JtYXQpCiAgICAgewotICAgICAgICB2YXIgYW5jaG9yRWxlbWVudCA9IGV2ZW50LnRhcmdl dC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aE5vZGVOYW1lKCJhIik7Ci0gICAgICAgIFdlYkluc3Bl Y3Rvci5ob3ZlcmVkRE9NTm9kZSA9IChhbmNob3JFbGVtZW50ID8gYW5jaG9yRWxlbWVudC5yZXBy ZXNlbnRlZE5vZGUgOiBudWxsKTsKLSAgICB9LAotCi0gICAgX21vdXNlT3V0T2ZOb2RlOiBmdW5j dGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIHZhciBub2RlVW5kZXJNb3VzZSA9IGRvY3VtZW50 LmVsZW1lbnRGcm9tUG9pbnQoZXZlbnQucGFnZVgsIGV2ZW50LnBhZ2VZKTsKLSAgICAgICAgdmFy IGFuY2hvckVsZW1lbnQgPSBub2RlVW5kZXJNb3VzZS5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aE5v ZGVOYW1lKCJhIik7Ci0gICAgICAgIGlmICghYW5jaG9yRWxlbWVudCB8fCAhYW5jaG9yRWxlbWVu dC5yZXByZXNlbnRlZE5vZGUpCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IuaG92ZXJlZERPTU5v ZGUgPSBudWxsOwotICAgIH0sCi0KLSAgICBfZm9ybWF0OiBmdW5jdGlvbihvdXRwdXQsIGlubGlu ZSkKLSAgICB7Ci0gICAgICAgIHZhciB0eXBlID0gT2JqZWN0LnR5cGUob3V0cHV0LCBJbnNwZWN0 b3JDb250cm9sbGVyLmluc3BlY3RlZFdpbmRvdygpKTsKLSAgICAgICAgaWYgKHR5cGUgPT09ICJv YmplY3QiKSB7Ci0gICAgICAgICAgICBpZiAob3V0cHV0IGluc3RhbmNlb2YgSW5zcGVjdG9yQ29u dHJvbGxlci5pbnNwZWN0ZWRXaW5kb3coKS5Ob2RlKQotICAgICAgICAgICAgICAgIHR5cGUgPSAi bm9kZSI7Ci0gICAgICAgIH0KKyAgICAgICAgdmFyIHR5cGUgPSAoZm9yY2VPYmplY3RGb3JtYXQg PyAib2JqZWN0IiA6IE9iamVjdC50eXBlKG91dHB1dCwgSW5zcGVjdG9yQ29udHJvbGxlci5pbnNw ZWN0ZWRXaW5kb3coKSkpOwogCiAgICAgICAgIC8vIFdlIGRvbid0IHBlcmZvcm0gYW55IHNwZWNp YWwgZm9ybWF0dGluZyBvbiB0aGVzZSB0eXBlcywgc28gd2UganVzdAogICAgICAgICAvLyBwYXNz IHRoZW0gdGhyb3VnaCB0aGUgc2ltcGxlIF9mb3JtYXR2YWx1ZSBmdW5jdGlvbi4KQEAgLTQ5OSw3 ICs0ODEsOSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH07 CiAKICAgICAgICAgdmFyIGZvcm1hdHRlcjsKLSAgICAgICAgaWYgKHR5cGUgaW4gdW5kZWNvcmF0 ZWRUeXBlcykKKyAgICAgICAgaWYgKGZvcmNlT2JqZWN0Rm9ybWF0KQorICAgICAgICAgICAgZm9y bWF0dGVyID0gIl9mb3JtYXRvYmplY3QiOworICAgICAgICBlbHNlIGlmICh0eXBlIGluIHVuZGVj b3JhdGVkVHlwZXMpCiAgICAgICAgICAgICBmb3JtYXR0ZXIgPSAiX2Zvcm1hdHZhbHVlIjsKICAg ICAgICAgZWxzZSB7CiAgICAgICAgICAgICBmb3JtYXR0ZXIgPSAiX2Zvcm1hdCIgKyB0eXBlOwpA QCAtNTExLDYxICs0OTUsNTMgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGUucHJvdG90eXBlID0gewog CiAgICAgICAgIHZhciBzcGFuID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAg ICAgICBzcGFuLmFkZFN0eWxlQ2xhc3MoImNvbnNvbGUtZm9ybWF0dGVkLSIgKyB0eXBlKTsKLSAg ICAgICAgdGhpc1tmb3JtYXR0ZXJdKG91dHB1dCwgc3BhbiwgaW5saW5lKTsKKyAgICAgICAgdGhp c1tmb3JtYXR0ZXJdKG91dHB1dCwgc3Bhbik7CiAgICAgICAgIHJldHVybiBzcGFuOwogICAgIH0s CiAKLSAgICBfZm9ybWF0dmFsdWU6IGZ1bmN0aW9uKHZhbCwgZWxlbSwgaW5saW5lKQorICAgIF9m b3JtYXR2YWx1ZTogZnVuY3Rpb24odmFsLCBlbGVtKQogICAgIHsKICAgICAgICAgZWxlbS5hcHBl bmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSh2YWwpKTsKICAgICB9LAogCi0gICAgX2Zv cm1hdHN0cmluZzogZnVuY3Rpb24oc3RyLCBlbGVtLCBpbmxpbmUpCisgICAgX2Zvcm1hdHN0cmlu ZzogZnVuY3Rpb24oc3RyLCBlbGVtKQogICAgIHsKICAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChk b2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiXCIiICsgc3RyICsgIlwiIikpOwogICAgIH0sCiAKLSAg ICBfZm9ybWF0cmVnZXhwOiBmdW5jdGlvbihyZSwgZWxlbSwgaW5saW5lKQorICAgIF9mb3JtYXRy ZWdleHA6IGZ1bmN0aW9uKHJlLCBlbGVtKQogICAgIHsKICAgICAgICAgdmFyIGZvcm1hdHRlZCA9 IFN0cmluZyhyZSkucmVwbGFjZSgvKFtcXFwvXSkvZywgIlxcJDEiKS5yZXBsYWNlKC9cXChcL1tn aW1dKikkLywgIiQxIikuc3Vic3RyaW5nKDEpOwogICAgICAgICBlbGVtLmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZVRleHROb2RlKGZvcm1hdHRlZCkpOwogICAgIH0sCiAKLSAgICBfZm9ybWF0 YXJyYXk6IGZ1bmN0aW9uKGFyciwgZWxlbSwgaW5saW5lKQorICAgIF9mb3JtYXRhcnJheTogZnVu Y3Rpb24oYXJyLCBlbGVtKQogICAgIHsKICAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChkb2N1bWVu dC5jcmVhdGVUZXh0Tm9kZSgiWyIpKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBhcnIu bGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQodGhpcy5fZm9ybWF0 KGFycltpXSwgdHJ1ZSkpOworICAgICAgICAgICAgZWxlbS5hcHBlbmRDaGlsZCh0aGlzLl9mb3Jt YXQoYXJyW2ldKSk7CiAgICAgICAgICAgICBpZiAoaSA8IGFyci5sZW5ndGggLSAxKQogICAgICAg ICAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIiwgIikp OwogICAgICAgICB9CiAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4 dE5vZGUoIl0iKSk7CiAgICAgfSwKIAotICAgIF9mb3JtYXRub2RlOiBmdW5jdGlvbihub2RlLCBl bGVtLCBpbmxpbmUpCisgICAgX2Zvcm1hdG5vZGU6IGZ1bmN0aW9uKG5vZGUsIGVsZW0pCiAgICAg ewotICAgICAgICB2YXIgYW5jaG9yID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYSIpOwotICAg ICAgICBhbmNob3IuY2xhc3NOYW1lID0gImluc3BlY3RhYmxlLW5vZGUiOwotICAgICAgICBhbmNo b3IuaW5uZXJIVE1MID0gbm9kZVRpdGxlSW5mby5jYWxsKG5vZGUpLnRpdGxlOwotICAgICAgICBh bmNob3IucmVwcmVzZW50ZWROb2RlID0gbm9kZTsKLSAgICAgICAgYW5jaG9yLmFkZEV2ZW50TGlz dGVuZXIoIm1vdXNlb3ZlciIsIHRoaXMuX21vdXNlT3Zlck5vZGUuYmluZCh0aGlzKSwgZmFsc2Up OwotICAgICAgICBhbmNob3IuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCB0aGlzLl9tb3Vz ZU91dE9mTm9kZS5iaW5kKHRoaXMpLCBmYWxzZSk7Ci0KLSAgICAgICAgaWYgKGlubGluZSkKLSAg ICAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoYW5jaG9yKTsKLSAgICAgICAgZWxzZQotICAgICAg ICAgICAgZWxlbS5hcHBlbmRDaGlsZChuZXcgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNT ZWN0aW9uKG5vZGUsIGFuY2hvciwgbnVsbCwgbnVsbCwgdHJ1ZSkuZWxlbWVudCk7CisgICAgICAg IHZhciB0cmVlT3V0bGluZSA9IG5ldyBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZSgp OworICAgICAgICB0cmVlT3V0bGluZS5yb290RE9NTm9kZSA9IG5vZGU7CisgICAgICAgIHRyZWVP dXRsaW5lLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygib3V0bGluZS1kaXNjbG9zdXJlIik7CisgICAg ICAgIGlmICghdHJlZU91dGxpbmUuY2hpbGRyZW5bMF0uaGFzQ2hpbGRyZW4pCisgICAgICAgICAg ICB0cmVlT3V0bGluZS5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNpbmdsZS1ub2RlIik7CisgICAg ICAgIGVsZW0uYXBwZW5kQ2hpbGQodHJlZU91dGxpbmUuZWxlbWVudCk7CiAgICAgfSwKIAotICAg IF9mb3JtYXRvYmplY3Q6IGZ1bmN0aW9uKG9iaiwgZWxlbSwgaW5saW5lKQorICAgIF9mb3JtYXRv YmplY3Q6IGZ1bmN0aW9uKG9iaiwgZWxlbSkKICAgICB7Ci0gICAgICAgIGlmIChpbmxpbmUpCi0g ICAgICAgICAgICBlbGVtLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKE9iamVj dC5kZXNjcmliZShvYmopKSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGVsZW0uYXBwZW5k Q2hpbGQobmV3IFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbihvYmosIG51bGws IG51bGwsIG51bGwsIHRydWUpLmVsZW1lbnQpOworICAgICAgICBlbGVtLmFwcGVuZENoaWxkKG5l dyBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24ob2JqLCBudWxsLCBudWxsLCBu dWxsLCB0cnVlKS5lbGVtZW50KTsKICAgICB9LAogCi0gICAgX2Zvcm1hdGVycm9yOiBmdW5jdGlv bihvYmosIGVsZW0sIGlubGluZSkKKyAgICBfZm9ybWF0ZXJyb3I6IGZ1bmN0aW9uKG9iaiwgZWxl bSkKICAgICB7CiAgICAgICAgIHZhciBtZXNzYWdlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoInNwYW4iKTsKICAgICAgICAgbWVzc2FnZUVsZW1lbnQuY2xhc3NOYW1lID0gImVycm9y LW1lc3NhZ2UiOwpAQCAtNjAzLDE4ICs1NzksNiBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2UgPSBmdW5jdGlvbihzb3VyY2UsIGxldmVsLCBsaW5lLCB1cmwsIGdyb3VwTGV2ZWwsIHJlcAog ICAgIHRoaXMucmVwZWF0Q291bnQgPSByZXBlYXRDb3VudDsKIAogICAgIHN3aXRjaCAodGhpcy5s ZXZlbCkgewotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl TGV2ZWwuT2JqZWN0OgotICAgICAgICAgICAgdmFyIHByb3BlcnRpZXNTZWN0aW9uID0gbmV3IFdl Ykluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbihhcmd1bWVudHNbNl0sIG51bGwsIG51 bGwsIG51bGwsIHRydWUpOwotICAgICAgICAgICAgcHJvcGVydGllc1NlY3Rpb24uZWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJjb25zb2xlLW1lc3NhZ2UiKTsKLSAgICAgICAgICAgIHRoaXMucHJvcGVy dGllc1NlY3Rpb24gPSBwcm9wZXJ0aWVzU2VjdGlvbjsKLSAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuTm9kZToK LSAgICAgICAgICAgIHZhciBub2RlID0gYXJndW1lbnRzWzZdOwotICAgICAgICAgICAgaWYgKCEo bm9kZSBpbnN0YW5jZW9mIEluc3BlY3RvckNvbnRyb2xsZXIuaW5zcGVjdGVkV2luZG93KCkuTm9k ZSkpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgdGhpcy5lbGVtZW50c1Ry ZWVPdXRsaW5lID0gbmV3IFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lKCk7Ci0gICAg ICAgICAgICB0aGlzLmVsZW1lbnRzVHJlZU91dGxpbmUucm9vdERPTU5vZGUgPSBub2RlOwotICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl Lk1lc3NhZ2VMZXZlbC5UcmFjZToKICAgICAgICAgICAgIHZhciBzcGFuID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgic3BhbiIpOwogICAgICAgICAgICAgc3Bhbi5hZGRTdHlsZUNsYXNzKCJjb25z b2xlLWZvcm1hdHRlZC10cmFjZSIpOwpAQCAtNjI1LDE0ICs1ODksMTYgQEAgV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlID0gZnVuY3Rpb24oc291cmNlLCBsZXZlbCwgbGluZSwgdXJsLCBncm91 cExldmVsLCByZXAKICAgICAgICAgICAgIHNwYW4uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRl VGV4dE5vZGUoZnVuY05hbWVzLmpvaW4oIlxuIikpKTsKICAgICAgICAgICAgIHRoaXMuZm9ybWF0 dGVkTWVzc2FnZSA9IHNwYW47CiAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLk9iamVjdDoKKyAgICAgICAgICAg IHRoaXMuZm9ybWF0dGVkTWVzc2FnZSA9IHRoaXMuX2Zvcm1hdChbIiVPIiwgYXJndW1lbnRzWzZd XSk7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIC8v IFRoZSBmb3JtYXRlZE1lc3NhZ2UgcHJvcGVydHkgaXMgdXNlZCBmb3IgdGhlIHJpY2ggYW5kIGlu dGVyYWN0aXZlIGNvbnNvbGUuCiAgICAgICAgICAgICB0aGlzLmZvcm1hdHRlZE1lc3NhZ2UgPSB0 aGlzLl9mb3JtYXQoQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwoYXJndW1lbnRzLCA2KSk7Ci0K LSAgICAgICAgICAgIC8vIFRoaXMgaXMgdXNlZCBmb3IgaW5saW5lIG1lc3NhZ2UgYnViYmxlcyBp biBTb3VyY2VGcmFtZXMsIG9yIG90aGVyIHBsYWluLXRleHQgcmVwcmVzZW50YXRpb25zLgotICAg ICAgICAgICAgdGhpcy5tZXNzYWdlID0gdGhpcy5mb3JtYXR0ZWRNZXNzYWdlLnRleHRDb250ZW50 OwogICAgICAgICAgICAgYnJlYWs7CiAgICAgfQorCisgICAgLy8gVGhpcyBpcyB1c2VkIGZvciBp bmxpbmUgbWVzc2FnZSBidWJibGVzIGluIFNvdXJjZUZyYW1lcywgb3Igb3RoZXIgcGxhaW4tdGV4 dCByZXByZXNlbnRhdGlvbnMuCisgICAgdGhpcy5tZXNzYWdlID0gdGhpcy5mb3JtYXR0ZWRNZXNz YWdlLnRleHRDb250ZW50OwogfQogCiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90 eXBlID0gewpAQCAtNjUwLDYgKzYxNiwxMSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2Uu cHJvdG90eXBlID0gewogCiAgICAgICAgIGZ1bmN0aW9uIGZvcm1hdEZvckNvbnNvbGUob2JqKQog ICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmNvbnNvbGUuX2Zvcm1h dChvYmopOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gZm9ybWF0QXNPYmplY3RGb3JD b25zb2xlKG9iaikKKyAgICAgICAgewogICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5j b25zb2xlLl9mb3JtYXQob2JqLCB0cnVlKTsKICAgICAgICAgfQogCkBAIC02NjIsNiArNjMzLDgg QEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IGZvcm1hdHRlcnMubyA9IGZvcm1hdEZvckNvbnNvbGU7CiAgICAgICAgICAgICAvLyBGaXJlYnVn IGFsbG93cyBib3RoICVpIGFuZCAlZCBmb3IgZm9ybWF0dGluZyBpbnRlZ2Vycy4KICAgICAgICAg ICAgIGZvcm1hdHRlcnMuaSA9IGZvcm1hdHRlcnMuZDsKKyAgICAgICAgICAgIC8vIFN1cHBvcnQg JU8gdG8gZm9yY2Ugb2JqZWN0IGZvcm1hdGluZywgaW5zdGVhZCBvZiB0aGUgdHlwZS1iYXNlZCAl byBmb3JtYXR0aW5nLgorICAgICAgICAgICAgZm9ybWF0dGVycy5PID0gZm9ybWF0QXNPYmplY3RG b3JDb25zb2xlOwogCiAgICAgICAgICAgICBmdW5jdGlvbiBhcHBlbmQoYSwgYikKICAgICAgICAg ICAgIHsKQEAgLTY4MiwxMCArNjU1LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnBy b3RvdHlwZSA9IHsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBwYXJhbWV0ZXJzLmxlbmd0 aDsgKytpKSB7CiAgICAgICAgICAgICBpZiAodHlwZW9mIHBhcmFtZXRlcnNbaV0gPT09ICJzdHJp bmciKQogICAgICAgICAgICAgICAgIGZvcm1hdHRlZFJlc3VsdC5hcHBlbmRDaGlsZChXZWJJbnNw ZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnQocGFyYW1ldGVyc1tpXSkpOwotICAgICAgICAg ICAgZWxzZSBpZiAocGFyYW1ldGVycy5sZW5ndGggPT09IDEpCi0gICAgICAgICAgICAgICAgZm9y bWF0dGVkUmVzdWx0LmFwcGVuZENoaWxkKFdlYkluc3BlY3Rvci5jb25zb2xlLl9mb3JtYXQocGFy YW1ldGVyc1swXSkpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGZvcm1hdHRl ZFJlc3VsdC5hcHBlbmRDaGlsZChmb3JtYXRGb3JDb25zb2xlKHBhcmFtZXRlcnNbaV0pKTsKKwog ICAgICAgICAgICAgaWYgKGkgPCBwYXJhbWV0ZXJzLmxlbmd0aCAtIDEpCiAgICAgICAgICAgICAg ICAgZm9ybWF0dGVkUmVzdWx0LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIg IikpOwogICAgICAgICB9CkBAIC04MjEsMTQgKzc5MywyMCBAQCBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLk9iamVjdDoKICAgICAgICAgICAgICAgICBsZXZlbFN0 cmluZyA9ICJPYmplY3QiOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2Fz ZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkdyb3VwVGl0bGU6Ci0g ICAgICAgICAgICAgICAgbGV2ZWxTdHJpbmcgPSAiR3JvdXBUaXRsZSI7CisgICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuVHJhY2U6CisgICAg ICAgICAgICAgICAgbGV2ZWxTdHJpbmcgPSAiVHJhY2UiOworICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxl dmVsLlN0YXJ0R3JvdXA6CisgICAgICAgICAgICAgICAgbGV2ZWxTdHJpbmcgPSAiU3RhcnQgR3Jv dXAiOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0 b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkVuZEdyb3VwOgorICAgICAgICAgICAgICAg IGxldmVsU3RyaW5nID0gIkVuZCBHcm91cCI7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KIAogICAgICAgICByZXR1cm4gc291cmNlU3RyaW5nICsgIiAiICsgbGV2ZWxTdHJpbmcg KyAiOiAiICsgdGhpcy5mb3JtYXR0ZWRNZXNzYWdlLnRleHRDb250ZW50ICsgIlxuIiArIHRoaXMu dXJsICsgIiBsaW5lICIgKyB0aGlzLmxpbmU7CiAgICAgfSwKLSAgICAKKwogICAgIGlzRXF1YWw6 IGZ1bmN0aW9uKG1zZywgZGlzcmVndWFyZEdyb3VwKQogICAgIHsKICAgICAgICAgaWYgKCFtc2cp CkBAIC04NjAsMTAgKzgzOCw5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl TGV2ZWwgPSB7CiAgICAgV2FybmluZzogMiwKICAgICBFcnJvcjogMywKICAgICBPYmplY3Q6IDQs Ci0gICAgTm9kZTogNSwKLSAgICBUcmFjZTogNiwKLSAgICBTdGFydEdyb3VwOiA3LAotICAgIEVu ZEdyb3VwOiA4CisgICAgVHJhY2U6IDUsCisgICAgU3RhcnRHcm91cDogNiwKKyAgICBFbmRHcm91 cDogNwogfQogCiBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmQgPSBmdW5jdGlvbihjb21tYW5k KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3Mg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwppbmRleCBjZTJmZmI0 Li5mYzFmZjg1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmNzcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwpA QCAtNDE1LDYgKzQxNSw3IEBAIGJvZHkuZGV0YWNoZWQgI2RvY2stc3RhdHVzLWJhci1pdGVtLnRv Z2dsZWQtb246YWN0aXZlIHsKICNjb25zb2xlIHsKICAgICBkaXNwbGF5OiBub25lOwogICAgIHBv c2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB6LWluZGV4OiAxOwogICAgIGJvdHRvbTogMDsKICAgICBs ZWZ0OiAwOwogICAgIHJpZ2h0OiAwOwpAQCAtNjEyLDYgKzYxMywyMSBAQCBib2R5LmNvbnNvbGUt dmlzaWJsZSAjY29uc29sZSB7CiAKIC5jb25zb2xlLWdyb3VwLW1lc3NhZ2VzIC5zZWN0aW9uIC5o ZWFkZXIgLnRpdGxlIHsKICAgICBjb2xvcjogYmxhY2s7CisgICAgZm9udC13ZWlnaHQ6IG5vcm1h bDsKK30KKworLmNvbnNvbGUtZ3JvdXAtbWVzc2FnZXMgLnNlY3Rpb24gLnByb3BlcnRpZXMgbGkg LmluZm8geworICAgIHBhZGRpbmctdG9wOiAwOworICAgIHBhZGRpbmctYm90dG9tOiAwOworICAg IGNvbG9yOiByZ2IoNjAlLCA2MCUsIDYwJSk7Cit9CisKKy5jb25zb2xlLWdyb3VwLW1lc3NhZ2Vz IC5vdXRsaW5lLWRpc2Nsb3N1cmUgeworICAgIHBhZGRpbmctbGVmdDogMDsKK30KKworLmNvbnNv bGUtZ3JvdXAtbWVzc2FnZXMgLm91dGxpbmUtZGlzY2xvc3VyZSA+IG9sIHsKKyAgICBwYWRkaW5n OiAwIDAgMCAxMnB4ICFpbXBvcnRhbnQ7CiB9CiAKIC5jb25zb2xlLWdyb3VwLW1lc3NhZ2VzIC5v dXRsaW5lLWRpc2Nsb3N1cmUsIC5jb25zb2xlLWdyb3VwLW1lc3NhZ2VzIC5vdXRsaW5lLWRpc2Ns b3N1cmUgb2wgewpAQCAtNjE5LDE5ICs2MzUsMTkgQEAgYm9keS5jb25zb2xlLXZpc2libGUgI2Nv bnNvbGUgewogICAgIGxpbmUtaGVpZ2h0OiAxZW07CiB9CiAKLS5jb25zb2xlLWdyb3VwLW1lc3Nh Z2VzIC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGkgewotICAgIHBhZGRpbmctdG9wOiAycHg7Ci0gICAg cGFkZGluZy1ib3R0b206IDJweDsKKy5jb25zb2xlLWdyb3VwLW1lc3NhZ2VzIC5vdXRsaW5lLWRp c2Nsb3N1cmUuc2luZ2xlLW5vZGUgbGkgeworICAgIHBhZGRpbmctbGVmdDogMnB4OwogfQogCiAu Y29uc29sZS1ncm91cC1tZXNzYWdlcyAub3V0bGluZS1kaXNjbG9zdXJlIGxpIC5zZWxlY3Rpb24g ewotICAgIHotaW5kZXg6IDA7Ci0gICAgbWFyZ2luLXRvcDogLTFweDsKKyAgICBtYXJnaW4tbGVm dDogLTZweDsKKyAgICBtYXJnaW4tcmlnaHQ6IC02cHg7CiB9CiAKIC5jb25zb2xlLWZvcm1hdHRl ZC1vYmplY3QsIC5jb25zb2xlLWZvcm1hdHRlZC1ub2RlIHsKICAgICBwb3NpdGlvbjogcmVsYXRp dmU7Ci0gICAgZGlzcGxheTogYmxvY2s7CisgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworICAg IHZlcnRpY2FsLWFsaWduOiB0b3A7CiB9CiAKIC5jb25zb2xlLWZvcm1hdHRlZC1vYmplY3QgLnNl Y3Rpb24sIC5jb25zb2xlLWZvcm1hdHRlZC1ub2RlIC5zZWN0aW9uIHsKQEAgLTY1MiwxNyArNjY4 LDYgQEAgYm9keS5jb25zb2xlLXZpc2libGUgI2NvbnNvbGUgewogICAgIC13ZWJraXQtdXNlci1t b2RpZnk6IHJlYWQtb25seTsKIH0KIAotLmluc3BlY3RhYmxlLW5vZGUgewotICAgIGNvbG9yOiBi bGFjayAhaW1wb3J0YW50OwotfQotCi0uaW5zcGVjdGFibGUtbm9kZTpob3ZlciB7Ci0gICAgYmFj a2dyb3VuZC1jb2xvcjogcmdiYSg1NiwgMTIxLCAyMTcsIDAuMSk7Ci0gICAgLXdlYmtpdC1ib3Jk ZXItcmFkaXVzOiA1cHg7Ci0gICAgcGFkZGluZzogMCA1cHggMXB4OwotICAgIG1hcmdpbjogMCAt NXB4IC0xcHg7Ci19Ci0KIC5wYW5lbCB7CiAgICAgZGlzcGxheTogbm9uZTsKICAgICBvdmVyZmxv dzogaGlkZGVuOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxp dGllcy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKaW5kZXgg NGZhY2NiNC4uN2IwYTIwYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L3V0aWxpdGllcy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVz LmpzCkBAIC0zNyw2ICszNyw4IEBAIE9iamVjdC50eXBlID0gZnVuY3Rpb24ob2JqLCB3aW4pCiAK ICAgICB3aW4gPSB3aW4gfHwgd2luZG93OwogCisgICAgaWYgKG9iaiBpbnN0YW5jZW9mIHdpbi5O b2RlKQorICAgICAgICByZXR1cm4gIm5vZGUiOwogICAgIGlmIChvYmogaW5zdGFuY2VvZiB3aW4u U3RyaW5nKQogICAgICAgICByZXR1cm4gInN0cmluZyI7CiAgICAgaWYgKG9iaiBpbnN0YW5jZW9m IHdpbi5BcnJheSkKQEAgLTcwLDYgKzcyLDcgQEAgT2JqZWN0LmRlc2NyaWJlID0gZnVuY3Rpb24o b2JqLCBhYmJyZXZpYXRlZCkKIAogICAgIHN3aXRjaCAodHlwZTEpIHsKICAgICBjYXNlICJvYmpl Y3QiOgorICAgIGNhc2UgIm5vZGUiOgogICAgICAgICByZXR1cm4gdHlwZTI7CiAgICAgY2FzZSAi YXJyYXkiOgogICAgICAgICByZXR1cm4gIlsiICsgb2JqLnRvU3RyaW5nKCkgKyAiXSI7CmRpZmYg LS1naXQgYS9XZWJDb3JlL21hbnVhbC10ZXN0cy9pbnNwZWN0b3IvY29uc29sZS1kaXIuaHRtbCBi L1dlYkNvcmUvbWFudWFsLXRlc3RzL2luc3BlY3Rvci9jb25zb2xlLWRpci5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjkwZjM4OWQKLS0tIC9kZXYvbnVsbAorKysgYi9X ZWJDb3JlL21hbnVhbC10ZXN0cy9pbnNwZWN0b3IvY29uc29sZS1kaXIuaHRtbApAQCAtMCwwICsx LDMxIEBACis8Ym9keT4KKzxwPlRlc3QgZm9yIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNDMyOSI+QnVnIDI0MzI5OiBSRUdSRVNTSU9OOiBjb25zb2xl LmRpcnhtbCgpIENvbnNvbGUgQVBJIGJyb2tlbjwvYT4uPC9wPgorPHA+VG8gdGVzdCwgb3BlbiB0 aGUgSW5zcGVjdG9yJ3MgQ29uc29sZSBhbmQgdmVyaWZ5IHRoYXQgYWxsIGNvbnNvbGUgbWVzc2Fn ZXMgaGF2ZSB0aGUgY29ycmVjdCBvdXRwdXQuPC9wPgorPC9ib2R5PgorPHNjcmlwdD4KKyAgICBj b25zb2xlLmxvZygiVGVzdGluZyBjb25zb2xlLmRpcjoiKTsKKyAgICBjb25zb2xlLmRpcih1bmRl ZmluZWQpOworICAgIGNvbnNvbGUuZGlyKDEyMyk7CisgICAgY29uc29sZS5kaXIobnVsbCk7Cisg ICAgY29uc29sZS5kaXIoe30pOworICAgIGNvbnNvbGUuZGlyKHt0ZXN0OiAxLCB0ZXN0MTp7YXBw bGU6ICJvcmFuZ2UifX0pOworICAgIGNvbnNvbGUuZGlyKCJUZXN0Iik7CisgICAgY29uc29sZS5k aXIoZG9jdW1lbnQpOworICAgIGNvbnNvbGUuZGlyKGRvY3VtZW50LmJvZHkpOworCisgICAgY29u c29sZS5sb2coIlxuVGVzdGluZyBjb25zb2xlLmRpcnhtbDoiKTsKKyAgICBjb25zb2xlLmRpcnht bCh1bmRlZmluZWQpOworICAgIGNvbnNvbGUuZGlyeG1sKDEyMyk7CisgICAgY29uc29sZS5kaXJ4 bWwobnVsbCk7CisgICAgY29uc29sZS5kaXJ4bWwoe30pOworICAgIGNvbnNvbGUuZGlyeG1sKHt0 ZXN0OiAxLCB0ZXN0MTp7YXBwbGU6ICJvcmFuZ2UifX0pOworICAgIGNvbnNvbGUuZGlyeG1sKCJU ZXN0Iik7CisgICAgY29uc29sZS5kaXJ4bWwoZG9jdW1lbnQpOworICAgIGNvbnNvbGUuZGlyeG1s KGRvY3VtZW50LmJvZHkpOworCisgICAgY29uc29sZS5sb2coIlxuVGVzdGluZyBjb25zb2xlLmxv ZydzICVvIGFuZCAlTyBmb3JtYXR0ZXJzOiIpOworICAgIGNvbnNvbGUubG9nKCIlbyAlTyIsIGRv Y3VtZW50LmJvZHksIGRvY3VtZW50LmJvZHkpOworICAgIGNvbnNvbGUubG9nKCIlbyAlTyIsIHVu ZGVmaW5lZCwgdW5kZWZpbmVkKTsKKyAgICBjb25zb2xlLmxvZygiJW8gJU8iLCAxMjMsIDEyMyk7 CisgICAgY29uc29sZS5sb2coIiVvICVPIiwgbnVsbCwgbnVsbCk7Cis8L3NjcmlwdD4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNwcCBiL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNw cAppbmRleCA4NzU1ZjBlLi42OTdiYWFjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvQ29uc29s ZS5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCkBAIC0xMDksMTIgKzEwOSwxMyBA QCBzdGF0aWMgdm9pZCBwcmludE1lc3NhZ2VTb3VyY2VBbmRMZXZlbFByZWZpeChNZXNzYWdlU291 cmNlIHNvdXJjZSwgTWVzc2FnZUxldmVsCiAKICAgICBjb25zdCBjaGFyKiBsZXZlbFN0cmluZzsK ICAgICBzd2l0Y2ggKGxldmVsKSB7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgIGxldmVsU3RyaW5nID0gIlVOS05PV04iOwor ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgVGlwTWVzc2FnZUxldmVsOgogICAgICAg ICAgICAgbGV2ZWxTdHJpbmcgPSAiVElQIjsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBk ZWZhdWx0OgotICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICAv LyBGYWxsIHRocnUuCiAgICAgICAgIGNhc2UgTG9nTWVzc2FnZUxldmVsOgogICAgICAgICAgICAg bGV2ZWxTdHJpbmcgPSAiTE9HIjsKICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTI0LDYgKzEyNSwx OCBAQCBzdGF0aWMgdm9pZCBwcmludE1lc3NhZ2VTb3VyY2VBbmRMZXZlbFByZWZpeChNZXNzYWdl U291cmNlIHNvdXJjZSwgTWVzc2FnZUxldmVsCiAgICAgICAgIGNhc2UgRXJyb3JNZXNzYWdlTGV2 ZWw6CiAgICAgICAgICAgICBsZXZlbFN0cmluZyA9ICJFUlJPUiI7CiAgICAgICAgICAgICBicmVh azsKKyAgICAgICAgY2FzZSBPYmplY3RNZXNzYWdlTGV2ZWw6CisgICAgICAgICAgICBsZXZlbFN0 cmluZyA9ICJPQkpFQ1QiOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgVHJhY2VN ZXNzYWdlTGV2ZWw6CisgICAgICAgICAgICBsZXZlbFN0cmluZyA9ICJUUkFDRSI7CisgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgY2FzZSBTdGFydEdyb3VwTWVzc2FnZUxldmVsOgorICAgICAg ICAgICAgbGV2ZWxTdHJpbmcgPSAiU1RBUlQgR1JPVVAiOworICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgIGNhc2UgRW5kR3JvdXBNZXNzYWdlTGV2ZWw6CisgICAgICAgICAgICBsZXZlbFN0cmlu ZyA9ICJFTkQgR1JPVVAiOworICAgICAgICAgICAgYnJlYWs7CiAgICAgfQogCiAgICAgcHJpbnRm KCIlcyAlczoiLCBzb3VyY2VTdHJpbmcsIGxldmVsU3RyaW5nKTsKQEAgLTIwNyw3ICsyMjAsOCBA QCB2b2lkIENvbnNvbGU6OmRpcihTY3JpcHRDYWxsU3RhY2sqIGNhbGxTdGFjaykKIAogdm9pZCBD b25zb2xlOjpkaXJ4bWwoU2NyaXB0Q2FsbFN0YWNrKiBjYWxsU3RhY2spCiB7Ci0gICAgYWRkTWVz c2FnZShOb2RlTWVzc2FnZUxldmVsLCBjYWxsU3RhY2spOworICAgIC8vIFRoZSBzdGFuZGFyZCBi ZWhhdmlvciBvZiBvdXIgY29uc29sZS5sb2cgd2lsbCBwcmludCB0aGUgRE9NIHRyZWUgZm9yIG5v ZGVzLgorICAgIGxvZyhjYWxsU3RhY2spOwogfQogCiB2b2lkIENvbnNvbGU6OnRyYWNlKFNjcmlw dENhbGxTdGFjayogY2FsbFN0YWNrKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0NvbnNvbGUu aCBiL1dlYkNvcmUvcGFnZS9Db25zb2xlLmgKaW5kZXggNzMwMWZjOS4uMmEyNGEyYSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wYWdlL0NvbnNvbGUuaAorKysgYi9XZWJDb3JlL3BhZ2UvQ29uc29sZS5o CkBAIC02NCw4ICs2NCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgTG9nTWVzc2Fn ZUxldmVsLAogICAgICAgICBXYXJuaW5nTWVzc2FnZUxldmVsLAogICAgICAgICBFcnJvck1lc3Nh Z2VMZXZlbCwKKyAgICAgICAgLy8gRklYTUU6IHRoZSByZW1haW5pbmcgbGV2ZWxzIHNob3VsZCBi ZWNvbWUgYSBuZXcgTWVzc2FnZVR5cGUgZW51bS4KICAgICAgICAgT2JqZWN0TWVzc2FnZUxldmVs LAotICAgICAgICBOb2RlTWVzc2FnZUxldmVsLAogICAgICAgICBUcmFjZU1lc3NhZ2VMZXZlbCwK ICAgICAgICAgU3RhcnRHcm91cE1lc3NhZ2VMZXZlbCwKICAgICAgICAgRW5kR3JvdXBNZXNzYWdl TGV2ZWwKLS0gCjEuNi4xLjIKCg==