187883 2018-07-21 17:43:18 -0700 Fix lldb summarizers for HashMaps and HashSets 2018-07-21 21:57:44 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue dbates simon.fraser webkit-bug-importer oldest_to_newest 1444083 0 simon.fraser 2018-07-21 17:43:18 -0700 Fix lldb summarizers for HashMaps and HashSets 1444087 1 345522 simon.fraser 2018-07-21 17:47:46 -0700 Created attachment 345522 Patch 1444095 2 345527 simon.fraser 2018-07-21 18:37:39 -0700 Created attachment 345527 Patch 1444103 3 345527 dbates 2018-07-21 19:39:41 -0700 Comment on attachment 345527 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345527&action=review r=me > Tools/lldb/lldb_webkit_unittest.py:156 > + def serial_test_WTFHashMap_tablesize_and_size(self): Would it be meaningful to add tests for the empty hash table and empty hash set? 1444116 4 simon.fraser 2018-07-21 20:43:21 -0700 (In reply to Daniel Bates from comment #3) > Comment on attachment 345527 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=345527&action=review > > r=me > > > Tools/lldb/lldb_webkit_unittest.py:156 > > + def serial_test_WTFHashMap_tablesize_and_size(self): > > Would it be meaningful to add tests for the empty hash table and empty hash > set? I don't think so, really. 1444120 5 345527 commit-queue 2018-07-21 21:11:32 -0700 Comment on attachment 345527 Patch Rejecting attachment 345527 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 345527, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=345527&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=187883&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 345527 from bug 187883. Fetching: https://bugs.webkit.org/attachment.cgi?id=345527 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Daniel Bates']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 4 diffs from patch file(s). patching file Tools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Tools/lldb/lldbWebKitTester/main.cpp patching file Tools/lldb/lldb_webkit.py Hunk #1 FAILED at 39. Hunk #2 succeeded at 97 (offset 12 lines). Hunk #3 succeeded at 573 (offset 151 lines). Hunk #4 succeeded at 617 (offset 151 lines). Hunk #5 succeeded at 689 (offset 151 lines). 1 out of 5 hunks FAILED -- saving rejects to file Tools/lldb/lldb_webkit.py.rej patching file Tools/lldb/lldb_webkit_unittest.py Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Daniel Bates']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 4 diffs from patch file(s). patching file Tools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Tools/lldb/lldbWebKitTester/main.cpp patching file Tools/lldb/lldb_webkit.py Hunk #1 FAILED at 39. Hunk #2 succeeded at 97 (offset 12 lines). Hunk #3 succeeded at 573 (offset 151 lines). Hunk #4 succeeded at 617 (offset 151 lines). Hunk #5 succeeded at 689 (offset 151 lines). 1 out of 5 hunks FAILED -- saving rejects to file Tools/lldb/lldb_webkit.py.rej patching file Tools/lldb/lldb_webkit_unittest.py Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Daniel Bates']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From https://git.webkit.org/git/WebKit ed2da807d3c..dc73ddb5e0d master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 234086 = ed2da807d3cf4b5706430e3c192e1df33836c93c r234087 = dc73ddb5e0da679c1452249ea1c0ddf783ad0827 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/8613595 1444123 6 simon.fraser 2018-07-21 21:56:57 -0700 https://trac.webkit.org/changeset/234088/webkit 1444124 7 webkit-bug-importer 2018-07-21 21:57:17 -0700 <rdar://problem/42473235> 1444126 8 simon.fraser 2018-07-21 21:57:44 -0700 *** Bug 187783 has been marked as a duplicate of this bug. *** 345522 2018-07-21 17:47:46 -0700 2018-07-21 18:37:37 -0700 Patch bug-187883-20180721174745.patch text/plain 11096 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MDM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjRkZTgyMzdlYWYyMmIxZmI2ZjZhOTIyZDRlNDEyY2E5 YjFkNTU2ZS4uZDIyY2VkMWExNjk2MjQ0ZjVlN2E3OTc0NjEwY2Y3Yzg3YTE2MTI4ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUy IEBACisyMDE4LTA3LTIxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEZpeCBsbGRiIHN1bW1hcml6ZXJzIGZvciBIYXNoTWFwcyBhbmQgSGFzaFNldHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Nzg4Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAg SGFzaE1hcCBhbmQgSGFzaFNldCBzdW1tYXJpemVycyB3ZXJlIGJyb2tlbiBpbiB2YXJpb3VzIHdh eXMuCisgICAgICAgIAorICAgICAgICBUaGUgJ3R5cGUgc3VtbWFyeSBhZGQgLXgnIHJlZ2V4cCBu ZWVkcyB0byBtYXRjaCBhdCB0aGUgc3RhcnQgYW5kIGVuZCBvZiB0aGUgc3RyaW5nCisgICAgICAg IHRvIGF2b2lkIGZpbmRpbmcgdHlwZXMgbmVzdGVkIGluc2lkZSBvdGhlciB0ZW1wbGF0ZXMuCisg ICAgICAgIAorICAgICAgICBUaGUgSGFzaFRhYmxlIHN5bnRoZXRpYyBjaGlsZCBjb2RlIGluY29y cmVjdGx5IHVzZWQgdGhlIHR5cGUgb2YgdGhlIGtleSwgcmF0aGVyIHRoYW4KKyAgICAgICAgdGhl IHZhbHVlIHdoZW4gc3ludGhlc2l6aW5nIGNoaWxkcmVuLgorICAgICAgICAKKyAgICAgICAgQWRk IEhhc2hNYXAgYW5kIEhhc2hTZXQgc3VtbWFyaXplcnMuCisKKyAgICAgICAgSSB0cmllZCB0byBn ZXQgc3ludGhldGljIGNoaWxkcmVuIHdvcmtpbmcgZGlyZWN0bHkgZm9yIEhhc2hNYXAgYW5kIEhh c2hTZXQsIGJ1dCB3YXMgdW5hYmxlLgorCisgICAgICAgICogbGxkYi9sbGRiV2ViS2l0VGVzdGVy L21haW4uY3BwOgorICAgICAgICAodGVzdFN1bW1hcnlQcm92aWRlcnMpOgorICAgICAgICAqIGxs ZGIvbGxkYl93ZWJraXQucHk6CisgICAgICAgIChfX2xsZGJfaW5pdF9tb2R1bGUpOgorICAgICAg ICAoX19sbGRiX2luaXRfbW9kdWxlLmxsZGJfd2Via2l0KToKKyAgICAgICAgKFdURkhhc2hNYXBf U3VtbWFyeVByb3ZpZGVyKToKKyAgICAgICAgKFdURkhhc2hTZXRfU3VtbWFyeVByb3ZpZGVyKToK KyAgICAgICAgKFdlYkNvcmVDb2xvclByb3ZpZGVyLl90b19zdHJpbmdfZXh0ZW5kZWQpOgorICAg ICAgICAoV2ViQ29yZVVSTFByb3ZpZGVyLnRvX3N0cmluZyk6CisgICAgICAgIChXVEZIYXNoTWFw UHJvdmlkZXIpOgorICAgICAgICAoV1RGSGFzaE1hcFByb3ZpZGVyLl9faW5pdF9fKToKKyAgICAg ICAgKFdURkhhc2hNYXBQcm92aWRlci50YWJsZVNpemUpOgorICAgICAgICAoV1RGSGFzaE1hcFBy b3ZpZGVyLmtleUNvdW50KToKKyAgICAgICAgKFdURkhhc2hTZXRQcm92aWRlcik6CisgICAgICAg IChXVEZIYXNoU2V0UHJvdmlkZXIuX19pbml0X18pOgorICAgICAgICAoV1RGSGFzaFNldFByb3Zp ZGVyLnRhYmxlU2l6ZSk6CisgICAgICAgIChXVEZIYXNoU2V0UHJvdmlkZXIua2V5Q291bnQpOgor ICAgICAgICAoV1RGSGFzaFRhYmxlUHJvdmlkZXIudGFibGVTaXplKToKKyAgICAgICAgKFdURkhh c2hUYWJsZVByb3ZpZGVyKToKKyAgICAgICAgKFdURkhhc2hUYWJsZVByb3ZpZGVyLmtleUNvdW50 KToKKyAgICAgICAgKFdURkhhc2hUYWJsZVByb3ZpZGVyLmdldF9jaGlsZF9hdF9pbmRleCk6Cisg ICAgICAgIChXVEZIYXNoVGFibGVQcm92aWRlci51cGRhdGUpOgorICAgICAgICAqIGxsZGIvbGxk Yl93ZWJraXRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0U3VtbWFyeVByb3ZpZGVycy5zZXJp YWxfdGVzdF9XVEZWZWN0b3JQcm92aWRlcl9lbXB0eV92ZWN0b3IpOgorICAgICAgICAoVGVzdFN1 bW1hcnlQcm92aWRlcnMuc2VyaWFsX3Rlc3RfV1RGVmVjdG9yUHJvdmlkZXJfdmVjdG9yX3NpemVf YW5kX2NhcGFjaXR5KToKKyAgICAgICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJzKToKKyAgICAgICAg KFRlc3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90ZXN0X1dURkhhc2hNYXBfdGFibGVzaXplX2Fu ZF9zaXplKToKKyAgICAgICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90ZXN0X1dURkhh c2hNYXBfb2ZfdmVjdG9yc190YWJsZXNpemVfYW5kX3NpemUpOgorICAgICAgICAoVGVzdFN1bW1h cnlQcm92aWRlcnMuc2VyaWFsX3Rlc3RfV1RGSGFzaFNldF90YWJsZXNpemVfYW5kX3NpemUpOgor CiAyMDE4LTA3LTIwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1RLXVtXUEVdIGVuYWJsZS1tZWRpYS1jYXBhYmlsaXRpZXMgd2Vic2V0dGluZwpk aWZmIC0tZ2l0IGEvVG9vbHMvbGxkYi9sbGRiV2ViS2l0VGVzdGVyL21haW4uY3BwIGIvVG9vbHMv bGxkYi9sbGRiV2ViS2l0VGVzdGVyL21haW4uY3BwCmluZGV4IDcxYTI5ODVmNDFhYTFlM2ZiYzA1 MzA3ZGFiNzUyNDkzMWI1NjY5MGEuLmZhNmZkOWM2YzM4ZTM4ZTFhNjA3N2Y4NzMxNzIwODI1ZjE3 Y2E3MzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2xsZGIvbGxkYldlYktpdFRlc3Rlci9tYWluLmNwcAor KysgYi9Ub29scy9sbGRiL2xsZGJXZWJLaXRUZXN0ZXIvbWFpbi5jcHAKQEAgLTI4LDYgKzI4LDkg QEAKICNpbmNsdWRlICJEdW1wQ2xhc3NMYXlvdXRUZXN0aW5nLmgiCiAjaW5jbHVkZSA8c3RkaW8u aD4KICNpbmNsdWRlIDxXZWJDb3JlL0NvbG9yLmg+CisjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4K KyNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgorI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KICNpbmNs dWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3Ry aW5nLmg+CiAKQEAgLTY0LDYgKzY3LDE2IEBAIHN0YXRpYyB2b2lkIHRlc3RTdW1tYXJ5UHJvdmlk ZXJzKCkKICAgICBhVmVjdG9yV2l0aE9uZUl0ZW0ucmVzZXJ2ZUNhcGFjaXR5KDE2KTsKICAgICBh VmVjdG9yV2l0aE9uZUl0ZW0uYXBwZW5kKDEpOwogCisgICAgSGFzaE1hcDx1bnNpZ25lZCwgaW50 PiBoYXNoTWFwT2ZJbnRzOworICAgIGhhc2hNYXBPZkludHMuYWRkKDEyLCAyMyk7CisgICAgaGFz aE1hcE9mSW50cy5hZGQoMzQsIDQ1KTsKKworICAgIEhhc2hTZXQ8dW5zaWduZWQ+IGhhc2hTZXRP ZkludHM7CisgICAgaGFzaFNldE9mSW50cy5hZGQoNDIpOworCisgICAgSGFzaE1hcDx1bnNpZ25l ZCwgVmVjdG9yPGludD4+IGhhc2hNYXBPZlZlY3RvcnM7CisgICAgaGFzaE1hcE9mVmVjdG9ycy5h ZGQoMSwgVmVjdG9yPGludD4oezIsIDN9KSk7CisKICAgICBhdXRvIGludmFsaWRDb2xvciA9IFdl YkNvcmU6OkNvbG9yIHsgfTsKICAgICBhdXRvIHJnYkNvbG9yID0gV2ViQ29yZTo6Q29sb3IgeyAy NTUsIDEyOCwgNjQgfTsKICAgICBhdXRvIHJnYmFDb2xvciA9IFdlYkNvcmU6OkNvbG9yIHsgMjU1 LCAxMjgsIDY0LCAxMjggfTsKZGlmZiAtLWdpdCBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkg Yi9Ub29scy9sbGRiL2xsZGJfd2Via2l0LnB5CmluZGV4IGJmYzAxNGUwOGVmNWRmMzhjN2I2M2Zi ZDk5NTAyZDg0Y2ZjMjYyOTkuLjVlZGQzYzVjOGNjZGMwZmYxYjJmYWIxMGJmYWMwODlmNDI0OWM2 NzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkKKysrIGIvVG9vbHMvbGxk Yi9sbGRiX3dlYmtpdC5weQpAQCAtMzksMTYgKzM5LDE5IEBAIGRlZiBfX2xsZGJfaW5pdF9tb2R1 bGUoZGVidWdnZXIsIGRpY3QpOgogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3Vt bWFyeSBhZGQgLS1leHBhbmQgLUYgbGxkYl93ZWJraXQuV1RGU3RyaW5nSW1wbF9TdW1tYXJ5UHJv dmlkZXIgV1RGOjpTdHJpbmdJbXBsJykKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBl IHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldURlN0cmluZ1ZpZXdfU3VtbWFy eVByb3ZpZGVyIFdURjo6U3RyaW5nVmlldycpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgn dHlwZSBzdW1tYXJ5IGFkZCAtLWV4cGFuZCAtRiBsbGRiX3dlYmtpdC5XVEZBdG9taWNTdHJpbmdf U3VtbWFyeVByb3ZpZGVyIFdURjo6QXRvbWljU3RyaW5nJykKLSAgICBkZWJ1Z2dlci5IYW5kbGVD b21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldURlZlY3Rv cl9TdW1tYXJ5UHJvdmlkZXIgLXggIldURjo6VmVjdG9yPC4rPiQiJykKLSAgICBkZWJ1Z2dlci5I YW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldU Rkhhc2hUYWJsZV9TdW1tYXJ5UHJvdmlkZXIgLXggIldURjo6SGFzaFRhYmxlPC4rPiQiJykKKyAg ICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxs ZGJfd2Via2l0LldURlZlY3Rvcl9TdW1tYXJ5UHJvdmlkZXIgLXggIl5XVEY6OlZlY3RvcjwuKz4k IicpCisgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtLWV4cGFu ZCAtRiBsbGRiX3dlYmtpdC5XVEZIYXNoVGFibGVfU3VtbWFyeVByb3ZpZGVyIC14ICJeV1RGOjpI YXNoVGFibGU8Lis+JCInKQorICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFy eSBhZGQgLS1leHBhbmQgLUYgbGxkYl93ZWJraXQuV1RGSGFzaE1hcF9TdW1tYXJ5UHJvdmlkZXIg LXggIl5XVEY6Okhhc2hNYXA8Lis+JCInKQorICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5 cGUgc3VtbWFyeSBhZGQgLS1leHBhbmQgLUYgbGxkYl93ZWJraXQuV1RGSGFzaFNldF9TdW1tYXJ5 UHJvdmlkZXIgLXggIl5XVEY6Okhhc2hTZXQ8Lis+JCInKQogICAgIGRlYnVnZ2VyLkhhbmRsZUNv bW1hbmQoJ3R5cGUgc3VtbWFyeSBhZGQgLS1leHBhbmQgLUYgbGxkYl93ZWJraXQuV1RGTWVkaWFU aW1lX1N1bW1hcnlQcm92aWRlciBXVEY6Ok1lZGlhVGltZScpCi0gICAgZGVidWdnZXIuSGFuZGxl Q29tbWFuZCgndHlwZSBzeW50aGV0aWMgYWRkIC14ICJXVEY6OlZlY3RvcjwuKz4kIiAtLXB5dGhv bi1jbGFzcyBsbGRiX3dlYmtpdC5XVEZWZWN0b3JQcm92aWRlcicpCi0gICAgZGVidWdnZXIuSGFu ZGxlQ29tbWFuZCgndHlwZSBzeW50aGV0aWMgYWRkIC14ICJXVEY6Okhhc2hUYWJsZTwuKz4kIiAt LXB5dGhvbi1jbGFzcyBsbGRiX3dlYmtpdC5XVEZIYXNoVGFibGVQcm92aWRlcicpCiAgICAgZGVi dWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtRiBsbGRiX3dlYmtpdC5XZWJD b3JlQ29sb3JfU3VtbWFyeVByb3ZpZGVyIFdlYkNvcmU6OkNvbG9yJykKICAgICBkZWJ1Z2dlci5I YW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC1GIGxsZGJfd2Via2l0LldlYkNvcmVMYXlv dXRVbml0X1N1bW1hcnlQcm92aWRlciBXZWJDb3JlOjpMYXlvdXRVbml0JykKICAgICBkZWJ1Z2dl ci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC1GIGxsZGJfd2Via2l0LldlYkNvcmVM YXlvdXRTaXplX1N1bW1hcnlQcm92aWRlciBXZWJDb3JlOjpMYXlvdXRTaXplJykKICAgICBkZWJ1 Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC1GIGxsZGJfd2Via2l0LldlYkNv cmVMYXlvdXRQb2ludF9TdW1tYXJ5UHJvdmlkZXIgV2ViQ29yZTo6TGF5b3V0UG9pbnQnKQogICAg IGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBhZGQgLUYgbGxkYl93ZWJraXQu V2ViQ29yZVVSTF9TdW1tYXJ5UHJvdmlkZXIgV2ViQ29yZTo6VVJMJykKKyAgICAjIHN5bnRoZXRp YyB0eXBlcyAoc2VlIDxodHRwczovL2xsZGIubGx2bS5vcmcvdmFyZm9ybWF0cy5odG1sPikKKyAg ICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN5bnRoZXRpYyBhZGQgLXggIl5XVEY6OlZl Y3RvcjwuKz4kIiAtLXB5dGhvbi1jbGFzcyBsbGRiX3dlYmtpdC5XVEZWZWN0b3JQcm92aWRlcicp CisgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzeW50aGV0aWMgYWRkIC14ICJeV1RG OjpIYXNoVGFibGU8Lis+JCIgLS1weXRob24tY2xhc3MgbGxkYl93ZWJraXQuV1RGSGFzaFRhYmxl UHJvdmlkZXInKQogCiAKIGRlZiBXVEZTdHJpbmdfU3VtbWFyeVByb3ZpZGVyKHZhbG9iaiwgZGlj dCk6CkBAIC04Miw2ICs4NSwxNiBAQCBkZWYgV1RGSGFzaFRhYmxlX1N1bW1hcnlQcm92aWRlcih2 YWxvYmosIGRpY3QpOgogICAgIHJldHVybiAieyB0YWJsZVNpemUgPSAlZCwga2V5Q291bnQgPSAl ZCB9IiAlIChwcm92aWRlci50YWJsZVNpemUoKSwgcHJvdmlkZXIua2V5Q291bnQoKSkKIAogCitk ZWYgV1RGSGFzaE1hcF9TdW1tYXJ5UHJvdmlkZXIodmFsb2JqLCBkaWN0KToKKyAgICBwcm92aWRl ciA9IFdURkhhc2hNYXBQcm92aWRlcih2YWxvYmosIGRpY3QpCisgICAgcmV0dXJuICJ7IHRhYmxl U2l6ZSA9ICVkLCBrZXlDb3VudCA9ICVkIH0iICUgKHByb3ZpZGVyLnRhYmxlU2l6ZSgpLCBwcm92 aWRlci5rZXlDb3VudCgpKQorCisKK2RlZiBXVEZIYXNoU2V0X1N1bW1hcnlQcm92aWRlcih2YWxv YmosIGRpY3QpOgorICAgIHByb3ZpZGVyID0gV1RGSGFzaFNldFByb3ZpZGVyKHZhbG9iaiwgZGlj dCkKKyAgICByZXR1cm4gInsgdGFibGVTaXplID0gJWQsIGtleUNvdW50ID0gJWQgfSIgJSAocHJv dmlkZXIudGFibGVTaXplKCksIHByb3ZpZGVyLmtleUNvdW50KCkpCisKKwogZGVmIFdURk1lZGlh VGltZV9TdW1tYXJ5UHJvdmlkZXIodmFsb2JqLCBkaWN0KToKICAgICBwcm92aWRlciA9IFdURk1l ZGlhVGltZVByb3ZpZGVyKHZhbG9iaiwgZGljdCkKICAgICBpZiBwcm92aWRlci5pc0ludmFsaWQo KToKQEAgLTQwOSw2ICs0MjIsNyBAQCBjbGFzcyBXZWJDb3JlVVJMUHJvdmlkZXI6CiAgICAgZGVm IHRvX3N0cmluZyhzZWxmKToKICAgICAgICAgcmV0dXJuIFdURlN0cmluZ1Byb3ZpZGVyKHNlbGYu dmFsb2JqLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fc3RyaW5nJyksIGRpY3QpLnRvX3N0cmlu ZygpCiAKKwogY2xhc3MgV1RGVmVjdG9yUHJvdmlkZXI6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYs IHZhbG9iaiwgaW50ZXJuYWxfZGljdCk6CiAgICAgICAgIHNlbGYudmFsb2JqID0gdmFsb2JqCkBA IC00NTIsMTEgKzQ2Niw0NCBAQCBjbGFzcyBXVEZWZWN0b3JQcm92aWRlcjoKICAgICAgICAgcmV0 dXJuIFRydWUKIAogCitjbGFzcyBXVEZIYXNoTWFwUHJvdmlkZXI6CisgICAgZGVmIF9faW5pdF9f KHNlbGYsIHZhbG9iaiwgaW50ZXJuYWxfZGljdCk6CisgICAgICAgIHNlbGYudmFsb2JqID0gdmFs b2JqCisgICAgICAgIGltcGxfcHRyID0gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJXaXRoTmFt ZSgnbV9pbXBsJykKKyAgICAgICAgc2VsZi5faGFzaF90YWJsZV9wcm92aWRlciA9IFdURkhhc2hU YWJsZVByb3ZpZGVyKGltcGxfcHRyLCBkaWN0KQorCisgICAgZGVmIHRhYmxlU2l6ZShzZWxmKToK KyAgICAgICAgcmV0dXJuIHNlbGYuX2hhc2hfdGFibGVfcHJvdmlkZXIudGFibGVTaXplKCkKKwor ICAgIGRlZiBrZXlDb3VudChzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX2hhc2hfdGFibGVf cHJvdmlkZXIua2V5Q291bnQoKQorCisKK2NsYXNzIFdURkhhc2hTZXRQcm92aWRlcjoKKyAgICBk ZWYgX19pbml0X18oc2VsZiwgdmFsb2JqLCBpbnRlcm5hbF9kaWN0KToKKyAgICAgICAgc2VsZi52 YWxvYmogPSB2YWxvYmoKKyAgICAgICAgaW1wbF9wdHIgPSBzZWxmLnZhbG9iai5HZXRDaGlsZE1l bWJlcldpdGhOYW1lKCdtX2ltcGwnKQorICAgICAgICBzZWxmLl9oYXNoX3RhYmxlX3Byb3ZpZGVy ID0gV1RGSGFzaFRhYmxlUHJvdmlkZXIoaW1wbF9wdHIsIGRpY3QpCisKKyAgICBkZWYgdGFibGVT aXplKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5faGFzaF90YWJsZV9wcm92aWRlci50YWJs ZVNpemUoKQorCisgICAgZGVmIGtleUNvdW50KHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5f aGFzaF90YWJsZV9wcm92aWRlci5rZXlDb3VudCgpCisKKwogY2xhc3MgV1RGSGFzaFRhYmxlUHJv dmlkZXI6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHZhbG9iaiwgaW50ZXJuYWxfZGljdCk6CiAg ICAgICAgIHNlbGYudmFsb2JqID0gdmFsb2JqCiAgICAgICAgIHNlbGYudXBkYXRlKCkKIAorICAg IGRlZiB0YWJsZVNpemUoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLnZhbG9iai5HZXRDaGls ZE1lbWJlcldpdGhOYW1lKCdtX3RhYmxlU2l6ZScpLkdldFZhbHVlQXNVbnNpZ25lZCgwKQorCisg ICAgZGVmIGtleUNvdW50KHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi52YWxvYmouR2V0Q2hp bGRNZW1iZXJXaXRoTmFtZSgnbV9rZXlDb3VudCcpLkdldFZhbHVlQXNVbnNpZ25lZCgwKQorCisg ICAgIyBTeW50aGV0aWMgY2hpbGRyZW4gcHJvdmlkZXIgbWV0aG9kcy4KICAgICBkZWYgbnVtX2No aWxkcmVuKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi50YWJsZVNpemUoKSArIDUKIApAQCAt NDkxLDE0ICs1MzgsOCBAQCBjbGFzcyBXVEZIYXNoVGFibGVQcm92aWRlcjoKICAgICAgICAgZWxz ZToKICAgICAgICAgICAgIHJldHVybiBOb25lCiAKLSAgICBkZWYgdGFibGVTaXplKHNlbGYpOgot ICAgICAgICByZXR1cm4gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV90YWJs ZVNpemUnKS5HZXRWYWx1ZUFzVW5zaWduZWQoMCkKLQotICAgIGRlZiBrZXlDb3VudChzZWxmKToK LSAgICAgICAgcmV0dXJuIHNlbGYudmFsb2JqLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fa2V5 Q291bnQnKS5HZXRWYWx1ZUFzVW5zaWduZWQoMCkKLQogICAgIGRlZiB1cGRhdGUoc2VsZik6Ci0g ICAgICAgIHNlbGYuZGF0YV90eXBlID0gc2VsZi52YWxvYmouR2V0VHlwZSgpLkdldFRlbXBsYXRl QXJndW1lbnRUeXBlKDApCisgICAgICAgIHNlbGYuZGF0YV90eXBlID0gc2VsZi52YWxvYmouR2V0 VHlwZSgpLkdldFRlbXBsYXRlQXJndW1lbnRUeXBlKDEpCiAgICAgICAgIHNlbGYuZGF0YV9zaXpl ID0gc2VsZi5kYXRhX3R5cGUuR2V0Qnl0ZVNpemUoKQogCiAgICAgZGVmIGhhc19jaGlsZHJlbihz ZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXRfdW5pdHRlc3QucHkgYi9U b29scy9sbGRiL2xsZGJfd2Via2l0X3VuaXR0ZXN0LnB5CmluZGV4IDI5OGI5YTQzYTA5YWFhZDEx YmYwODQzOTdhMTNiNTM5MDMwMWNhNDkuLjQ5MTNkZTc0MjQyZDM1NjkxNWQ1MjRmZmI1YjVkYTA4 NWZmZjQ1MDMgMTAwNzU1Ci0tLSBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXRfdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvbGxkYi9sbGRiX3dlYmtpdF91bml0dGVzdC5weQpAQCAtMTQzLDE2ICsxNDMs MzEgQEAgY2xhc3MgVGVzdFN1bW1hcnlQcm92aWRlcnModW5pdHRlc3QuVGVzdENhc2UpOgogCiAg ICAgZGVmIHNlcmlhbF90ZXN0X1dURlZlY3RvclByb3ZpZGVyX2VtcHR5X3ZlY3RvcihzZWxmKToK ICAgICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZpbmRWYXJpYWJsZSgnYW5FbXB0eVZl Y3RvcicpOwotICAgICAgICBzZWxmLmFzc2VydElzTm90Tm9uZSh2YXJpYWJsZSkKICAgICAgICAg c3VtbWFyeSA9IGxsZGJfd2Via2l0LldURlZlY3Rvcl9TdW1tYXJ5UHJvdmlkZXIodmFyaWFibGUs IHt9KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN1bW1hcnksICJ7IHNpemUgPSAwLCBjYXBh Y2l0eSA9IDAgfSIpCiAKICAgICBkZWYgc2VyaWFsX3Rlc3RfV1RGVmVjdG9yUHJvdmlkZXJfdmVj dG9yX3NpemVfYW5kX2NhcGFjaXR5KHNlbGYpOgogICAgICAgICB2YXJpYWJsZSA9IHNlbGYuX3Ni RnJhbWUuRmluZFZhcmlhYmxlKCdhVmVjdG9yV2l0aE9uZUl0ZW0nKTsKLSAgICAgICAgc2VsZi5h c3NlcnRJc05vdE5vbmUodmFyaWFibGUpCiAgICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtpdC5X VEZWZWN0b3JfU3VtbWFyeVByb3ZpZGVyKHZhcmlhYmxlLCB7fSkKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChzdW1tYXJ5LCAieyBzaXplID0gMSwgY2FwYWNpdHkgPSAxNiB9IikKIAorICAgICMg TUFSSzogV1RGSGFzaE1hcF9TdW1tYXJ5UHJvdmlkZXIgYW5kIFdURkhhc2hTZXRfU3VtbWFyeVBy b3ZpZGVyIHRlc3QgY2FzZXMKKworICAgIGRlZiBzZXJpYWxfdGVzdF9XVEZIYXNoTWFwX3RhYmxl c2l6ZV9hbmRfc2l6ZShzZWxmKToKKyAgICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZp bmRWYXJpYWJsZSgnaGFzaE1hcE9mSW50cycpCisgICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtp dC5XVEZIYXNoTWFwX1N1bW1hcnlQcm92aWRlcih2YXJpYWJsZSwge30pCisgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoc3VtbWFyeSwgInsgdGFibGVTaXplID0gOCwga2V5Q291bnQgPSAyIH0iKQor CisgICAgZGVmIHNlcmlhbF90ZXN0X1dURkhhc2hNYXBfb2ZfdmVjdG9yc190YWJsZXNpemVfYW5k X3NpemUoc2VsZik6CisgICAgICAgIHZhcmlhYmxlID0gc2VsZi5fc2JGcmFtZS5GaW5kVmFyaWFi bGUoJ2hhc2hNYXBPZlZlY3RvcnMnKQorICAgICAgICBzdW1tYXJ5ID0gbGxkYl93ZWJraXQuV1RG SGFzaE1hcF9TdW1tYXJ5UHJvdmlkZXIodmFyaWFibGUsIHt9KQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHN1bW1hcnksICJ7IHRhYmxlU2l6ZSA9IDgsIGtleUNvdW50ID0gMSB9IikKKworICAg IGRlZiBzZXJpYWxfdGVzdF9XVEZIYXNoU2V0X3RhYmxlc2l6ZV9hbmRfc2l6ZShzZWxmKToKKyAg ICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZpbmRWYXJpYWJsZSgnaGFzaFNldE9mSW50 cycpCisgICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtpdC5XVEZIYXNoU2V0X1N1bW1hcnlQcm92 aWRlcih2YXJpYWJsZSwge30pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3VtbWFyeSwgInsg dGFibGVTaXplID0gOCwga2V5Q291bnQgPSAxIH0iKQorCiAgICAgIyBNQVJLOiBXZWJDb3JlQ29s b3JfU3VtbWFyeVByb3ZpZGVyIHRlc3QgY2FzZXMKIAogICAgIGRlZiBzZXJpYWxfdGVzdF9XZWJD b3JlQ29sb3JQcm92aWRlcl9pbnZhbGlkX2NvbG9yKHNlbGYpOgo= 345527 2018-07-21 18:37:39 -0700 2018-07-21 21:11:32 -0700 Patch bug-187883-20180721183738.patch text/plain 11062 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MDg1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzU1OWI2ZmJjMjdhNDViNDM4NzQzMWFlYTFkYjgyNDNm MjdkMmMzYi4uYzM0YTk1MzYwNWYyYmY1MmMyNjY0OGNlNzc3ODk3NDAwY2IwNDkzNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUy IEBACisyMDE4LTA3LTIxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEZpeCBsbGRiIHN1bW1hcml6ZXJzIGZvciBIYXNoTWFwcyBhbmQgSGFzaFNldHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Nzg4Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAg SGFzaE1hcCBhbmQgSGFzaFNldCBzdW1tYXJpemVycyB3ZXJlIGJyb2tlbiBpbiB2YXJpb3VzIHdh eXMuCisgICAgICAgIAorICAgICAgICBUaGUgJ3R5cGUgc3VtbWFyeSBhZGQgLXgnIHJlZ2V4cCBu ZWVkcyB0byBtYXRjaCBhdCB0aGUgc3RhcnQgYW5kIGVuZCBvZiB0aGUgc3RyaW5nCisgICAgICAg IHRvIGF2b2lkIGZpbmRpbmcgdHlwZXMgbmVzdGVkIGluc2lkZSBvdGhlciB0ZW1wbGF0ZXMuCisg ICAgICAgIAorICAgICAgICBUaGUgSGFzaFRhYmxlIHN5bnRoZXRpYyBjaGlsZCBjb2RlIGluY29y cmVjdGx5IHVzZWQgdGhlIHR5cGUgb2YgdGhlIGtleSwgcmF0aGVyIHRoYW4KKyAgICAgICAgdGhl IHZhbHVlIHdoZW4gc3ludGhlc2l6aW5nIGNoaWxkcmVuLgorICAgICAgICAKKyAgICAgICAgQWRk IEhhc2hNYXAgYW5kIEhhc2hTZXQgc3VtbWFyaXplcnMuCisKKyAgICAgICAgSSB0cmllZCB0byBn ZXQgc3ludGhldGljIGNoaWxkcmVuIHdvcmtpbmcgZGlyZWN0bHkgZm9yIEhhc2hNYXAgYW5kIEhh c2hTZXQsIGJ1dCB3YXMgdW5hYmxlLgorCisgICAgICAgICogbGxkYi9sbGRiV2ViS2l0VGVzdGVy L21haW4uY3BwOgorICAgICAgICAodGVzdFN1bW1hcnlQcm92aWRlcnMpOgorICAgICAgICAqIGxs ZGIvbGxkYl93ZWJraXQucHk6CisgICAgICAgIChfX2xsZGJfaW5pdF9tb2R1bGUpOgorICAgICAg ICAoX19sbGRiX2luaXRfbW9kdWxlLmxsZGJfd2Via2l0KToKKyAgICAgICAgKFdURkhhc2hNYXBf U3VtbWFyeVByb3ZpZGVyKToKKyAgICAgICAgKFdURkhhc2hTZXRfU3VtbWFyeVByb3ZpZGVyKToK KyAgICAgICAgKFdlYkNvcmVDb2xvclByb3ZpZGVyLl90b19zdHJpbmdfZXh0ZW5kZWQpOgorICAg ICAgICAoV2ViQ29yZVVSTFByb3ZpZGVyLnRvX3N0cmluZyk6CisgICAgICAgIChXVEZIYXNoTWFw UHJvdmlkZXIpOgorICAgICAgICAoV1RGSGFzaE1hcFByb3ZpZGVyLl9faW5pdF9fKToKKyAgICAg ICAgKFdURkhhc2hNYXBQcm92aWRlci50YWJsZVNpemUpOgorICAgICAgICAoV1RGSGFzaE1hcFBy b3ZpZGVyLmtleUNvdW50KToKKyAgICAgICAgKFdURkhhc2hTZXRQcm92aWRlcik6CisgICAgICAg IChXVEZIYXNoU2V0UHJvdmlkZXIuX19pbml0X18pOgorICAgICAgICAoV1RGSGFzaFNldFByb3Zp ZGVyLnRhYmxlU2l6ZSk6CisgICAgICAgIChXVEZIYXNoU2V0UHJvdmlkZXIua2V5Q291bnQpOgor ICAgICAgICAoV1RGSGFzaFRhYmxlUHJvdmlkZXIudGFibGVTaXplKToKKyAgICAgICAgKFdURkhh c2hUYWJsZVByb3ZpZGVyKToKKyAgICAgICAgKFdURkhhc2hUYWJsZVByb3ZpZGVyLmtleUNvdW50 KToKKyAgICAgICAgKFdURkhhc2hUYWJsZVByb3ZpZGVyLmdldF9jaGlsZF9hdF9pbmRleCk6Cisg ICAgICAgIChXVEZIYXNoVGFibGVQcm92aWRlci51cGRhdGUpOgorICAgICAgICAqIGxsZGIvbGxk Yl93ZWJraXRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0U3VtbWFyeVByb3ZpZGVycy5zZXJp YWxfdGVzdF9XVEZWZWN0b3JQcm92aWRlcl9lbXB0eV92ZWN0b3IpOgorICAgICAgICAoVGVzdFN1 bW1hcnlQcm92aWRlcnMuc2VyaWFsX3Rlc3RfV1RGVmVjdG9yUHJvdmlkZXJfdmVjdG9yX3NpemVf YW5kX2NhcGFjaXR5KToKKyAgICAgICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJzKToKKyAgICAgICAg KFRlc3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90ZXN0X1dURkhhc2hNYXBfdGFibGVzaXplX2Fu ZF9zaXplKToKKyAgICAgICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90ZXN0X1dURkhh c2hNYXBfb2ZfdmVjdG9yc190YWJsZXNpemVfYW5kX3NpemUpOgorICAgICAgICAoVGVzdFN1bW1h cnlQcm92aWRlcnMuc2VyaWFsX3Rlc3RfV1RGSGFzaFNldF90YWJsZXNpemVfYW5kX3NpemUpOgor CiAyMDE4LTA3LTIwICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgogCiAgICAg ICAgIFJlc291cmNlIExvYWQgU3RhdGlzdGljczogRW5hYmxlIGJhc2ljIGZ1bmN0aW9uYWxpdHkg aW4gZXhwZXJpbWVudGFsIGRlYnVnIG1vZGUKZGlmZiAtLWdpdCBhL1Rvb2xzL2xsZGIvbGxkYldl YktpdFRlc3Rlci9tYWluLmNwcCBiL1Rvb2xzL2xsZGIvbGxkYldlYktpdFRlc3Rlci9tYWluLmNw cAppbmRleCA5YzcyNDQxYWRkYmNkYjkxN2IzMzFlMDA2ZjQwMDMxN2JmZWYxYjMxLi4yY2U4ZDYx MDZlMDhjZWQ5YWE3YWFmYTJkYjc0NjgwZDcyOGI4MmRhIDEwMDY0NAotLS0gYS9Ub29scy9sbGRi L2xsZGJXZWJLaXRUZXN0ZXIvbWFpbi5jcHAKKysrIGIvVG9vbHMvbGxkYi9sbGRiV2ViS2l0VGVz dGVyL21haW4uY3BwCkBAIC0yNSw2ICsyNSw5IEBACiAKICNpbmNsdWRlICJEdW1wQ2xhc3NMYXlv dXRUZXN0aW5nLmgiCiAjaW5jbHVkZSA8c3RkaW8uaD4KKyNpbmNsdWRlIDx3dGYvSGFzaE1hcC5o PgorI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CisjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2lu Y2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZT dHJpbmcuaD4KIApAQCAtNTUsMTIgKzU4LDIxIEBAIHN0YXRpYyB2b2lkIHRlc3RTdW1tYXJ5UHJv dmlkZXJzKCkKICAgICBTdHJpbmcgYTE2Qml0U3RyaW5nID0gdXRmMTZTdHJpbmcodSJcdTE2ODBD YXBwdWNjaW5vXHUxNjgwIik7CiAgICAgU3RyaW5nSW1wbCogYTE2Qml0U3RyaW5nSW1wbCA9IGEx NkJpdFN0cmluZy5pbXBsKCk7CiAKLQogICAgIFZlY3RvcjxpbnQ+IGFuRW1wdHlWZWN0b3I7CiAg ICAgVmVjdG9yPGludD4gYVZlY3RvcldpdGhPbmVJdGVtOwogICAgIGFWZWN0b3JXaXRoT25lSXRl bS5yZXNlcnZlQ2FwYWNpdHkoMTYpOwogICAgIGFWZWN0b3JXaXRoT25lSXRlbS5hcHBlbmQoMSk7 CiAKKyAgICBIYXNoTWFwPHVuc2lnbmVkLCBpbnQ+IGhhc2hNYXBPZkludHM7CisgICAgaGFzaE1h cE9mSW50cy5hZGQoMTIsIDIzKTsKKyAgICBoYXNoTWFwT2ZJbnRzLmFkZCgzNCwgNDUpOworCisg ICAgSGFzaFNldDx1bnNpZ25lZD4gaGFzaFNldE9mSW50czsKKyAgICBoYXNoU2V0T2ZJbnRzLmFk ZCg0Mik7CisKKyAgICBIYXNoTWFwPHVuc2lnbmVkLCBWZWN0b3I8aW50Pj4gaGFzaE1hcE9mVmVj dG9yczsKKyAgICBoYXNoTWFwT2ZWZWN0b3JzLmFkZCgxLCBWZWN0b3I8aW50Pih7MiwgM30pKTsK KwogICAgIGJyZWFrRm9yVGVzdGluZ1N1bW1hcnlQcm92aWRlcnMoKTsKIH0KIApkaWZmIC0tZ2l0 IGEvVG9vbHMvbGxkYi9sbGRiX3dlYmtpdC5weSBiL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkK aW5kZXggYmZjMDE0ZTA4ZWY1ZGYzOGM3YjYzZmJkOTk1MDJkODRjZmMyNjI5OS4uNWVkZDNjNWM4 Y2NkYzBmZjFiMmZhYjEwYmZhYzA4OWY0MjQ5YzY3OCAxMDA2NDQKLS0tIGEvVG9vbHMvbGxkYi9s bGRiX3dlYmtpdC5weQorKysgYi9Ub29scy9sbGRiL2xsZGJfd2Via2l0LnB5CkBAIC0zOSwxNiAr MzksMTkgQEAgZGVmIF9fbGxkYl9pbml0X21vZHVsZShkZWJ1Z2dlciwgZGljdCk6CiAgICAgZGVi dWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtLWV4cGFuZCAtRiBsbGRiX3dl YmtpdC5XVEZTdHJpbmdJbXBsX1N1bW1hcnlQcm92aWRlciBXVEY6OlN0cmluZ0ltcGwnKQogICAg IGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBhZGQgLS1leHBhbmQgLUYgbGxk Yl93ZWJraXQuV1RGU3RyaW5nVmlld19TdW1tYXJ5UHJvdmlkZXIgV1RGOjpTdHJpbmdWaWV3JykK ICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1G IGxsZGJfd2Via2l0LldURkF0b21pY1N0cmluZ19TdW1tYXJ5UHJvdmlkZXIgV1RGOjpBdG9taWNT dHJpbmcnKQotICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBhZGQgLS1l eHBhbmQgLUYgbGxkYl93ZWJraXQuV1RGVmVjdG9yX1N1bW1hcnlQcm92aWRlciAteCAiV1RGOjpW ZWN0b3I8Lis+JCInKQotICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBh ZGQgLS1leHBhbmQgLUYgbGxkYl93ZWJraXQuV1RGSGFzaFRhYmxlX1N1bW1hcnlQcm92aWRlciAt eCAiV1RGOjpIYXNoVGFibGU8Lis+JCInKQorICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5 cGUgc3VtbWFyeSBhZGQgLS1leHBhbmQgLUYgbGxkYl93ZWJraXQuV1RGVmVjdG9yX1N1bW1hcnlQ cm92aWRlciAteCAiXldURjo6VmVjdG9yPC4rPiQiJykKKyAgICBkZWJ1Z2dlci5IYW5kbGVDb21t YW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldURkhhc2hUYWJs ZV9TdW1tYXJ5UHJvdmlkZXIgLXggIl5XVEY6Okhhc2hUYWJsZTwuKz4kIicpCisgICAgZGVidWdn ZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtLWV4cGFuZCAtRiBsbGRiX3dlYmtp dC5XVEZIYXNoTWFwX1N1bW1hcnlQcm92aWRlciAteCAiXldURjo6SGFzaE1hcDwuKz4kIicpCisg ICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtLWV4cGFuZCAtRiBs bGRiX3dlYmtpdC5XVEZIYXNoU2V0X1N1bW1hcnlQcm92aWRlciAteCAiXldURjo6SGFzaFNldDwu Kz4kIicpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtLWV4 cGFuZCAtRiBsbGRiX3dlYmtpdC5XVEZNZWRpYVRpbWVfU3VtbWFyeVByb3ZpZGVyIFdURjo6TWVk aWFUaW1lJykKLSAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN5bnRoZXRpYyBhZGQg LXggIldURjo6VmVjdG9yPC4rPiQiIC0tcHl0aG9uLWNsYXNzIGxsZGJfd2Via2l0LldURlZlY3Rv clByb3ZpZGVyJykKLSAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN5bnRoZXRpYyBh ZGQgLXggIldURjo6SGFzaFRhYmxlPC4rPiQiIC0tcHl0aG9uLWNsYXNzIGxsZGJfd2Via2l0LldU Rkhhc2hUYWJsZVByb3ZpZGVyJykKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1 bW1hcnkgYWRkIC1GIGxsZGJfd2Via2l0LldlYkNvcmVDb2xvcl9TdW1tYXJ5UHJvdmlkZXIgV2Vi Q29yZTo6Q29sb3InKQogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBh ZGQgLUYgbGxkYl93ZWJraXQuV2ViQ29yZUxheW91dFVuaXRfU3VtbWFyeVByb3ZpZGVyIFdlYkNv cmU6OkxheW91dFVuaXQnKQogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFy eSBhZGQgLUYgbGxkYl93ZWJraXQuV2ViQ29yZUxheW91dFNpemVfU3VtbWFyeVByb3ZpZGVyIFdl YkNvcmU6OkxheW91dFNpemUnKQogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3Vt bWFyeSBhZGQgLUYgbGxkYl93ZWJraXQuV2ViQ29yZUxheW91dFBvaW50X1N1bW1hcnlQcm92aWRl ciBXZWJDb3JlOjpMYXlvdXRQb2ludCcpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlw ZSBzdW1tYXJ5IGFkZCAtRiBsbGRiX3dlYmtpdC5XZWJDb3JlVVJMX1N1bW1hcnlQcm92aWRlciBX ZWJDb3JlOjpVUkwnKQorICAgICMgc3ludGhldGljIHR5cGVzIChzZWUgPGh0dHBzOi8vbGxkYi5s bHZtLm9yZy92YXJmb3JtYXRzLmh0bWw+KQorICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5 cGUgc3ludGhldGljIGFkZCAteCAiXldURjo6VmVjdG9yPC4rPiQiIC0tcHl0aG9uLWNsYXNzIGxs ZGJfd2Via2l0LldURlZlY3RvclByb3ZpZGVyJykKKyAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5k KCd0eXBlIHN5bnRoZXRpYyBhZGQgLXggIl5XVEY6Okhhc2hUYWJsZTwuKz4kIiAtLXB5dGhvbi1j bGFzcyBsbGRiX3dlYmtpdC5XVEZIYXNoVGFibGVQcm92aWRlcicpCiAKIAogZGVmIFdURlN0cmlu Z19TdW1tYXJ5UHJvdmlkZXIodmFsb2JqLCBkaWN0KToKQEAgLTgyLDYgKzg1LDE2IEBAIGRlZiBX VEZIYXNoVGFibGVfU3VtbWFyeVByb3ZpZGVyKHZhbG9iaiwgZGljdCk6CiAgICAgcmV0dXJuICJ7 IHRhYmxlU2l6ZSA9ICVkLCBrZXlDb3VudCA9ICVkIH0iICUgKHByb3ZpZGVyLnRhYmxlU2l6ZSgp LCBwcm92aWRlci5rZXlDb3VudCgpKQogCiAKK2RlZiBXVEZIYXNoTWFwX1N1bW1hcnlQcm92aWRl cih2YWxvYmosIGRpY3QpOgorICAgIHByb3ZpZGVyID0gV1RGSGFzaE1hcFByb3ZpZGVyKHZhbG9i aiwgZGljdCkKKyAgICByZXR1cm4gInsgdGFibGVTaXplID0gJWQsIGtleUNvdW50ID0gJWQgfSIg JSAocHJvdmlkZXIudGFibGVTaXplKCksIHByb3ZpZGVyLmtleUNvdW50KCkpCisKKworZGVmIFdU Rkhhc2hTZXRfU3VtbWFyeVByb3ZpZGVyKHZhbG9iaiwgZGljdCk6CisgICAgcHJvdmlkZXIgPSBX VEZIYXNoU2V0UHJvdmlkZXIodmFsb2JqLCBkaWN0KQorICAgIHJldHVybiAieyB0YWJsZVNpemUg PSAlZCwga2V5Q291bnQgPSAlZCB9IiAlIChwcm92aWRlci50YWJsZVNpemUoKSwgcHJvdmlkZXIu a2V5Q291bnQoKSkKKworCiBkZWYgV1RGTWVkaWFUaW1lX1N1bW1hcnlQcm92aWRlcih2YWxvYmos IGRpY3QpOgogICAgIHByb3ZpZGVyID0gV1RGTWVkaWFUaW1lUHJvdmlkZXIodmFsb2JqLCBkaWN0 KQogICAgIGlmIHByb3ZpZGVyLmlzSW52YWxpZCgpOgpAQCAtNDA5LDYgKzQyMiw3IEBAIGNsYXNz IFdlYkNvcmVVUkxQcm92aWRlcjoKICAgICBkZWYgdG9fc3RyaW5nKHNlbGYpOgogICAgICAgICBy ZXR1cm4gV1RGU3RyaW5nUHJvdmlkZXIoc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJXaXRoTmFt ZSgnbV9zdHJpbmcnKSwgZGljdCkudG9fc3RyaW5nKCkKIAorCiBjbGFzcyBXVEZWZWN0b3JQcm92 aWRlcjoKICAgICBkZWYgX19pbml0X18oc2VsZiwgdmFsb2JqLCBpbnRlcm5hbF9kaWN0KToKICAg ICAgICAgc2VsZi52YWxvYmogPSB2YWxvYmoKQEAgLTQ1MiwxMSArNDY2LDQ0IEBAIGNsYXNzIFdU RlZlY3RvclByb3ZpZGVyOgogICAgICAgICByZXR1cm4gVHJ1ZQogCiAKK2NsYXNzIFdURkhhc2hN YXBQcm92aWRlcjoKKyAgICBkZWYgX19pbml0X18oc2VsZiwgdmFsb2JqLCBpbnRlcm5hbF9kaWN0 KToKKyAgICAgICAgc2VsZi52YWxvYmogPSB2YWxvYmoKKyAgICAgICAgaW1wbF9wdHIgPSBzZWxm LnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX2ltcGwnKQorICAgICAgICBzZWxmLl9o YXNoX3RhYmxlX3Byb3ZpZGVyID0gV1RGSGFzaFRhYmxlUHJvdmlkZXIoaW1wbF9wdHIsIGRpY3Qp CisKKyAgICBkZWYgdGFibGVTaXplKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5faGFzaF90 YWJsZV9wcm92aWRlci50YWJsZVNpemUoKQorCisgICAgZGVmIGtleUNvdW50KHNlbGYpOgorICAg ICAgICByZXR1cm4gc2VsZi5faGFzaF90YWJsZV9wcm92aWRlci5rZXlDb3VudCgpCisKKworY2xh c3MgV1RGSGFzaFNldFByb3ZpZGVyOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCB2YWxvYmosIGlu dGVybmFsX2RpY3QpOgorICAgICAgICBzZWxmLnZhbG9iaiA9IHZhbG9iagorICAgICAgICBpbXBs X3B0ciA9IHNlbGYudmFsb2JqLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21faW1wbCcpCisgICAg ICAgIHNlbGYuX2hhc2hfdGFibGVfcHJvdmlkZXIgPSBXVEZIYXNoVGFibGVQcm92aWRlcihpbXBs X3B0ciwgZGljdCkKKworICAgIGRlZiB0YWJsZVNpemUoc2VsZik6CisgICAgICAgIHJldHVybiBz ZWxmLl9oYXNoX3RhYmxlX3Byb3ZpZGVyLnRhYmxlU2l6ZSgpCisKKyAgICBkZWYga2V5Q291bnQo c2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9oYXNoX3RhYmxlX3Byb3ZpZGVyLmtleUNvdW50 KCkKKworCiBjbGFzcyBXVEZIYXNoVGFibGVQcm92aWRlcjoKICAgICBkZWYgX19pbml0X18oc2Vs ZiwgdmFsb2JqLCBpbnRlcm5hbF9kaWN0KToKICAgICAgICAgc2VsZi52YWxvYmogPSB2YWxvYmoK ICAgICAgICAgc2VsZi51cGRhdGUoKQogCisgICAgZGVmIHRhYmxlU2l6ZShzZWxmKToKKyAgICAg ICAgcmV0dXJuIHNlbGYudmFsb2JqLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fdGFibGVTaXpl JykuR2V0VmFsdWVBc1Vuc2lnbmVkKDApCisKKyAgICBkZWYga2V5Q291bnQoc2VsZik6CisgICAg ICAgIHJldHVybiBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX2tleUNvdW50 JykuR2V0VmFsdWVBc1Vuc2lnbmVkKDApCisKKyAgICAjIFN5bnRoZXRpYyBjaGlsZHJlbiBwcm92 aWRlciBtZXRob2RzLgogICAgIGRlZiBudW1fY2hpbGRyZW4oc2VsZik6CiAgICAgICAgIHJldHVy biBzZWxmLnRhYmxlU2l6ZSgpICsgNQogCkBAIC00OTEsMTQgKzUzOCw4IEBAIGNsYXNzIFdURkhh c2hUYWJsZVByb3ZpZGVyOgogICAgICAgICBlbHNlOgogICAgICAgICAgICAgcmV0dXJuIE5vbmUK IAotICAgIGRlZiB0YWJsZVNpemUoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLnZhbG9iai5H ZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX3RhYmxlU2l6ZScpLkdldFZhbHVlQXNVbnNpZ25lZCgw KQotCi0gICAgZGVmIGtleUNvdW50KHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi52YWxvYmou R2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9rZXlDb3VudCcpLkdldFZhbHVlQXNVbnNpZ25lZCgw KQotCiAgICAgZGVmIHVwZGF0ZShzZWxmKToKLSAgICAgICAgc2VsZi5kYXRhX3R5cGUgPSBzZWxm LnZhbG9iai5HZXRUeXBlKCkuR2V0VGVtcGxhdGVBcmd1bWVudFR5cGUoMCkKKyAgICAgICAgc2Vs Zi5kYXRhX3R5cGUgPSBzZWxmLnZhbG9iai5HZXRUeXBlKCkuR2V0VGVtcGxhdGVBcmd1bWVudFR5 cGUoMSkKICAgICAgICAgc2VsZi5kYXRhX3NpemUgPSBzZWxmLmRhdGFfdHlwZS5HZXRCeXRlU2l6 ZSgpCiAKICAgICBkZWYgaGFzX2NoaWxkcmVuKHNlbGYpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvbGxk Yi9sbGRiX3dlYmtpdF91bml0dGVzdC5weSBiL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXRfdW5pdHRl c3QucHkKaW5kZXggOTUzMDIwZjFjZmFhM2RmY2FhNDQzNmM4NGFmY2I3MzJlNmVkMDdlZi4uODY1 Yzk3YWY1N2JmNzUwMjZhNGQ3N2MyZWI0NTE1ZjBkZjFhYTQzYSAxMDA3NTUKLS0tIGEvVG9vbHMv bGxkYi9sbGRiX3dlYmtpdF91bml0dGVzdC5weQorKysgYi9Ub29scy9sbGRiL2xsZGJfd2Via2l0 X3VuaXR0ZXN0LnB5CkBAIC0xNDMsMTIgKzE0MywyNyBAQCBjbGFzcyBUZXN0U3VtbWFyeVByb3Zp ZGVycyh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICBkZWYgc2VyaWFsX3Rlc3RfV1RGVmVjdG9y UHJvdmlkZXJfZW1wdHlfdmVjdG9yKHNlbGYpOgogICAgICAgICB2YXJpYWJsZSA9IHNlbGYuX3Ni RnJhbWUuRmluZFZhcmlhYmxlKCdhbkVtcHR5VmVjdG9yJyk7Ci0gICAgICAgIHNlbGYuYXNzZXJ0 SXNOb3ROb25lKHZhcmlhYmxlKQogICAgICAgICBzdW1tYXJ5ID0gbGxkYl93ZWJraXQuV1RGVmVj dG9yX1N1bW1hcnlQcm92aWRlcih2YXJpYWJsZSwge30pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoc3VtbWFyeSwgInsgc2l6ZSA9IDAsIGNhcGFjaXR5ID0gMCB9IikKIAogICAgIGRlZiBzZXJp YWxfdGVzdF9XVEZWZWN0b3JQcm92aWRlcl92ZWN0b3Jfc2l6ZV9hbmRfY2FwYWNpdHkoc2VsZik6 CiAgICAgICAgIHZhcmlhYmxlID0gc2VsZi5fc2JGcmFtZS5GaW5kVmFyaWFibGUoJ2FWZWN0b3JX aXRoT25lSXRlbScpOwotICAgICAgICBzZWxmLmFzc2VydElzTm90Tm9uZSh2YXJpYWJsZSkKICAg ICAgICAgc3VtbWFyeSA9IGxsZGJfd2Via2l0LldURlZlY3Rvcl9TdW1tYXJ5UHJvdmlkZXIodmFy aWFibGUsIHt9KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN1bW1hcnksICJ7IHNpemUgPSAx LCBjYXBhY2l0eSA9IDE2IH0iKQorCisgICAgIyBNQVJLOiBXVEZIYXNoTWFwX1N1bW1hcnlQcm92 aWRlciBhbmQgV1RGSGFzaFNldF9TdW1tYXJ5UHJvdmlkZXIgdGVzdCBjYXNlcworCisgICAgZGVm IHNlcmlhbF90ZXN0X1dURkhhc2hNYXBfdGFibGVzaXplX2FuZF9zaXplKHNlbGYpOgorICAgICAg ICB2YXJpYWJsZSA9IHNlbGYuX3NiRnJhbWUuRmluZFZhcmlhYmxlKCdoYXNoTWFwT2ZJbnRzJykK KyAgICAgICAgc3VtbWFyeSA9IGxsZGJfd2Via2l0LldURkhhc2hNYXBfU3VtbWFyeVByb3ZpZGVy KHZhcmlhYmxlLCB7fSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdW1tYXJ5LCAieyB0YWJs ZVNpemUgPSA4LCBrZXlDb3VudCA9IDIgfSIpCisKKyAgICBkZWYgc2VyaWFsX3Rlc3RfV1RGSGFz aE1hcF9vZl92ZWN0b3JzX3RhYmxlc2l6ZV9hbmRfc2l6ZShzZWxmKToKKyAgICAgICAgdmFyaWFi bGUgPSBzZWxmLl9zYkZyYW1lLkZpbmRWYXJpYWJsZSgnaGFzaE1hcE9mVmVjdG9ycycpCisgICAg ICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtpdC5XVEZIYXNoTWFwX1N1bW1hcnlQcm92aWRlcih2YXJp YWJsZSwge30pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3VtbWFyeSwgInsgdGFibGVTaXpl ID0gOCwga2V5Q291bnQgPSAxIH0iKQorCisgICAgZGVmIHNlcmlhbF90ZXN0X1dURkhhc2hTZXRf dGFibGVzaXplX2FuZF9zaXplKHNlbGYpOgorICAgICAgICB2YXJpYWJsZSA9IHNlbGYuX3NiRnJh bWUuRmluZFZhcmlhYmxlKCdoYXNoU2V0T2ZJbnRzJykKKyAgICAgICAgc3VtbWFyeSA9IGxsZGJf d2Via2l0LldURkhhc2hTZXRfU3VtbWFyeVByb3ZpZGVyKHZhcmlhYmxlLCB7fSkKKyAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChzdW1tYXJ5LCAieyB0YWJsZVNpemUgPSA4LCBrZXlDb3VudCA9IDEg fSIpCg==