59717 2011-04-28 11:28:07 -0700 Web Inspector: include script end line:column in scriptParsed parameters. 2011-04-29 06:10:11 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 394586 0 podivilov 2011-04-28 11:28:07 -0700 Web Inspector: include script end location in scriptParsed parameters. This is needed to detect script boundaries when editing scripts inlined in html. 394590 1 91525 podivilov 2011-04-28 11:32:09 -0700 Created attachment 91525 Patch 395215 2 91525 yurys 2011-04-29 05:01:45 -0700 Comment on attachment 91525 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91525&action=review > Source/WebCore/bindings/v8/DebuggerScript.js:96 > + endColumn = script.source.length - (script.line_ends[lineCount - 2] + 1); Do we really need this +1? > Source/WebCore/inspector/InspectorDebuggerAgent.h:123 > + virtual void didParseSource(const String& sourceID, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript); Remove extra space before int startLine. 395219 3 podivilov 2011-04-29 05:15:35 -0700 (In reply to comment #2) > (From update of attachment 91525 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=91525&action=review > > > Source/WebCore/bindings/v8/DebuggerScript.js:96 > > + endColumn = script.source.length - (script.line_ends[lineCount - 2] + 1); > > Do we really need this +1? <script> var x </script> Here length = 7, line_ends = [0, 6], endLine = 1, endColumn = 6. Without this +1, endColumn would be 7, which is incorrect. 395235 4 podivilov 2011-04-29 06:10:11 -0700 Committed r85320: <http://trac.webkit.org/changeset/85320> 91525 2011-04-28 11:32:09 -0700 2011-04-29 05:01:45 -0700 Patch bug-59717-20110428223207.patch text/plain 18978 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogODUyMTMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwOTMzOGZjZWNjODQxMzIxNGM0OTkx NDcwN2E2MmUzZjU2OTNiOWQyLi44ZTIyYjQyZDY3OWI5NjlkMjA1ZjE3YTNmNThkODIxZDdiM2Jl MDA4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMjggIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogaW5jbHVkZSBzY3JpcHQgZW5kIGxpbmU6 Y29sdW1uIGluIHNjcmlwdFBhcnNlZCBwYXJhbWV0ZXJzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk3MTcKKworICAgICAgICAqIGluc3BlY3Rvci9k ZWJ1Z2dlci9kZWJ1Z2dlci1zY3JpcHRzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvZGVidWdnZXIvZGVidWdnZXItc2NyaXB0cy5odG1sOgorCiAyMDExLTA0LTI4ICBNYXR0aGV3 IERlbGFuZXkgIDxtZGVsYW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQnJp YW4gV2VpbnN0ZWluLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy L2RlYnVnZ2VyLXNjcmlwdHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL2RlYnVnZ2VyLXNjcmlwdHMtZXhwZWN0ZWQudHh0CmluZGV4IDg4YWJiMjU3ODg1NjFm YjY4NjY4Y2U2OWI3YTJlMWE2NTI3MTBkNDQuLjliYzg2MDZhYmY0MjNhYmM1MDNjMjM4ODczMzJk ZTdiNjQ1YTNhNzQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9k ZWJ1Z2dlci1zY3JpcHRzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZGVidWdnZXIvZGVidWdnZXItc2NyaXB0cy1leHBlY3RlZC50eHQKQEAgLTIsMTAgKzIsMTkgQEAg VGVzdHMgdGhhdCB2YWxpZCBwYXJzZWQgc2NyaXB0IG5vdGlmaWNhdGlvbnMgYXJlIHJlY2VpdmVk IGJ5IGZyb250LWVuZC4gQnVnIDUyNzIKIAogRGVidWdnZXIgd2FzIGVuYWJsZWQuCiBzY3JpcHQg MToKLSAgICBvZmZzZXQ6IDU6OAotICAgIGxlbmd0aDogMTA0MQorICAgIHN0YXJ0OiA1OjgKKyAg ICBlbmQ6IDM3OjIKIHNjcmlwdCAyOgotICAgIG9mZnNldDogMzg6MjEKLSAgICBsZW5ndGg6IDUw CisgICAgc3RhcnQ6IDM4OjIxCisgICAgZW5kOiA0MzoyNAorc2NyaXB0IDM6CisgICAgc3RhcnQ6 IDQ1OjExCisgICAgZW5kOiA0NTozMgorc2NyaXB0IDQ6CisgICAgc3RhcnQ6IDQ2OjExCisgICAg ZW5kOiA0NjoyOAorc2NyaXB0IDU6CisgICAgc3RhcnQ6IDQ4OjExCisgICAgZW5kOiA0OToyMAog RGVidWdnZXIgd2FzIGRpc2FibGVkLgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXIvZGVidWdnZXItc2NyaXB0cy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL2RlYnVnZ2VyLXNjcmlwdHMuaHRtbAppbmRleCAyMzIxOTM3N2VmYmE0ZTZjMTkx ZmVhNTRjMzhhYWJlZWMwNzk1M2JkLi4xZDc1NDJlOGFkYTM5YzNmNzkyYzljYTM3YmYyYjJmM2Vh NDNiNWI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdn ZXItc2NyaXB0cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1 Z2dlci1zY3JpcHRzLmh0bWwKQEAgLTIxLDcgKzIxLDcgQEAgdmFyIHRlc3QgPSBmdW5jdGlvbigp CiAgICAgICAgIGlmIChzY3JpcHQuc291cmNlVVJMICE9PSBXZWJJbnNwZWN0b3IubWFpblJlc291 cmNlLnVybCkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgc2NyaXB0cy5wdXNoKHNjcmlw dCk7Ci0gICAgICAgIGlmIChzY3JpcHRzLmxlbmd0aCA9PT0gMikKKyAgICAgICAgaWYgKHNjcmlw dHMubGVuZ3RoID09PSA1KQogICAgICAgICAgICAgc3RlcDMoKTsKICAgICB9CiAKQEAgLTMwLDE4 ICszMCwyNCBAQCB2YXIgdGVzdCA9IGZ1bmN0aW9uKCkKICAgICAgICAgc2NyaXB0cy5zb3J0KGZ1 bmN0aW9uKHgsIHkpIHsgcmV0dXJuIHgubGluZU9mZnNldCAtIHkubGluZU9mZnNldCB9KTsKICAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzY3JpcHRzLmxlbmd0aDsgKytpKSB7CiAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgic2NyaXB0ICIgKyAoaSArIDEpICsgIjoiKTsK LSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCIgICAgb2Zmc2V0OiAiICsgc2Ny aXB0c1tpXS5saW5lT2Zmc2V0ICsgIjoiICsgc2NyaXB0c1tpXS5jb2x1bW5PZmZzZXQpOwotICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIiAgICBsZW5ndGg6ICIgKyBzY3JpcHRz W2ldLmxlbmd0aCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiICAgIHN0 YXJ0OiAiICsgc2NyaXB0c1tpXS5saW5lT2Zmc2V0ICsgIjoiICsgc2NyaXB0c1tpXS5jb2x1bW5P ZmZzZXQpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIiAgICBlbmQ6ICIg KyBzY3JpcHRzW2ldLmVuZExpbmUgKyAiOiIgKyBzY3JpcHRzW2ldLmVuZENvbHVtbik7CiAgICAg ICAgIH0KICAgICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZURlYnVnZ2VyVGVzdCgpOwogICAg IH0KIH0KIDwvc2NyaXB0PiAgICA8c2NyaXB0PgotZnVuY3Rpb24gZG9TdHVmZigpCitmdW5jdGlv biBmMSgpCiB7CiB9CiAKLXdpbmRvdy5vbmxvYWQgPSBydW5UZXN0Oword2luZG93Lm9ubG9hZCA9 IHJ1blRlc3Q7PC9zY3JpcHQ+CisKKyAgIDxzY3JpcHQ+IGZ1bmN0aW9uIGYyKCkge30gICAgPC9z Y3JpcHQ+CisgICA8c2NyaXB0PmZ1bmN0aW9uIGYzKCkge30KKzwvc2NyaXB0PgorICAgPHNjcmlw dD4KKyAgIGZ1bmN0aW9uIGY0KCkge30KIDwvc2NyaXB0PgogCiA8L2hlYWQ+CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggMzVkM2Q0MGYwNDYyNGFiODNiNjYwNGI4M2E1MjlkZTNlNDMzY2ZjOC4uY2E1ZWQ0MjdhNjRl YzM1OWRlNmJhMGNhZmQ2Y2IwZmZkNzNiMzcxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBA CisyMDExLTA0LTI4ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGluY2x1ZGUgc2NyaXB0IGVuZCBsaW5lOmNvbHVtbiBpbiBzY3JpcHRQYXJzZWQgcGFy YW1ldGVycy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU5NzE3CisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNvdXJj ZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvRGVidWdnZXJTY3JpcHQuanM6CisgICAgICAgICgp OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZFBhcnNlU291cmNlKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVi dWdnZXJBZ2VudDo6cmVzb2x2ZUJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JEZWJ1Z2dlckFnZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1 Z2dlckFnZW50OjpTY3JpcHQ6OlNjcmlwdCk6CisgICAgICAgICogaW5zcGVjdG9yL1NjcmlwdERl YnVnTGlzdGVuZXIuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9k ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUuX3Bh cnNlZFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5w cm90b3R5cGUuX2ZhaWxlZFRvUGFyc2VTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyRGlzcGF0Y2hlci5wcm90b3R5cGUuc2NyaXB0UGFyc2VkKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T Y3JpcHQpOgorCiAyMDExLTA0LTI4ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAK ICAgICAgICAgQnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2Ny aXB0RGVidWdTZXJ2ZXIuY3BwCmluZGV4IDM3ZWRjNmRlMDQ5MDc4ZGRlYTA1ODA0OTNjOTc4Nzk2 MzBlMzJkMTguLmRhMDgxMDdkNWFmYTBiN2E4YzEyZTIxN2VmZmRlZTMwZDJkZTBhYmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKQEAg LTIyNSwxMCArMjI1LDI2IEBAIHZvaWQgU2NyaXB0RGVidWdTZXJ2ZXI6OmRpc3BhdGNoRGlkUGFy c2VTb3VyY2UoY29uc3QgTGlzdGVuZXJTZXQmIGxpc3RlbmVycywgU291CiAgICAgaW50IGxpbmVP ZmZzZXQgPSBzb3VyY2VQcm92aWRlci0+c3RhcnRQb3NpdGlvbigpLm1fbGluZS5jb252ZXJ0QXNa ZXJvQmFzZWRJbnQoKTsKICAgICBpbnQgY29sdW1uT2Zmc2V0ID0gc291cmNlUHJvdmlkZXItPnN0 YXJ0UG9zaXRpb24oKS5tX2NvbHVtbi5jb252ZXJ0QXNaZXJvQmFzZWRJbnQoKTsKIAorICAgIGlu dCBsaW5lQ291bnQgPSAxOworICAgIGludCBsYXN0TGluZVN0YXJ0ID0gMDsKKyAgICBmb3IgKHNp emVfdCBpID0gMDsgaSA8IGRhdGEubGVuZ3RoKCkgLSAxOyArK2kpIHsKKyAgICAgICAgaWYgKGRh dGFbaV0gPT0gJ1xuJykgeworICAgICAgICAgICAgbGluZUNvdW50ICs9IDE7CisgICAgICAgICAg ICBsYXN0TGluZVN0YXJ0ID0gaSArIDE7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBpbnQgZW5k TGluZSA9IGxpbmVPZmZzZXQgKyBsaW5lQ291bnQgLSAxOworICAgIGludCBlbmRDb2x1bW47Cisg ICAgaWYgKGxpbmVDb3VudCA9PSAxKQorICAgICAgICBlbmRDb2x1bW4gPSBkYXRhLmxlbmd0aCgp ICsgY29sdW1uT2Zmc2V0OworICAgIGVsc2UKKyAgICAgICAgZW5kQ29sdW1uID0gZGF0YS5sZW5n dGgoKSAtIGxhc3RMaW5lU3RhcnQ7CisKICAgICBWZWN0b3I8U2NyaXB0RGVidWdMaXN0ZW5lcio+ IGNvcHk7CiAgICAgY29weVRvVmVjdG9yKGxpc3RlbmVycywgY29weSk7CiAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBjb3B5LnNpemUoKTsgKytpKQotICAgICAgICBjb3B5W2ldLT5kaWRQYXJz ZVNvdXJjZShzb3VyY2VJRCwgdXJsLCBkYXRhLCBsaW5lT2Zmc2V0LCBjb2x1bW5PZmZzZXQsIGlz Q29udGVudFNjcmlwdCk7CisgICAgICAgIGNvcHlbaV0tPmRpZFBhcnNlU291cmNlKHNvdXJjZUlE LCB1cmwsIGRhdGEsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgZW5kTGluZSwgZW5kQ29sdW1u LCBpc0NvbnRlbnRTY3JpcHQpOwogfQogCiB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRj aEZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgTGlzdGVuZXJTZXQmIGxpc3RlbmVycywgU291cmNl UHJvdmlkZXIqIHNvdXJjZVByb3ZpZGVyLCBpbnQgZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVy cm9yTWVzc2FnZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RlYnVn Z2VyU2NyaXB0LmpzIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRGVidWdnZXJTY3JpcHQu anMKaW5kZXggYzY1NDBkNzFiNjFjMGY0ZTQ4MzBiOWUyYzI2ZjIwNjJlZTBlZTZlZC4uMDQ2Yzkx MTUzYmQ3MmY5MWMwMTU4OGUyOTZiMTUyZWU1OGJlNGUyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvRGVidWdnZXJTY3JpcHQuanMKKysrIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvRGVidWdnZXJTY3JpcHQuanMKQEAgLTg2LDEyICs4NiwyMyBAQCBEZWJ1Z2dl clNjcmlwdC5nZXRTY3JpcHRzID0gZnVuY3Rpb24oY29udGV4dERhdGEpCiAKIERlYnVnZ2VyU2Ny aXB0Ll9mb3JtYXRTY3JpcHQgPSBmdW5jdGlvbihzY3JpcHQpCiB7CisgICAgdmFyIGxpbmVFbmRz ID0gc2NyaXB0LmxpbmVfZW5kczsKKyAgICB2YXIgbGluZUNvdW50ID0gbGluZUVuZHMubGVuZ3Ro OworICAgIHZhciBlbmRMaW5lID0gc2NyaXB0LmxpbmVfb2Zmc2V0ICsgbGluZUNvdW50IC0gMTsK KyAgICB2YXIgZW5kQ29sdW1uOworICAgIGlmIChsaW5lQ291bnQgPT09IDEpCisgICAgICAgIGVu ZENvbHVtbiA9IHNjcmlwdC5zb3VyY2UubGVuZ3RoICsgc2NyaXB0LmNvbHVtbl9vZmZzZXQ7Cisg ICAgZWxzZQorICAgICAgICBlbmRDb2x1bW4gPSBzY3JpcHQuc291cmNlLmxlbmd0aCAtIChzY3Jp cHQubGluZV9lbmRzW2xpbmVDb3VudCAtIDJdICsgMSk7CisKICAgICByZXR1cm4gewogICAgICAg ICBpZDogc2NyaXB0LmlkLAogICAgICAgICBuYW1lOiBzY3JpcHQubmFtZU9yU291cmNlVVJMKCks CiAgICAgICAgIHNvdXJjZTogc2NyaXB0LnNvdXJjZSwKLSAgICAgICAgbGluZU9mZnNldDogc2Ny aXB0LmxpbmVfb2Zmc2V0LAotICAgICAgICBjb2x1bW5PZmZzZXQ6IHNjcmlwdC5jb2x1bW5fb2Zm c2V0LAorICAgICAgICBzdGFydExpbmU6IHNjcmlwdC5saW5lX29mZnNldCwKKyAgICAgICAgc3Rh cnRDb2x1bW46IHNjcmlwdC5jb2x1bW5fb2Zmc2V0LAorICAgICAgICBlbmRMaW5lOiBlbmRMaW5l LAorICAgICAgICBlbmRDb2x1bW46IGVuZENvbHVtbiwKICAgICAgICAgaXNDb250ZW50U2NyaXB0 OiAhIXNjcmlwdC5jb250ZXh0X2RhdGEgJiYgc2NyaXB0LmNvbnRleHRfZGF0YS5pbmRleE9mKCJp bmplY3RlZCIpID09IDAKICAgICB9OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCmluZGV4IGVlNWIwNWI5YzM3N2I0MDgwM2IxNzk2ZDUz MjRlN2Y3NjE5ZDVjN2YuLjhmOWQwM2EyZjhiNGUzMGMzYjk4Y2E1MmZjMmY5NjU2MTRmZDJkNjUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5j cHAKQEAgLTM1Niw4ICszNTYsMTAgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hE aWRQYXJzZVNvdXJjZShTY3JpcHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5lciwgdjgKICAgICAgICAg dG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNrKG9iamVjdC0+R2V0KHY4OjpT dHJpbmc6Ok5ldygiaWQiKSkpLAogICAgICAgICB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9yVW5k ZWZpbmVkQ2hlY2sob2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJuYW1lIikpKSwKICAgICAg ICAgdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNrKG9iamVjdC0+R2V0KHY4 OjpTdHJpbmc6Ok5ldygic291cmNlIikpKSwKLSAgICAgICAgb2JqZWN0LT5HZXQodjg6OlN0cmlu Zzo6TmV3KCJsaW5lT2Zmc2V0IikpLT5Ub0ludGVnZXIoKS0+VmFsdWUoKSwKLSAgICAgICAgb2Jq ZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJjb2x1bW5PZmZzZXQiKSktPlRvSW50ZWdlcigpLT5W YWx1ZSgpLAorICAgICAgICBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInN0YXJ0TGluZSIp KS0+VG9JbnRlZ2VyKCktPlZhbHVlKCksCisgICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6 Ok5ldygic3RhcnRDb2x1bW4iKSktPlRvSW50ZWdlcigpLT5WYWx1ZSgpLAorICAgICAgICBvYmpl Y3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImVuZExpbmUiKSktPlRvSW50ZWdlcigpLT5WYWx1ZSgp LAorICAgICAgICBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImVuZENvbHVtbiIpKS0+VG9J bnRlZ2VyKCktPlZhbHVlKCksCiAgICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygi aXNDb250ZW50U2NyaXB0IikpLT5Ub0Jvb2xlYW4oKS0+VmFsdWUoKSk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCBjNjBiMmE2MWY2NDdiY2RhNjEzYjg3 ZDQ0ZDFmMTc1MmQyMjZiZWY1Li4xMGJmNzkyYmIwYTE5Y2Y2ODY4OTBlYjAxZTEwZTg1OWFkNjNj Y2E1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xNDY4LDkg KzE0NjgsMTAgQEAKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VJRCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlw dGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBzY3JpcHQgcGFyc2VkLiIgfSwKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24i OiAiVVJMIG9mIHRoZSBzY3JpcHQgcGFyc2VkIChpZiBhbnkpLiIgfSwKLSAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJsaW5lT2Zmc2V0IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlw dGlvbiI6ICJMaW5lIG9mZnNldCBvZiB0aGUgc2NyaXB0IHdpdGhpbiB0aGUgcmVzb3VyY2Ugd2l0 aCBnaXZlbiBVUkwgKGZvciBzY3JpcHQgdGFncykuIiB9LAotICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImNvbHVtbk9mZnNldCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24i OiAiQ29sdW1uIG9mZnNldCBvZiB0aGUgc2NyaXB0IHdpdGhpbiB0aGUgcmVzb3VyY2Ugd2l0aCBn aXZlbiBVUkwuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxlbmd0aCIsICJ0 eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTGVuZ3RoIG9mIHRoZSBzY3JpcHQiIH0s CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RhcnRMaW5lIiwgInR5cGUiOiAiaW50 ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJMaW5lIG9mZnNldCBvZiB0aGUgc2NyaXB0IHdpdGhpbiB0 aGUgcmVzb3VyY2Ugd2l0aCBnaXZlbiBVUkwgKGZvciBzY3JpcHQgdGFncykuIiB9LAorICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogInN0YXJ0Q29sdW1uIiwgInR5cGUiOiAiaW50ZWdlciIs ICJkZXNjcmlwdGlvbiI6ICJDb2x1bW4gb2Zmc2V0IG9mIHRoZSBzY3JpcHQgd2l0aGluIHRoZSBy ZXNvdXJjZSB3aXRoIGdpdmVuIFVSTC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAiZW5kTGluZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTGFzdCBsaW5l IG9mIHRoZSBzY3JpcHQuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImVuZENv bHVtbiIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTGVuZ3RoIG9mIHRoZSBs YXN0IGxpbmUgb2YgdGhlIHNjcmlwdC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAiaXNDb250ZW50U2NyaXB0IiwgInR5cGUiOiAiYm9vbGVhbiIsICJvcHRpb25hbCI6IHRydWUs ICJkZXNjcmlwdGlvbiI6ICJEZXRlcm1pbmVzIHdoZXRoZXIgdGhpcyBzY3JpcHQgaXMgYSB1c2Vy IGV4dGVuc2lvbiBzY3JpcHQuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAg ICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiB2aXJ0dWFsIG1hY2hpbmUgcGFyc2VzIHNjcmlw dC4gVGhpcyBldmVuIGlzIGFsc28gZmlyZWQgZm9yIGFsbCBrbm93biBzY3JpcHRzIHVwb24gZW5h YmxpbmcgZGVidWdnZXIuIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRlYnVnZ2VyQWdlbnQuY3BwCmluZGV4IGE4YzJhZTYyMjVlYmVlY2ZmNmY0Mjk4N2Y1ZWI3 NDdkYTIzNDliODAuLjE4OWEwYjgyMTlhMDcyNDk1MzY4YWU0N2VkYmQ3MzU1YTdiOWMxOTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dC5jcHAKQEAgLTI0OCwxNiArMjQ4LDcgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IElu c3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnJlc29sdmVCcmVha3BvaW50KGNvbnN0IFN0cmkKICAgICBp ZiAoc2NyaXB0SXRlcmF0b3IgPT0gbV9zY3JpcHRzLmVuZCgpKQogICAgICAgICByZXR1cm4gMDsK ICAgICBTY3JpcHQmIHNjcmlwdCA9IHNjcmlwdEl0ZXJhdG9yLT5zZWNvbmQ7Ci0gICAgaWYgKGJy ZWFrcG9pbnQubGluZU51bWJlciA8IHNjcmlwdC5saW5lT2Zmc2V0KQotICAgICAgICByZXR1cm4g MDsKLSAgICBpZiAoIXNjcmlwdC5saW5lc0NvdW50KSB7Ci0gICAgICAgIHNjcmlwdC5saW5lc0Nv dW50ID0gMTsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzY3JpcHQuZGF0YS5sZW5n dGgoKTsgKytpKSB7Ci0gICAgICAgICAgICBpZiAoc2NyaXB0LmRhdGFbaV0gPT0gJ1xuJykKLSAg ICAgICAgICAgICAgICBzY3JpcHQubGluZXNDb3VudCArPSAxOwotICAgICAgICB9Ci0gICAgfQot ICAgIGlmIChicmVha3BvaW50LmxpbmVOdW1iZXIgPj0gc2NyaXB0LmxpbmVPZmZzZXQgKyBzY3Jp cHQubGluZXNDb3VudCkKKyAgICBpZiAoYnJlYWtwb2ludC5saW5lTnVtYmVyIDwgc2NyaXB0LnN0 YXJ0TGluZSB8fCBzY3JpcHQuZW5kTGluZSA8PSBicmVha3BvaW50LmxpbmVOdW1iZXIpCiAgICAg ICAgIHJldHVybiAwOwogCiAgICAgaW50IGFjdHVhbExpbmVOdW1iZXI7CkBAIC0zNzMsMTIgKzM2 NCwxMiBAQCBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50 OjpjdXJyZW50Q2FsbEZyYW1lcygpCiAKIC8vIEphdmFTY3JpcHREZWJ1Z0xpc3RlbmVyIGZ1bmN0 aW9ucwogCi12b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0 IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEs IGludCBsaW5lT2Zmc2V0LCBpbnQgY29sdW1uT2Zmc2V0LCBib29sIGlzQ29udGVudFNjcmlwdCkK K3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5n JiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IHN0 YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBpbnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwgYm9v bCBpc0NvbnRlbnRTY3JpcHQpCiB7CiAgICAgLy8gRG9uJ3Qgc2VuZCBzY3JpcHQgY29udGVudCB0 byB0aGUgZnJvbnQgZW5kIHVudGlsIGl0J3MgcmVhbGx5IG5lZWRlZC4KLSAgICBtX2Zyb250ZW5k LT5zY3JpcHRQYXJzZWQoc291cmNlSUQsIHVybCwgbGluZU9mZnNldCwgY29sdW1uT2Zmc2V0LCBk YXRhLmxlbmd0aCgpLCBpc0NvbnRlbnRTY3JpcHQpOworICAgIG1fZnJvbnRlbmQtPnNjcmlwdFBh cnNlZChzb3VyY2VJRCwgdXJsLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRD b2x1bW4sIGlzQ29udGVudFNjcmlwdCk7CiAKLSAgICBtX3NjcmlwdHMuc2V0KHNvdXJjZUlELCBT Y3JpcHQodXJsLCBkYXRhLCBsaW5lT2Zmc2V0LCBjb2x1bW5PZmZzZXQpKTsKKyAgICBtX3Njcmlw dHMuc2V0KHNvdXJjZUlELCBTY3JpcHQodXJsLCBkYXRhLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1u LCBlbmRMaW5lLCBlbmRDb2x1bW4pKTsKIAogICAgIGlmICh1cmwuaXNFbXB0eSgpKQogICAgICAg ICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RGVidWdnZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVn Z2VyQWdlbnQuaAppbmRleCBiMzc5ZGRhOWRjNDg1ZWNlMzBjOGJiM2JkNmY4ODgyMjY3YjA0MjQ2 Li5mNWMyZDBhNGE3NTUzMTE3ZGYyNjdlZGNlNGRhNDU0ODIzNjk4NGQ4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKQEAgLTEyMCw3 ICsxMjAsNyBAQCBwcml2YXRlOgogCiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gY3Vy cmVudENhbGxGcmFtZXMoKTsKIAotICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25z dCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRh LCBpbnQgbGluZU9mZnNldCwgaW50IGNvbHVtbk9mZnNldCwgYm9vbCBpc0NvbnRlbnRTY3JpcHQp OworICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlE LCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCAgaW50IHN0YXJ0TGluZSwg aW50IHN0YXJ0Q29sdW1uLCBpbnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBpc0NvbnRl bnRTY3JpcHQpOwogICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNlU291cmNlKGNvbnN0IFN0 cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExpbmUsIGludCBlcnJvckxp bmUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUGF1 c2UoU2NyaXB0U3RhdGUqLCBjb25zdCBTY3JpcHRWYWx1ZSYgY2FsbEZyYW1lcywgY29uc3QgU2Ny aXB0VmFsdWUmIGV4Y2VwdGlvbik7CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbnRpbnVlKCk7CkBA IC0xMzEsMjUgKzEzMSwyOSBAQCBwcml2YXRlOgogICAgIGNsYXNzIFNjcmlwdCB7CiAgICAgcHVi bGljOgogICAgICAgICBTY3JpcHQoKQotICAgICAgICAgICAgOiBsaW5lT2Zmc2V0KDApCi0gICAg ICAgICAgICAsIGNvbHVtbk9mZnNldCgwKQotICAgICAgICAgICAgLCBsaW5lc0NvdW50KDApCisg ICAgICAgICAgICA6IHN0YXJ0TGluZSgwKQorICAgICAgICAgICAgLCBzdGFydENvbHVtbigwKQor ICAgICAgICAgICAgLCBlbmRMaW5lKDApCisgICAgICAgICAgICAsIGVuZENvbHVtbigwKQogICAg ICAgICB7CiAgICAgICAgIH0KIAotICAgICAgICBTY3JpcHQoY29uc3QgU3RyaW5nJiB1cmwsIGNv bnN0IFN0cmluZyYgZGF0YSwgaW50IGxpbmVPZmZzZXQsIGludCBjb2x1bW5PZmZzZXQpCisgICAg ICAgIFNjcmlwdChjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCBpbnQgc3Rh cnRMaW5lLCBpbnQgc3RhcnRDb2x1bW4sIGludCBlbmRMaW5lLCBpbnQgZW5kQ29sdW1uKQogICAg ICAgICAgICAgOiB1cmwodXJsKQogICAgICAgICAgICAgLCBkYXRhKGRhdGEpCi0gICAgICAgICAg ICAsIGxpbmVPZmZzZXQobGluZU9mZnNldCkKLSAgICAgICAgICAgICwgY29sdW1uT2Zmc2V0KGNv bHVtbk9mZnNldCkKLSAgICAgICAgICAgICwgbGluZXNDb3VudCgwKQorICAgICAgICAgICAgLCBz dGFydExpbmUoc3RhcnRMaW5lKQorICAgICAgICAgICAgLCBzdGFydENvbHVtbihzdGFydENvbHVt bikKKyAgICAgICAgICAgICwgZW5kTGluZShlbmRMaW5lKQorICAgICAgICAgICAgLCBlbmRDb2x1 bW4oZW5kQ29sdW1uKQogICAgICAgICB7CiAgICAgICAgIH0KIAogICAgICAgICBTdHJpbmcgdXJs OwogICAgICAgICBTdHJpbmcgZGF0YTsKLSAgICAgICAgaW50IGxpbmVPZmZzZXQ7Ci0gICAgICAg IGludCBjb2x1bW5PZmZzZXQ7CisgICAgICAgIGludCBzdGFydExpbmU7CisgICAgICAgIGludCBz dGFydENvbHVtbjsKKyAgICAgICAgaW50IGVuZExpbmU7CisgICAgICAgIGludCBlbmRDb2x1bW47 CiAgICAgICAgIGludCBsaW5lc0NvdW50OwogICAgIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oCmluZGV4IDkzZmQwZmNlNzRhY2FkNjU2MDIw NTkwZTAwN2ZlNTcyYjNmY2RiYjIuLjgwMmY4NWE0MjUyNzM0Mjk3NGNlZTAwOTI3NDlkMmFlMjgw ZDU3MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xp c3RlbmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVu ZXIuaApAQCAtNDIsNyArNDIsNyBAQCBjbGFzcyBTY3JpcHREZWJ1Z0xpc3RlbmVyIHsKIHB1Ymxp YzoKICAgICB2aXJ0dWFsIH5TY3JpcHREZWJ1Z0xpc3RlbmVyKCkgeyB9CiAKLSAgICB2aXJ0dWFs IHZvaWQgZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiAgc291cmNlSUQsIGNvbnN0IFN0cmlu ZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBsaW5lT2Zmc2V0LCBpbnQgY29sdW1uT2Zm c2V0LCBib29sIGlzQ29udGVudFNjcmlwdCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJz ZVNvdXJjZShjb25zdCBTdHJpbmcmICBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0 IFN0cmluZyYgZGF0YSwgIGludCBzdGFydExpbmUsIGludCBzdGFydENvbHVtbiwgaW50IGVuZExp bmUsIGludCBlbmRDb2x1bW4sIGJvb2wgaXNDb250ZW50U2NyaXB0KSA9IDA7CiAgICAgdmlydHVh bCB2b2lkIGZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmlu ZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgaW50IGVycm9yTGluZSwgY29uc3QgU3RyaW5nJiBlcnJv ck1lc3NhZ2UpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUGF1c2UoU2NyaXB0U3RhdGUqLCBj b25zdCBTY3JpcHRWYWx1ZSYgY2FsbEZyYW1lcywgY29uc3QgU2NyaXB0VmFsdWUmIGV4Y2VwdGlv bikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb250aW51ZSgpID0gMDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwppbmRleCBh MzNkNjliNTBhYzAwZTY0ODE2YzQ4YTI0ZGY1NDVkMDJmMTQ4N2ZhLi4zNWNmOGE1NjA2NzEwYTc3 YzE1ZTIyYjdlNmZiYjVhMzQ1NzYwZmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCkBAIC0xNzksMTYgKzE3OSwxNiBAQCBX ZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5E ZWJ1Z2dlclJlc3VtZWQpOwogICAgIH0sCiAKLSAgICBfcGFyc2VkU2NyaXB0U291cmNlOiBmdW5j dGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBsaW5lT2Zmc2V0LCBjb2x1bW5PZmZzZXQsIGxlbmd0 aCwgaXNDb250ZW50U2NyaXB0KQorICAgIF9wYXJzZWRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNv dXJjZUlELCBzb3VyY2VVUkwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENv bHVtbiwgaXNDb250ZW50U2NyaXB0KQogICAgIHsKLSAgICAgICAgdmFyIHNjcmlwdCA9IG5ldyBX ZWJJbnNwZWN0b3IuU2NyaXB0KHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmVPZmZzZXQsIGNvbHVt bk9mZnNldCwgbGVuZ3RoLCB1bmRlZmluZWQsIHVuZGVmaW5lZCwgaXNDb250ZW50U2NyaXB0KTsK KyAgICAgICAgdmFyIHNjcmlwdCA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0KHNvdXJjZUlELCBz b3VyY2VVUkwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgdW5k ZWZpbmVkLCB1bmRlZmluZWQsIGlzQ29udGVudFNjcmlwdCk7CiAgICAgICAgIHRoaXMuX3Njcmlw dHNbc291cmNlSURdID0gc2NyaXB0OwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuUGFyc2VkU2NyaXB0U291cmNl LCBzY3JpcHQpOwogICAgIH0sCiAKICAgICBfZmFpbGVkVG9QYXJzZVNjcmlwdFNvdXJjZTogZnVu Y3Rpb24oc291cmNlVVJMLCBzb3VyY2UsIHN0YXJ0aW5nTGluZSwgZXJyb3JMaW5lLCBlcnJvck1l c3NhZ2UpCiAgICAgewotICAgICAgICB2YXIgc2NyaXB0ID0gbmV3IFdlYkluc3BlY3Rvci5TY3Jp cHQobnVsbCwgc291cmNlVVJMLCBzdGFydGluZ0xpbmUsIGVycm9yTGluZSwgZXJyb3JNZXNzYWdl LCB1bmRlZmluZWQpOworICAgICAgICB2YXIgc2NyaXB0ID0gbmV3IFdlYkluc3BlY3Rvci5TY3Jp cHQobnVsbCwgc291cmNlVVJMLCBzdGFydGluZ0xpbmUsIDAsIDAsIDAsIGVycm9yTGluZSwgZXJy b3JNZXNzYWdlLCB1bmRlZmluZWQpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuRmFpbGVkVG9QYXJzZVNjcmlw dFNvdXJjZSwgc2NyaXB0KTsKICAgICB9CiB9CkBAIC0yMjcsOSArMjI3LDkgQEAgV2ViSW5zcGVj dG9yLkRlYnVnZ2VyRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2RlYnVn Z2VyTW9kZWwuX2RlYnVnZ2VyV2FzRGlzYWJsZWQoKTsKICAgICB9LAogCi0gICAgc2NyaXB0UGFy c2VkOiBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBsaW5lT2Zmc2V0LCBjb2x1bW5PZmZz ZXQsIGxlbmd0aCwgaXNDb250ZW50U2NyaXB0KQorICAgIHNjcmlwdFBhcnNlZDogZnVuY3Rpb24o c291cmNlSUQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5k Q29sdW1uLCBpc0NvbnRlbnRTY3JpcHQpCiAgICAgewotICAgICAgICB0aGlzLl9kZWJ1Z2dlck1v ZGVsLl9wYXJzZWRTY3JpcHRTb3VyY2Uoc291cmNlSUQsIHNvdXJjZVVSTCwgbGluZU9mZnNldCwg Y29sdW1uT2Zmc2V0LCBsZW5ndGgsIGlzQ29udGVudFNjcmlwdCk7CisgICAgICAgIHRoaXMuX2Rl YnVnZ2VyTW9kZWwuX3BhcnNlZFNjcmlwdFNvdXJjZShzb3VyY2VJRCwgc291cmNlVVJMLCBzdGFy dExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCk7 CiAgICAgfSwKIAogICAgIHNjcmlwdEZhaWxlZFRvUGFyc2U6IGZ1bmN0aW9uKHNvdXJjZVVSTCwg c291cmNlLCBzdGFydGluZ0xpbmUsIGVycm9yTGluZSwgZXJyb3JNZXNzYWdlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcwppbmRleCA5ZTc1ZDgzY2Q5M2Vk ODBhY2RmNzQ3ZGEzMWMyM2JiYmE5NTk0MjNlLi4yY2ZhNDgzZmUyNmM2NjY5NTVlM2ExNjAwMzcw ZTIxMzQyMDNlMTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdC5qcwpAQCAtMjMsMTMgKzIzLDE0IEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLVdlYklu c3BlY3Rvci5TY3JpcHQgPSBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBsaW5lT2Zmc2V0 LCBjb2x1bW5PZmZzZXQsIGxlbmd0aCwgZXJyb3JMaW5lLCBlcnJvck1lc3NhZ2UsIGlzQ29udGVu dFNjcmlwdCkKK1dlYkluc3BlY3Rvci5TY3JpcHQgPSBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNl VVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGVycm9yTGlu ZSwgZXJyb3JNZXNzYWdlLCBpc0NvbnRlbnRTY3JpcHQpCiB7CiAgICAgdGhpcy5zb3VyY2VJRCA9 IHNvdXJjZUlEOwogICAgIHRoaXMuc291cmNlVVJMID0gc291cmNlVVJMOwotICAgIHRoaXMubGlu ZU9mZnNldCA9IGxpbmVPZmZzZXQ7Ci0gICAgdGhpcy5jb2x1bW5PZmZzZXQgPSBjb2x1bW5PZmZz ZXQ7Ci0gICAgdGhpcy5sZW5ndGggPSBsZW5ndGg7CisgICAgdGhpcy5saW5lT2Zmc2V0ID0gc3Rh cnRMaW5lOworICAgIHRoaXMuY29sdW1uT2Zmc2V0ID0gc3RhcnRDb2x1bW47CisgICAgdGhpcy5l bmRMaW5lID0gZW5kTGluZTsKKyAgICB0aGlzLmVuZENvbHVtbiA9IGVuZENvbHVtbjsKICAgICB0 aGlzLmVycm9yTGluZSA9IGVycm9yTGluZTsKICAgICB0aGlzLmVycm9yTWVzc2FnZSA9IGVycm9y TWVzc2FnZTsKICAgICB0aGlzLmlzQ29udGVudFNjcmlwdCA9IGlzQ29udGVudFNjcmlwdDsK