126767 2014-01-10 11:18:18 -0800 Web Inspector: Clean/fix the stdout formatting of console messages 2014-01-10 14:12:24 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 966474 0 timothy 2014-01-10 11:18:18 -0800 * Fix URLs not printing line numbers unless column number is > 0. * Clean up how console.trace outputs. * Print URL, line and column for each trace call frame. * Print (unknown) for anonymous and native code call frames. 966476 1 webkit-bug-importer 2014-01-10 11:19:06 -0800 <rdar://problem/15794034> 966480 2 220867 timothy 2014-01-10 11:23:43 -0800 Created attachment 220867 Patch 966481 3 commit-queue 2014-01-10 11:25:06 -0800 Attachment 220867 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/page/Console.cpp', u'Source/WebCore/page/PageConsole.cpp', u'Source/WebCore/page/PageConsole.h', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/ChangeLog:5: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:6: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:7: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:8: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Total errors found: 4 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 966484 4 220867 joepeck 2014-01-10 11:40:01 -0800 Comment on attachment 220867 Patch r=me! 966487 5 220868 timothy 2014-01-10 11:56:21 -0800 Created attachment 220868 Patch 966491 6 commit-queue 2014-01-10 11:58:16 -0800 Attachment 220868 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/page/Console.cpp', u'Source/WebCore/page/PageConsole.cpp', u'Source/WebCore/page/PageConsole.h', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/ChangeLog:5: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:6: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:7: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:8: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Total errors found: 4 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 966564 7 220868 commit-queue 2014-01-10 13:42:03 -0800 Comment on attachment 220868 Patch Rejecting attachment 220868 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 220868, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/6050564169269248 966571 8 220884 timothy 2014-01-10 13:54:52 -0800 Created attachment 220884 Patch for landing 966572 9 commit-queue 2014-01-10 13:55:35 -0800 Attachment 220884 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/page/Console.cpp', u'Source/WebCore/page/PageConsole.cpp', u'Source/WebCore/page/PageConsole.h', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/ChangeLog:5: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:6: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:7: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:8: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Total errors found: 4 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 966586 10 220884 commit-queue 2014-01-10 14:12:20 -0800 Comment on attachment 220884 Patch for landing Clearing flags on attachment: 220884 Committed r161678: <http://trac.webkit.org/changeset/161678> 966587 11 commit-queue 2014-01-10 14:12:24 -0800 All reviewed patches have been landed. Closing bug. 220867 2014-01-10 11:23:43 -0800 2014-01-10 11:56:18 -0800 Patch bug-126767-20140110112342.patch text/plain 5713 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk1NGZkNWRiZmE2ZDRi YTBhZjY1MDg1NTk5OWE1YzBiMTI0NmNlZS4uYzg2ZTkwZGQ2ZjU0ZjEyNTdkZmNhOWE2Zjc3NTc2 N2ExMjNiYTk5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE0LTAxLTEwICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbiB1cCBhbmQg Zml4IHNvbWUgaXNzdWVzIHdpdGggc3Rkb3V0IGZvcm1hdHRpbmcgb2YgY29uc29sZSBtZXNzYWdl cy4KKworICAgICAgICAqIEZpeCBVUkxzIG5vdCBwcmludGluZyBsaW5lIG51bWJlcnMgdW5sZXNz IGNvbHVtbiBudW1iZXIgaXMgPiAwLgorICAgICAgICAqIENoYW5nZSAiQ09OU09MRUFQSSIgdG8g IkNPTlNPTEUiIGZvciB0aGUgc291cmNlLgorICAgICAgICAqIENsZWFuIHVwIGhvdyBjb25zb2xl LnRyYWNlIG91dHB1dHMgYW5kIHByaW50IFVSTCwgbGluZSBhbmQgY29sdW1uIGZvciBlYWNoIGZy YW1lLgorICAgICAgICAqIFByaW50ICIodW5rbm93bikiIGZvciBhbm9ueW1vdXMgYW5kIG5hdGl2 ZSBjb2RlIGNhbGwgZnJhbWVzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjY3NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHBhZ2UvQ29uc29sZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbnRl cm5hbEFkZE1lc3NhZ2UpOgorICAgICAgICAqIHBhZ2UvUGFnZUNvbnNvbGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZUNvbnNvbGU6OnByaW50U291cmNlVVJMQW5kUG9zaXRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6UGFnZUNvbnNvbGU6OnByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJl Zml4KToKKyAgICAgICAgKiBwYWdlL1BhZ2VDb25zb2xlLmg6CisKKzIwMTQtMDEtMTAgIFRpbW90 aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCiAgICAgICAgIFByZXZlbnQgc29tZSBy ZXNvdXJjZXMgZnJvbSBzaG93aW5nIHVwIGluIFdlYiBJbnNwZWN0b3IgYXMgeWVhcnMgaW4gZHVy YXRpb24uCiAKICAgICAgICAgTm8gV2ViS2l0IHBvcnQgcGFzc2VkIGEgbW9ub3RvbmljIHRpbWUg dG8gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRGaW5pc2hMb2FkaW5nIC0tIGV4Y2VwdCBD aHJvbWl1bS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCmluZGV4IDIzMmNmNDMxYjRjZTUwMGUxODg4 M2FjODc2ZmJkMzFiZDAyZmVlOTkuLjczMTRjNzJlOWU1NWMzZWY0ODZhNTExZDZlODdhMGY1ZjA0 OWZlNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNwcApAQCAtOTMsNyArOTMsMTAgQEAgc3RhdGlj IHZvaWQgaW50ZXJuYWxBZGRNZXNzYWdlKFBhZ2UqIHBhZ2UsIE1lc3NhZ2VUeXBlIHR5cGUsIE1l c3NhZ2VMZXZlbCBsZXZlbCwKICAgICAgICAgcmV0dXJuOwogCiAgICAgUGFnZUNvbnNvbGU6OnBy aW50U291cmNlVVJMQW5kUG9zaXRpb24obGFzdENhbGxlci5zb3VyY2VVUkwoKSwgbGFzdENhbGxl ci5saW5lTnVtYmVyKCkpOwotICAgIFBhZ2VDb25zb2xlOjpwcmludE1lc3NhZ2VTb3VyY2VBbmRM ZXZlbFByZWZpeChDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgbGV2ZWwpOworCisgICAgcHJpbnRm KCI6ICIpOworCisgICAgUGFnZUNvbnNvbGU6OnByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJl Zml4KENvbnNvbGVBUElNZXNzYWdlU291cmNlLCBsZXZlbCwgcHJpbnRUcmFjZSk7CiAKICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGFyZ3VtZW50cy0+YXJndW1lbnRDb3VudCgpOyArK2kpIHsK ICAgICAgICAgU3RyaW5nIGFyZ0FzU3RyaW5nID0gYXJndW1lbnRzLT5hcmd1bWVudEF0KGkpLnRv U3RyaW5nKGFyZ3VtZW50cy0+Z2xvYmFsU3RhdGUoKSk7CkBAIC0xMDIsMTIgKzEwNSwyMiBAQCBz dGF0aWMgdm9pZCBpbnRlcm5hbEFkZE1lc3NhZ2UoUGFnZSogcGFnZSwgTWVzc2FnZVR5cGUgdHlw ZSwgTWVzc2FnZUxldmVsIGxldmVsLAogCiAgICAgcHJpbnRmKCJcbiIpOwogCi0gICAgaWYgKHBy aW50VHJhY2UpIHsKLSAgICAgICAgcHJpbnRmKCJTdGFjayBUcmFjZVxuIik7Ci0gICAgICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgY2FsbFN0YWNrLT5zaXplKCk7ICsraSkgewotICAgICAgICAg ICAgU3RyaW5nIGZ1bmN0aW9uTmFtZSA9IFN0cmluZyhjYWxsU3RhY2stPmF0KGkpLmZ1bmN0aW9u TmFtZSgpKTsKLSAgICAgICAgICAgIHByaW50ZigiXHQlc1xuIiwgZnVuY3Rpb25OYW1lLnV0Zjgo KS5kYXRhKCkpOwotICAgICAgICB9CisgICAgaWYgKCFwcmludFRyYWNlKQorICAgICAgICByZXR1 cm47CisKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNhbGxTdGFjay0+c2l6ZSgpOyArK2kp IHsKKyAgICAgICAgY29uc3QgU2NyaXB0Q2FsbEZyYW1lJiBjYWxsRnJhbWUgPSBjYWxsU3RhY2st PmF0KGkpOworCisgICAgICAgIFN0cmluZyBmdW5jdGlvbk5hbWUgPSBTdHJpbmcoY2FsbEZyYW1l LmZ1bmN0aW9uTmFtZSgpKTsKKyAgICAgICAgaWYgKGZ1bmN0aW9uTmFtZS5pc0VtcHR5KCkpCisg ICAgICAgICAgICBmdW5jdGlvbk5hbWUgPSBBU0NJSUxpdGVyYWwoIih1bmtub3duKSIpOworCisg ICAgICAgIHByaW50ZigiJWx1OiAiLCBpKTsKKyAgICAgICAgcHJpbnRmKCIlcyAoIiwgZnVuY3Rp b25OYW1lLnV0ZjgoKS5kYXRhKCkpOworCisgICAgICAgIFBhZ2VDb25zb2xlOjpwcmludFNvdXJj ZVVSTEFuZFBvc2l0aW9uKGNhbGxGcmFtZS5zb3VyY2VVUkwoKSwgY2FsbEZyYW1lLmxpbmVOdW1i ZXIoKSk7CisKKyAgICAgICAgcHJpbnRmKCIpXG4iKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlQ29uc29sZS5jcHAKaW5kZXggODFmMWNmYzA3MDQwOGYyMWFmZDI0NzUzNzdiMDc2OGEx ZGMzODFhMy4uMjkxNGNiYjA2NGVmZjUwYmY3MDJlOWRiNTkzMTRlZWY2NjJmMzQxZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlQ29uc29sZS5jcHAKQEAgLTY4LDEzICs2OCwxNSBAQCB2b2lkIFBhZ2VD b25zb2xlOjpwcmludFNvdXJjZVVSTEFuZFBvc2l0aW9uKGNvbnN0IFN0cmluZyYgc291cmNlVVJM LCB1bnNpZ25lZCBsaQogewogICAgIGlmICghc291cmNlVVJMLmlzRW1wdHkoKSkgewogICAgICAg ICBpZiAobGluZU51bWJlciA+IDAgJiYgY29sdW1uTnVtYmVyID4gMCkKLSAgICAgICAgICAgIHBy aW50ZigiJXM6JXU6JXU6ICIsIHNvdXJjZVVSTC51dGY4KCkuZGF0YSgpLCBsaW5lTnVtYmVyLCBj b2x1bW5OdW1iZXIpOworICAgICAgICAgICAgcHJpbnRmKCIlczoldToldSIsIHNvdXJjZVVSTC51 dGY4KCkuZGF0YSgpLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOworICAgICAgICBlbHNlIGlm IChsaW5lTnVtYmVyID4gMCkKKyAgICAgICAgICAgIHByaW50ZigiJXM6JXUiLCBzb3VyY2VVUkwu dXRmOCgpLmRhdGEoKSwgbGluZU51bWJlcik7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHBy aW50ZigiJXM6ICIsIHNvdXJjZVVSTC51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgIHByaW50 ZigiJXMiLCBzb3VyY2VVUkwudXRmOCgpLmRhdGEoKSk7CiAgICAgfQogfQogCi12b2lkIFBhZ2VD b25zb2xlOjpwcmludE1lc3NhZ2VTb3VyY2VBbmRMZXZlbFByZWZpeChNZXNzYWdlU291cmNlIHNv dXJjZSwgTWVzc2FnZUxldmVsIGxldmVsKQordm9pZCBQYWdlQ29uc29sZTo6cHJpbnRNZXNzYWdl U291cmNlQW5kTGV2ZWxQcmVmaXgoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VMZXZlbCBs ZXZlbCwgYm9vbCBzaG93QXNUcmFjZSkKIHsKICAgICBjb25zdCBjaGFyKiBzb3VyY2VTdHJpbmc7 CiAgICAgc3dpdGNoIChzb3VyY2UpIHsKQEAgLTg4LDcgKzkwLDcgQEAgdm9pZCBQYWdlQ29uc29s ZTo6cHJpbnRNZXNzYWdlU291cmNlQW5kTGV2ZWxQcmVmaXgoTWVzc2FnZVNvdXJjZSBzb3VyY2Us IE1lc3NhZ2UKICAgICAgICAgc291cmNlU3RyaW5nID0gIk5FVFdPUksiOwogICAgICAgICBicmVh azsKICAgICBjYXNlIENvbnNvbGVBUElNZXNzYWdlU291cmNlOgotICAgICAgICBzb3VyY2VTdHJp bmcgPSAiQ09OU09MRUFQSSI7CisgICAgICAgIHNvdXJjZVN0cmluZyA9ICJDT05TT0xFIjsKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBTdG9yYWdlTWVzc2FnZVNvdXJjZToKICAgICAgICAgc291 cmNlU3RyaW5nID0gIlNUT1JBR0UiOwpAQCAtMTM0LDYgKzEzNiw5IEBAIHZvaWQgUGFnZUNvbnNv bGU6OnByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KE1lc3NhZ2VTb3VyY2Ugc291cmNl LCBNZXNzYWdlCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAorICAgIGlmIChzaG93QXNUcmFjZSkK KyAgICAgICAgbGV2ZWxTdHJpbmcgPSAiVFJBQ0UiOworCiAgICAgcHJpbnRmKCIlcyAlczoiLCBz b3VyY2VTdHJpbmcsIGxldmVsU3RyaW5nKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlQ29uc29sZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZS5o CmluZGV4IDlkYmRhNjZkZjY2MmU1NjliYzhhMjUxMWU0OTQ5MmM4MTJjNTQyNjguLjlhNzBlNTRk OWU5NmE0OTE3OTQ0NzBhOWMxYzM0NWQ2ZWFmNzAyOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUGFnZUNvbnNvbGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25z b2xlLmgKQEAgLTQ5LDcgKzQ5LDcgQEAgcHVibGljOgogICAgIH5QYWdlQ29uc29sZSgpOwogCiAg ICAgc3RhdGljIHZvaWQgcHJpbnRTb3VyY2VVUkxBbmRQb3NpdGlvbihjb25zdCBTdHJpbmcmIHNv dXJjZVVSTCwgdW5zaWduZWQgbGluZU51bWJlciwgdW5zaWduZWQgY29sdW1uTnVtYmVyID0gMCk7 Ci0gICAgc3RhdGljIHZvaWQgcHJpbnRNZXNzYWdlU291cmNlQW5kTGV2ZWxQcmVmaXgoTWVzc2Fn ZVNvdXJjZSwgTWVzc2FnZUxldmVsKTsKKyAgICBzdGF0aWMgdm9pZCBwcmludE1lc3NhZ2VTb3Vy Y2VBbmRMZXZlbFByZWZpeChNZXNzYWdlU291cmNlLCBNZXNzYWdlTGV2ZWwsIGJvb2wgc2hvd0Fz VHJhY2UgPSBmYWxzZSk7CiAKICAgICB2b2lkIGFkZE1lc3NhZ2UoTWVzc2FnZVNvdXJjZSwgTWVz c2FnZUxldmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgc291cmNlVVJM LCB1bnNpZ25lZCBsaW5lTnVtYmVyLCB1bnNpZ25lZCBjb2x1bW5OdW1iZXIsIFBhc3NSZWZQdHI8 U2NyaXB0Q2FsbFN0YWNrPiA9IDAsIEpTQzo6RXhlY1N0YXRlKiA9IDAsIHVuc2lnbmVkIGxvbmcg cmVxdWVzdElkZW50aWZpZXIgPSAwKTsKICAgICB2b2lkIGFkZE1lc3NhZ2UoTWVzc2FnZVNvdXJj ZSwgTWVzc2FnZUxldmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIFBhc3NSZWZQdHI8U2NyaXB0 Q2FsbFN0YWNrPik7Cg== 220868 2014-01-10 11:56:21 -0800 2014-01-10 13:54:50 -0800 Patch bug-126767-20140110115620.patch text/plain 5692 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk1NGZkNWRiZmE2ZDRi YTBhZjY1MDg1NTk5OWE1YzBiMTI0NmNlZS4uYzg2ZTkwZGQ2ZjU0ZjEyNTdkZmNhOWE2Zjc3NTc2 N2ExMjNiYTk5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE0LTAxLTEwICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbiB1cCBhbmQg Zml4IHNvbWUgaXNzdWVzIHdpdGggc3Rkb3V0IGZvcm1hdHRpbmcgb2YgY29uc29sZSBtZXNzYWdl cy4KKworICAgICAgICAqIEZpeCBVUkxzIG5vdCBwcmludGluZyBsaW5lIG51bWJlcnMgdW5sZXNz IGNvbHVtbiBudW1iZXIgaXMgPiAwLgorICAgICAgICAqIENoYW5nZSAiQ09OU09MRUFQSSIgdG8g IkNPTlNPTEUiIGZvciB0aGUgc291cmNlLgorICAgICAgICAqIENsZWFuIHVwIGhvdyBjb25zb2xl LnRyYWNlIG91dHB1dHMgYW5kIHByaW50IFVSTCwgbGluZSBhbmQgY29sdW1uIGZvciBlYWNoIGZy YW1lLgorICAgICAgICAqIFByaW50ICIodW5rbm93bikiIGZvciBhbm9ueW1vdXMgYW5kIG5hdGl2 ZSBjb2RlIGNhbGwgZnJhbWVzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjY3NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHBhZ2UvQ29uc29sZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbnRl cm5hbEFkZE1lc3NhZ2UpOgorICAgICAgICAqIHBhZ2UvUGFnZUNvbnNvbGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZUNvbnNvbGU6OnByaW50U291cmNlVVJMQW5kUG9zaXRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6UGFnZUNvbnNvbGU6OnByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJl Zml4KToKKyAgICAgICAgKiBwYWdlL1BhZ2VDb25zb2xlLmg6CisKKzIwMTQtMDEtMTAgIFRpbW90 aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCiAgICAgICAgIFByZXZlbnQgc29tZSBy ZXNvdXJjZXMgZnJvbSBzaG93aW5nIHVwIGluIFdlYiBJbnNwZWN0b3IgYXMgeWVhcnMgaW4gZHVy YXRpb24uCiAKICAgICAgICAgTm8gV2ViS2l0IHBvcnQgcGFzc2VkIGEgbW9ub3RvbmljIHRpbWUg dG8gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRGaW5pc2hMb2FkaW5nIC0tIGV4Y2VwdCBD aHJvbWl1bS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCmluZGV4IDIzMmNmNDMxYjRjZTUwMGUxODg4 M2FjODc2ZmJkMzFiZDAyZmVlOTkuLjg0YmMzYzVmNzFiNTViOTg4ZmE0MjY1NzNiZTFjYmY1NmI5 YThiMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNwcApAQCAtOTMsNyArOTMsMTAgQEAgc3RhdGlj IHZvaWQgaW50ZXJuYWxBZGRNZXNzYWdlKFBhZ2UqIHBhZ2UsIE1lc3NhZ2VUeXBlIHR5cGUsIE1l c3NhZ2VMZXZlbCBsZXZlbCwKICAgICAgICAgcmV0dXJuOwogCiAgICAgUGFnZUNvbnNvbGU6OnBy aW50U291cmNlVVJMQW5kUG9zaXRpb24obGFzdENhbGxlci5zb3VyY2VVUkwoKSwgbGFzdENhbGxl ci5saW5lTnVtYmVyKCkpOwotICAgIFBhZ2VDb25zb2xlOjpwcmludE1lc3NhZ2VTb3VyY2VBbmRM ZXZlbFByZWZpeChDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgbGV2ZWwpOworCisgICAgcHJpbnRm KCI6ICIpOworCisgICAgUGFnZUNvbnNvbGU6OnByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJl Zml4KENvbnNvbGVBUElNZXNzYWdlU291cmNlLCBsZXZlbCwgcHJpbnRUcmFjZSk7CiAKICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGFyZ3VtZW50cy0+YXJndW1lbnRDb3VudCgpOyArK2kpIHsK ICAgICAgICAgU3RyaW5nIGFyZ0FzU3RyaW5nID0gYXJndW1lbnRzLT5hcmd1bWVudEF0KGkpLnRv U3RyaW5nKGFyZ3VtZW50cy0+Z2xvYmFsU3RhdGUoKSk7CkBAIC0xMDIsMTIgKzEwNSwyMSBAQCBz dGF0aWMgdm9pZCBpbnRlcm5hbEFkZE1lc3NhZ2UoUGFnZSogcGFnZSwgTWVzc2FnZVR5cGUgdHlw ZSwgTWVzc2FnZUxldmVsIGxldmVsLAogCiAgICAgcHJpbnRmKCJcbiIpOwogCi0gICAgaWYgKHBy aW50VHJhY2UpIHsKLSAgICAgICAgcHJpbnRmKCJTdGFjayBUcmFjZVxuIik7Ci0gICAgICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgY2FsbFN0YWNrLT5zaXplKCk7ICsraSkgewotICAgICAgICAg ICAgU3RyaW5nIGZ1bmN0aW9uTmFtZSA9IFN0cmluZyhjYWxsU3RhY2stPmF0KGkpLmZ1bmN0aW9u TmFtZSgpKTsKLSAgICAgICAgICAgIHByaW50ZigiXHQlc1xuIiwgZnVuY3Rpb25OYW1lLnV0Zjgo KS5kYXRhKCkpOwotICAgICAgICB9CisgICAgaWYgKCFwcmludFRyYWNlKQorICAgICAgICByZXR1 cm47CisKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNhbGxTdGFjay0+c2l6ZSgpOyArK2kp IHsKKyAgICAgICAgY29uc3QgU2NyaXB0Q2FsbEZyYW1lJiBjYWxsRnJhbWUgPSBjYWxsU3RhY2st PmF0KGkpOworCisgICAgICAgIFN0cmluZyBmdW5jdGlvbk5hbWUgPSBTdHJpbmcoY2FsbEZyYW1l LmZ1bmN0aW9uTmFtZSgpKTsKKyAgICAgICAgaWYgKGZ1bmN0aW9uTmFtZS5pc0VtcHR5KCkpCisg ICAgICAgICAgICBmdW5jdGlvbk5hbWUgPSBBU0NJSUxpdGVyYWwoIih1bmtub3duKSIpOworCisg ICAgICAgIHByaW50ZigiJWx1OiAlcyAoIiwgaSwgZnVuY3Rpb25OYW1lLnV0ZjgoKS5kYXRhKCkp OworCisgICAgICAgIFBhZ2VDb25zb2xlOjpwcmludFNvdXJjZVVSTEFuZFBvc2l0aW9uKGNhbGxG cmFtZS5zb3VyY2VVUkwoKSwgY2FsbEZyYW1lLmxpbmVOdW1iZXIoKSk7CisKKyAgICAgICAgcHJp bnRmKCIpXG4iKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZUNvbnNvbGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZS5jcHAKaW5k ZXggODFmMWNmYzA3MDQwOGYyMWFmZDI0NzUzNzdiMDc2OGExZGMzODFhMy4uMjkxNGNiYjA2NGVm ZjUwYmY3MDJlOWRiNTkzMTRlZWY2NjJmMzQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlQ29uc29sZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29s ZS5jcHAKQEAgLTY4LDEzICs2OCwxNSBAQCB2b2lkIFBhZ2VDb25zb2xlOjpwcmludFNvdXJjZVVS TEFuZFBvc2l0aW9uKGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCB1bnNpZ25lZCBsaQogewogICAg IGlmICghc291cmNlVVJMLmlzRW1wdHkoKSkgewogICAgICAgICBpZiAobGluZU51bWJlciA+IDAg JiYgY29sdW1uTnVtYmVyID4gMCkKLSAgICAgICAgICAgIHByaW50ZigiJXM6JXU6JXU6ICIsIHNv dXJjZVVSTC51dGY4KCkuZGF0YSgpLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOworICAgICAg ICAgICAgcHJpbnRmKCIlczoldToldSIsIHNvdXJjZVVSTC51dGY4KCkuZGF0YSgpLCBsaW5lTnVt YmVyLCBjb2x1bW5OdW1iZXIpOworICAgICAgICBlbHNlIGlmIChsaW5lTnVtYmVyID4gMCkKKyAg ICAgICAgICAgIHByaW50ZigiJXM6JXUiLCBzb3VyY2VVUkwudXRmOCgpLmRhdGEoKSwgbGluZU51 bWJlcik7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHByaW50ZigiJXM6ICIsIHNvdXJjZVVS TC51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgIHByaW50ZigiJXMiLCBzb3VyY2VVUkwudXRm OCgpLmRhdGEoKSk7CiAgICAgfQogfQogCi12b2lkIFBhZ2VDb25zb2xlOjpwcmludE1lc3NhZ2VT b3VyY2VBbmRMZXZlbFByZWZpeChNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZUxldmVsIGxl dmVsKQordm9pZCBQYWdlQ29uc29sZTo6cHJpbnRNZXNzYWdlU291cmNlQW5kTGV2ZWxQcmVmaXgo TWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgYm9vbCBzaG93QXNUcmFj ZSkKIHsKICAgICBjb25zdCBjaGFyKiBzb3VyY2VTdHJpbmc7CiAgICAgc3dpdGNoIChzb3VyY2Up IHsKQEAgLTg4LDcgKzkwLDcgQEAgdm9pZCBQYWdlQ29uc29sZTo6cHJpbnRNZXNzYWdlU291cmNl QW5kTGV2ZWxQcmVmaXgoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2UKICAgICAgICAgc291 cmNlU3RyaW5nID0gIk5FVFdPUksiOwogICAgICAgICBicmVhazsKICAgICBjYXNlIENvbnNvbGVB UElNZXNzYWdlU291cmNlOgotICAgICAgICBzb3VyY2VTdHJpbmcgPSAiQ09OU09MRUFQSSI7Cisg ICAgICAgIHNvdXJjZVN0cmluZyA9ICJDT05TT0xFIjsKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBTdG9yYWdlTWVzc2FnZVNvdXJjZToKICAgICAgICAgc291cmNlU3RyaW5nID0gIlNUT1JBR0Ui OwpAQCAtMTM0LDYgKzEzNiw5IEBAIHZvaWQgUGFnZUNvbnNvbGU6OnByaW50TWVzc2FnZVNvdXJj ZUFuZExldmVsUHJlZml4KE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlCiAgICAgICAgIGJy ZWFrOwogICAgIH0KIAorICAgIGlmIChzaG93QXNUcmFjZSkKKyAgICAgICAgbGV2ZWxTdHJpbmcg PSAiVFJBQ0UiOworCiAgICAgcHJpbnRmKCIlcyAlczoiLCBzb3VyY2VTdHJpbmcsIGxldmVsU3Ry aW5nKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZS5o IGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZS5oCmluZGV4IDlkYmRhNjZkZjY2MmU1 NjliYzhhMjUxMWU0OTQ5MmM4MTJjNTQyNjguLjlhNzBlNTRkOWU5NmE0OTE3OTQ0NzBhOWMxYzM0 NWQ2ZWFmNzAyOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25zb2xlLmgKQEAgLTQ5LDcgKzQ5LDcg QEAgcHVibGljOgogICAgIH5QYWdlQ29uc29sZSgpOwogCiAgICAgc3RhdGljIHZvaWQgcHJpbnRT b3VyY2VVUkxBbmRQb3NpdGlvbihjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCwgdW5zaWduZWQgbGlu ZU51bWJlciwgdW5zaWduZWQgY29sdW1uTnVtYmVyID0gMCk7Ci0gICAgc3RhdGljIHZvaWQgcHJp bnRNZXNzYWdlU291cmNlQW5kTGV2ZWxQcmVmaXgoTWVzc2FnZVNvdXJjZSwgTWVzc2FnZUxldmVs KTsKKyAgICBzdGF0aWMgdm9pZCBwcmludE1lc3NhZ2VTb3VyY2VBbmRMZXZlbFByZWZpeChNZXNz YWdlU291cmNlLCBNZXNzYWdlTGV2ZWwsIGJvb2wgc2hvd0FzVHJhY2UgPSBmYWxzZSk7CiAKICAg ICB2b2lkIGFkZE1lc3NhZ2UoTWVzc2FnZVNvdXJjZSwgTWVzc2FnZUxldmVsLCBjb25zdCBTdHJp bmcmIG1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCB1bnNpZ25lZCBsaW5lTnVtYmVy LCB1bnNpZ25lZCBjb2x1bW5OdW1iZXIsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiA9IDAs IEpTQzo6RXhlY1N0YXRlKiA9IDAsIHVuc2lnbmVkIGxvbmcgcmVxdWVzdElkZW50aWZpZXIgPSAw KTsKICAgICB2b2lkIGFkZE1lc3NhZ2UoTWVzc2FnZVNvdXJjZSwgTWVzc2FnZUxldmVsLCBjb25z dCBTdHJpbmcmIG1lc3NhZ2UsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPik7Cg== 220884 2014-01-10 13:54:52 -0800 2014-01-10 14:12:19 -0800 Patch for landing bug-126767-20140110135451.patch text/plain 5693 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk1NGZkNWRiZmE2ZDRi YTBhZjY1MDg1NTk5OWE1YzBiMTI0NmNlZS4uNTQ5OWY1NDE3NGM0MjBkMjk5NTBlZDUzYjIwNDk4 NDkyZmQ1OTIxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE0LTAxLTEwICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbiB1cCBhbmQg Zml4IHNvbWUgaXNzdWVzIHdpdGggc3Rkb3V0IGZvcm1hdHRpbmcgb2YgY29uc29sZSBtZXNzYWdl cy4KKworICAgICAgICAqIEZpeCBVUkxzIG5vdCBwcmludGluZyBsaW5lIG51bWJlcnMgdW5sZXNz IGNvbHVtbiBudW1iZXIgaXMgPiAwLgorICAgICAgICAqIENoYW5nZSAiQ09OU09MRUFQSSIgdG8g IkNPTlNPTEUiIGZvciB0aGUgc291cmNlLgorICAgICAgICAqIENsZWFuIHVwIGhvdyBjb25zb2xl LnRyYWNlIG91dHB1dHMgYW5kIHByaW50IFVSTCwgbGluZSBhbmQgY29sdW1uIGZvciBlYWNoIGZy YW1lLgorICAgICAgICAqIFByaW50ICIodW5rbm93bikiIGZvciBhbm9ueW1vdXMgYW5kIG5hdGl2 ZSBjb2RlIGNhbGwgZnJhbWVzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjY3NjcKKworICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGggUGVjb3Jh cm8uCisKKyAgICAgICAgKiBwYWdlL0NvbnNvbGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aW50 ZXJuYWxBZGRNZXNzYWdlKToKKyAgICAgICAgKiBwYWdlL1BhZ2VDb25zb2xlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlBhZ2VDb25zb2xlOjpwcmludFNvdXJjZVVSTEFuZFBvc2l0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlBhZ2VDb25zb2xlOjpwcmludE1lc3NhZ2VTb3VyY2VBbmRMZXZlbFBy ZWZpeCk6CisgICAgICAgICogcGFnZS9QYWdlQ29uc29sZS5oOgorCisyMDE0LTAxLTEwICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKwogICAgICAgICBQcmV2ZW50IHNvbWUg cmVzb3VyY2VzIGZyb20gc2hvd2luZyB1cCBpbiBXZWIgSW5zcGVjdG9yIGFzIHllYXJzIGluIGR1 cmF0aW9uLgogCiAgICAgICAgIE5vIFdlYktpdCBwb3J0IHBhc3NlZCBhIG1vbm90b25pYyB0aW1l IHRvIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmluaXNoTG9hZGluZyAtLSBleGNlcHQg Q2hyb21pdW0uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAppbmRleCAyMzJjZjQzMWI0Y2U1MDBlMTg4 ODNhYzg3NmZiZDMxYmQwMmZlZTk5Li44NGJjM2M1ZjcxYjU1Yjk4OGZhNDI2NTczYmUxY2JmNTZi OWE4YjE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAKQEAgLTkzLDcgKzkzLDEwIEBAIHN0YXRp YyB2b2lkIGludGVybmFsQWRkTWVzc2FnZShQYWdlKiBwYWdlLCBNZXNzYWdlVHlwZSB0eXBlLCBN ZXNzYWdlTGV2ZWwgbGV2ZWwsCiAgICAgICAgIHJldHVybjsKIAogICAgIFBhZ2VDb25zb2xlOjpw cmludFNvdXJjZVVSTEFuZFBvc2l0aW9uKGxhc3RDYWxsZXIuc291cmNlVVJMKCksIGxhc3RDYWxs ZXIubGluZU51bWJlcigpKTsKLSAgICBQYWdlQ29uc29sZTo6cHJpbnRNZXNzYWdlU291cmNlQW5k TGV2ZWxQcmVmaXgoQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2UsIGxldmVsKTsKKworICAgIHByaW50 ZigiOiAiKTsKKworICAgIFBhZ2VDb25zb2xlOjpwcmludE1lc3NhZ2VTb3VyY2VBbmRMZXZlbFBy ZWZpeChDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgbGV2ZWwsIHByaW50VHJhY2UpOwogCiAgICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBhcmd1bWVudHMtPmFyZ3VtZW50Q291bnQoKTsgKytpKSB7 CiAgICAgICAgIFN0cmluZyBhcmdBc1N0cmluZyA9IGFyZ3VtZW50cy0+YXJndW1lbnRBdChpKS50 b1N0cmluZyhhcmd1bWVudHMtPmdsb2JhbFN0YXRlKCkpOwpAQCAtMTAyLDEyICsxMDUsMjEgQEAg c3RhdGljIHZvaWQgaW50ZXJuYWxBZGRNZXNzYWdlKFBhZ2UqIHBhZ2UsIE1lc3NhZ2VUeXBlIHR5 cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwKIAogICAgIHByaW50ZigiXG4iKTsKIAotICAgIGlmIChw cmludFRyYWNlKSB7Ci0gICAgICAgIHByaW50ZigiU3RhY2sgVHJhY2VcbiIpOwotICAgICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGNhbGxTdGFjay0+c2l6ZSgpOyArK2kpIHsKLSAgICAgICAg ICAgIFN0cmluZyBmdW5jdGlvbk5hbWUgPSBTdHJpbmcoY2FsbFN0YWNrLT5hdChpKS5mdW5jdGlv bk5hbWUoKSk7Ci0gICAgICAgICAgICBwcmludGYoIlx0JXNcbiIsIGZ1bmN0aW9uTmFtZS51dGY4 KCkuZGF0YSgpKTsKLSAgICAgICAgfQorICAgIGlmICghcHJpbnRUcmFjZSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjYWxsU3RhY2stPnNpemUoKTsgKytp KSB7CisgICAgICAgIGNvbnN0IFNjcmlwdENhbGxGcmFtZSYgY2FsbEZyYW1lID0gY2FsbFN0YWNr LT5hdChpKTsKKworICAgICAgICBTdHJpbmcgZnVuY3Rpb25OYW1lID0gU3RyaW5nKGNhbGxGcmFt ZS5mdW5jdGlvbk5hbWUoKSk7CisgICAgICAgIGlmIChmdW5jdGlvbk5hbWUuaXNFbXB0eSgpKQor ICAgICAgICAgICAgZnVuY3Rpb25OYW1lID0gQVNDSUlMaXRlcmFsKCIodW5rbm93bikiKTsKKwor ICAgICAgICBwcmludGYoIiVsdTogJXMgKCIsIGksIGZ1bmN0aW9uTmFtZS51dGY4KCkuZGF0YSgp KTsKKworICAgICAgICBQYWdlQ29uc29sZTo6cHJpbnRTb3VyY2VVUkxBbmRQb3NpdGlvbihjYWxs RnJhbWUuc291cmNlVVJMKCksIGNhbGxGcmFtZS5saW5lTnVtYmVyKCkpOworCisgICAgICAgIHBy aW50ZigiKVxuIik7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2VDb25zb2xlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGUuY3BwCmlu ZGV4IDgxZjFjZmMwNzA0MDhmMjFhZmQyNDc1Mzc3YjA3NjhhMWRjMzgxYTMuLjI5MTRjYmIwNjRl ZmY1MGJmNzAyZTlkYjU5MzE0ZWVmNjYyZjM0MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvUGFnZUNvbnNvbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNv bGUuY3BwCkBAIC02OCwxMyArNjgsMTUgQEAgdm9pZCBQYWdlQ29uc29sZTo6cHJpbnRTb3VyY2VV UkxBbmRQb3NpdGlvbihjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCwgdW5zaWduZWQgbGkKIHsKICAg ICBpZiAoIXNvdXJjZVVSTC5pc0VtcHR5KCkpIHsKICAgICAgICAgaWYgKGxpbmVOdW1iZXIgPiAw ICYmIGNvbHVtbk51bWJlciA+IDApCi0gICAgICAgICAgICBwcmludGYoIiVzOiV1OiV1OiAiLCBz b3VyY2VVUkwudXRmOCgpLmRhdGEoKSwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyKTsKKyAgICAg ICAgICAgIHByaW50ZigiJXM6JXU6JXUiLCBzb3VyY2VVUkwudXRmOCgpLmRhdGEoKSwgbGluZU51 bWJlciwgY29sdW1uTnVtYmVyKTsKKyAgICAgICAgZWxzZSBpZiAobGluZU51bWJlciA+IDApCisg ICAgICAgICAgICBwcmludGYoIiVzOiV1Iiwgc291cmNlVVJMLnV0ZjgoKS5kYXRhKCksIGxpbmVO dW1iZXIpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBwcmludGYoIiVzOiAiLCBzb3VyY2VV UkwudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICBwcmludGYoIiVzIiwgc291cmNlVVJMLnV0 ZjgoKS5kYXRhKCkpOwogICAgIH0KIH0KIAotdm9pZCBQYWdlQ29uc29sZTo6cHJpbnRNZXNzYWdl U291cmNlQW5kTGV2ZWxQcmVmaXgoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VMZXZlbCBs ZXZlbCkKK3ZvaWQgUGFnZUNvbnNvbGU6OnByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4 KE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlTGV2ZWwgbGV2ZWwsIGJvb2wgc2hvd0FzVHJh Y2UpCiB7CiAgICAgY29uc3QgY2hhciogc291cmNlU3RyaW5nOwogICAgIHN3aXRjaCAoc291cmNl KSB7CkBAIC04OCw3ICs5MCw3IEBAIHZvaWQgUGFnZUNvbnNvbGU6OnByaW50TWVzc2FnZVNvdXJj ZUFuZExldmVsUHJlZml4KE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlCiAgICAgICAgIHNv dXJjZVN0cmluZyA9ICJORVRXT1JLIjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDb25zb2xl QVBJTWVzc2FnZVNvdXJjZToKLSAgICAgICAgc291cmNlU3RyaW5nID0gIkNPTlNPTEVBUEkiOwor ICAgICAgICBzb3VyY2VTdHJpbmcgPSAiQ09OU09MRSI7CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgU3RvcmFnZU1lc3NhZ2VTb3VyY2U6CiAgICAgICAgIHNvdXJjZVN0cmluZyA9ICJTVE9SQUdF IjsKQEAgLTEzNCw2ICsxMzYsOSBAQCB2b2lkIFBhZ2VDb25zb2xlOjpwcmludE1lc3NhZ2VTb3Vy Y2VBbmRMZXZlbFByZWZpeChNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZQogICAgICAgICBi cmVhazsKICAgICB9CiAKKyAgICBpZiAoc2hvd0FzVHJhY2UpCisgICAgICAgIGxldmVsU3RyaW5n ID0gIlRSQUNFIjsKKwogICAgIHByaW50ZigiJXMgJXM6Iiwgc291cmNlU3RyaW5nLCBsZXZlbFN0 cmluZyk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGUu aCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGUuaAppbmRleCA5ZGJkYTY2ZGY2NjJl NTY5YmM4YTI1MTFlNDk0OTJjODEyYzU0MjY4Li45YTcwZTU0ZDllOTZhNDkxNzk0NDcwYTljMWMz NDVkNmVhZjcwMjhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25zb2xl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZS5oCkBAIC00OSw3ICs0OSw3 IEBAIHB1YmxpYzoKICAgICB+UGFnZUNvbnNvbGUoKTsKIAogICAgIHN0YXRpYyB2b2lkIHByaW50 U291cmNlVVJMQW5kUG9zaXRpb24oY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwsIHVuc2lnbmVkIGxp bmVOdW1iZXIsIHVuc2lnbmVkIGNvbHVtbk51bWJlciA9IDApOwotICAgIHN0YXRpYyB2b2lkIHBy aW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KE1lc3NhZ2VTb3VyY2UsIE1lc3NhZ2VMZXZl bCk7CisgICAgc3RhdGljIHZvaWQgcHJpbnRNZXNzYWdlU291cmNlQW5kTGV2ZWxQcmVmaXgoTWVz c2FnZVNvdXJjZSwgTWVzc2FnZUxldmVsLCBib29sIHNob3dBc1RyYWNlID0gZmFsc2UpOwogCiAg ICAgdm9pZCBhZGRNZXNzYWdlKE1lc3NhZ2VTb3VyY2UsIE1lc3NhZ2VMZXZlbCwgY29uc3QgU3Ry aW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCwgdW5zaWduZWQgbGluZU51bWJl ciwgdW5zaWduZWQgY29sdW1uTnVtYmVyLCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4gPSAw LCBKU0M6OkV4ZWNTdGF0ZSogPSAwLCB1bnNpZ25lZCBsb25nIHJlcXVlc3RJZGVudGlmaWVyID0g MCk7CiAgICAgdm9pZCBhZGRNZXNzYWdlKE1lc3NhZ2VTb3VyY2UsIE1lc3NhZ2VMZXZlbCwgY29u c3QgU3RyaW5nJiBtZXNzYWdlLCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4pOwo=