130623 2014-03-21 16:12:16 -0700 Remove duplicate line added during merging 2014-03-25 14:57:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bburg bdakin commit-queue japhet simon.fraser oldest_to_newest 993364 0 simon.fraser 2014-03-21 16:12:16 -0700 Remove duplicate line added during merging 993367 1 227507 simon.fraser 2014-03-21 16:13:47 -0700 Created attachment 227507 Patch 993433 2 227529 bburg 2014-03-21 20:34:58 -0700 Created attachment 227529 the patch 993438 3 227529 bburg 2014-03-21 20:44:30 -0700 Comment on attachment 227529 the patch dyslexia fridays, sorry guys 993512 4 227507 simon.fraser 2014-03-22 10:53:54 -0700 Comment on attachment 227507 Patch Restoring Beth review. 993513 5 simon.fraser 2014-03-22 10:54:00 -0700 http://trac.webkit.org/changeset/166116 994345 6 bburg 2014-03-25 14:44:49 -0700 Reopening to attach new patch. 994346 7 227801 bburg 2014-03-25 14:44:51 -0700 Created attachment 227801 patch.3 994354 8 227801 simon.fraser 2014-03-25 14:53:51 -0700 Comment on attachment 227801 patch.3 Wrong bug, sorry! 227507 2014-03-21 16:13:47 -0700 2014-03-25 14:44:45 -0700 Patch bug-130623-20140321161306.patch text/plain 1378 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZWFlOGUwYTg1 MjQzOWI4OGZkNjQ0ZjI0M2U2ZGJiOTM2NjQ3NzA4MC4uZmY5NGI5NmVjMDg5MmM3YzRmYWJhMWJi N2Q0NmEzMzM1YzI1NmM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0 LTAzLTIxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAg IFJlbW92ZSBkdXBsaWNhdGUgbGluZSBhZGRlZCBkdXJpbmcgbWVyZ2luZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNjIzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBSZW1vdmUgYSBkdXBs aWNhdGUgY2FsbCB0byAtX3ZpZXdXaWxsRHJhd0ludGVybmFsIHdoaWNoCisgICAgICAgIHdhcyBh ZGRlZCBkdXJpbmcgbWVyZ2VzLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAg ICAgICAoTGF5ZXJGbHVzaENvbnRyb2xsZXI6OmZsdXNoTGF5ZXJzKToKKwogMjAxNC0wMy0yMSAg RGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wcm92ZSBpZGlvbSB1 c2VkIGZvciBzdHJpbmcgYnVpbGRpbmcgaW4gYSBmZXcgcGxhY2VzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlZpZXcubW0KaW5kZXggNWMwY2NhOTE4Yjk1MTJhOWIxZmZhNWFlZjk1ODUyMzE5MDVh ODY1My4uMTE0YmM5MWJmOGNmMzBlZWJlMDNlZTMxZmEyNmNhODc0MTcxYmQ2YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtODQwMSw4ICs4NDAxLDYgQEAgYm9vbCBMYXll ckZsdXNoQ29udHJvbGxlcjo6Zmx1c2hMYXllcnMoKQogCiAgICAgW21fd2ViVmlldyBfdmlld1dp bGxEcmF3SW50ZXJuYWxdOwogCi0gICAgW21fd2ViVmlldyBfdmlld1dpbGxEcmF3SW50ZXJuYWxd OwotCiAgICAgaWYgKFttX3dlYlZpZXcgX2ZsdXNoQ29tcG9zaXRpbmdDaGFuZ2VzXSkgewogI2lm ICFQTEFURk9STShJT1MpCiAgICAgICAgIC8vIEFwcEtpdCBtYXkgaGF2ZSBkaXNhYmxlZCBzY3Jl ZW4gdXBkYXRlcywgdGhpbmtpbmcgYW4gdXBjb21pbmcgd2luZG93IGZsdXNoIHdpbGwgcmUtZW5h YmxlIHRoZW0uCg== 227529 2014-03-21 20:34:58 -0700 2014-03-21 20:49:35 -0700 the patch bug-130623-20140321203438.patch text/plain 4061 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWVhNWEzMjY1ZDM2Y2E5 MDVmOWMzM2RmZDRmMDNlZDMwMDA1ODljNC4uMjBiZmI4ZWQ5OWQ4YjA2MjMyZjVkZTU0ZDY4NDRk ZjZlYmU4MDYwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE0LTAzLTIxICBCcmlh biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCisgICAgICAgIFdlYiBSZXBsYXk6IHJlc291cmNl IHVuaXF1ZSBpZGVudGlmaWVycyBzaG91bGQgYmUgdW5pcXVlLXBlci1mcmFtZSwgbm90IGdsb2Jh bGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA2 MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3Ig cmVwbGF5IHB1cnBvc2VzLCB3ZSB3YW50IHRvIGRldGVybWluaXN0aWNhbGx5IGFzc2lnbiByZXNv dXJjZSBsb2FkIGlkZW50aWZpZXJzCisgICAgICAgIHRvIHJlc291cmNlIGxvYWRlcnMsIHByb3Zp ZGVkIHRoYXQgdGhlIHJlc291cmNlIGxvYWRlcnMgYXJlIGNyZWF0ZWQgaW4gdGhlIHNhbWUKKyAg ICAgICAgb3JkZXIuCisKKyAgICAgICAgVG8gZG8gdGhpcywgd2UgY29udmVydCB1bmlxdWUgaWRl bnRpZmllcnMgZnJvbSBiZWluZyBnbG9iYWxseS11bmlxdWUgdG8gYmVpbmcKKyAgICAgICAgZnJh bWUtdW5pcXVlLiBXaGVuIGEgbmV3IGZyYW1lIGlzIGJlaW5nIGxvYWRlZCwgdW5pcXVlIGlkZW50 aWZpZXJzIGZvcgorICAgICAgICBzdWJyZXNvdXJjZXMgb2YgdGhhdCBmcmFtZSBiZWdpbiBjb3Vu dGluZyBmcm9tIDEuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBJZGVudGlmaWVyIGludmFyaWFu dHMgYXJlIGV4ZXJjaXNlZCBieSBleGlzdGluZyBhc3NlcnRpb25zIGFuZCB0ZXN0cy4KKworICAg ICAgICAqIGxvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UHJv Z3Jlc3NUcmFja2VyOjpQcm9ncmVzc1RyYWNrZXIpOgorICAgICAgICAoV2ViQ29yZTo6UHJvZ3Jl c3NUcmFja2VyOjpyZXNldCk6CisgICAgICAgIChXZWJDb3JlOjpQcm9ncmVzc1RyYWNrZXI6OmNy ZWF0ZVVuaXF1ZUlkZW50aWZpZXIpOgorICAgICAgICAqIGxvYWRlci9Qcm9ncmVzc1RyYWNrZXIu aDoKKworMjAxNC0wMy0yMSAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwogICAgICAg ICBXZWIgUmVwbGF5OiBjYXB0dXJlIGFuZCByZXBsYXkga2V5Ym9hcmQgZXZlbnRzCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAzMTQKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcAppbmRleCAzMzM4NTA2NmJlNmMzNDMz ZDU2ZTRjOTA1MjExZjg2YWFjYTQzZjVmLi5iZDlmYjM5ZGJkZGUxMGRjOGU1N2QzZTY3NTdjNmZm OGEzMzJlMGY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFj a2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcApA QCAtNzMsOCArNzMsNiBAQCBwdWJsaWM6CiAgICAgbG9uZyBsb25nIGVzdGltYXRlZExlbmd0aDsK IH07CiAKLXVuc2lnbmVkIGxvbmcgUHJvZ3Jlc3NUcmFja2VyOjpzX3VuaXF1ZUlkZW50aWZpZXIg PSAwOwotCiBQcm9ncmVzc1RyYWNrZXI6OlByb2dyZXNzVHJhY2tlcihQcm9ncmVzc1RyYWNrZXJD bGllbnQmIGNsaWVudCkKICAgICA6IG1fY2xpZW50KGNsaWVudCkKICAgICAsIG1fdG90YWxQYWdl QW5kUmVzb3VyY2VCeXRlc1RvTG9hZCgwKQpAQCAtODQsNiArODIsNyBAQCBQcm9ncmVzc1RyYWNr ZXI6OlByb2dyZXNzVHJhY2tlcihQcm9ncmVzc1RyYWNrZXJDbGllbnQmIGNsaWVudCkKICAgICAs IG1fcHJvZ3Jlc3NOb3RpZmljYXRpb25UaW1lSW50ZXJ2YWwoc3RkOjpjaHJvbm86Om1pbGxpc2Vj b25kcygxMDApKQogICAgICwgbV9maW5hbFByb2dyZXNzQ2hhbmdlZFNlbnQoZmFsc2UpCiAgICAg LCBtX3Byb2dyZXNzVmFsdWUoMCkKKyAgICAsIG1fbmV4dFVuaXF1ZUlkZW50aWZpZXIoMSkKICAg ICAsIG1fbnVtUHJvZ3Jlc3NUcmFja2VkRnJhbWVzKDApCiAgICAgLCBtX3Byb2dyZXNzSGVhcnRi ZWF0VGltZXIodGhpcywgJlByb2dyZXNzVHJhY2tlcjo6cHJvZ3Jlc3NIZWFydGJlYXRUaW1lckZp cmVkKQogICAgICwgbV9oZWFydGJlYXRzV2l0aE5vUHJvZ3Jlc3MoMCkKQEAgLTExNCw2ICsxMTMs NyBAQCB2b2lkIFByb2dyZXNzVHJhY2tlcjo6cmVzZXQoKQogICAgIG1fZmluYWxQcm9ncmVzc0No YW5nZWRTZW50ID0gZmFsc2U7CiAgICAgbV9udW1Qcm9ncmVzc1RyYWNrZWRGcmFtZXMgPSAwOwog ICAgIG1fb3JpZ2luYXRpbmdQcm9ncmVzc0ZyYW1lID0gMDsKKyAgICBtX25leHRVbmlxdWVJZGVu dGlmaWVyID0gMTsKIAogICAgIG1faGVhcnRiZWF0c1dpdGhOb1Byb2dyZXNzID0gMDsKICAgICBt X3RvdGFsQnl0ZXNSZWNlaXZlZEJlZm9yZVByZXZpb3VzSGVhcnRiZWF0ID0gMDsKQEAgLTI5NCw3 ICsyOTQsNyBAQCB2b2lkIFByb2dyZXNzVHJhY2tlcjo6Y29tcGxldGVQcm9ncmVzcyh1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIpCiAKIHVuc2lnbmVkIGxvbmcgUHJvZ3Jlc3NUcmFja2VyOjpjcmVh dGVVbmlxdWVJZGVudGlmaWVyKCkKIHsKLSAgICByZXR1cm4gKytzX3VuaXF1ZUlkZW50aWZpZXI7 CisgICAgcmV0dXJuIG1fbmV4dFVuaXF1ZUlkZW50aWZpZXIrKzsKIH0KIAogYm9vbCBQcm9ncmVz c1RyYWNrZXI6OmlzTWFpbkxvYWRQcm9ncmVzc2luZygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvUHJvZ3Jlc3NUcmFja2VyLmgKaW5kZXggNGQ4MmYzMDlhY2I1MmY0Y2NhODA2NmY3Yjk2MDMy NTNhM2IxNDgwYi4uZGFkODU0NjM3MWMyZTJjMzFiY2QyYzE4ZmE0N2NlNjBkYmM0MjcwYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuaApAQCAtNDYsNyArNDYsNyBAQCBw dWJsaWM6CiAgICAgZXhwbGljaXQgUHJvZ3Jlc3NUcmFja2VyKFByb2dyZXNzVHJhY2tlckNsaWVu dCYpOwogICAgIH5Qcm9ncmVzc1RyYWNrZXIoKTsKIAotICAgIHN0YXRpYyB1bnNpZ25lZCBsb25n IGNyZWF0ZVVuaXF1ZUlkZW50aWZpZXIoKTsKKyAgICB1bnNpZ25lZCBsb25nIGNyZWF0ZVVuaXF1 ZUlkZW50aWZpZXIoKTsKIAogICAgIGRvdWJsZSBlc3RpbWF0ZWRQcm9ncmVzcygpIGNvbnN0Owog CkBAIC02OCw4ICs2OCw2IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHByb2dyZXNzSGVhcnRiZWF0 VGltZXJGaXJlZChUaW1lcjxQcm9ncmVzc1RyYWNrZXI+Jik7CiAgICAgCi0gICAgc3RhdGljIHVu c2lnbmVkIGxvbmcgc191bmlxdWVJZGVudGlmaWVyOwotICAgIAogICAgIFByb2dyZXNzVHJhY2tl ckNsaWVudCYgbV9jbGllbnQ7CiAgICAgbG9uZyBsb25nIG1fdG90YWxQYWdlQW5kUmVzb3VyY2VC eXRlc1RvTG9hZDsKICAgICBsb25nIGxvbmcgbV90b3RhbEJ5dGVzUmVjZWl2ZWQ7CkBAIC04MCw2 ICs3OCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2ZpbmFsUHJvZ3Jlc3NDaGFuZ2VkU2VudDsg ICAgCiAgICAgZG91YmxlIG1fcHJvZ3Jlc3NWYWx1ZTsKICAgICBSZWZQdHI8RnJhbWU+IG1fb3Jp Z2luYXRpbmdQcm9ncmVzc0ZyYW1lOworICAgIHVuc2lnbmVkIGxvbmcgbV9uZXh0VW5pcXVlSWRl bnRpZmllcjsKICAgICAKICAgICBpbnQgbV9udW1Qcm9ncmVzc1RyYWNrZWRGcmFtZXM7CiAgICAg SGFzaE1hcDx1bnNpZ25lZCBsb25nLCBzdGQ6OnVuaXF1ZV9wdHI8UHJvZ3Jlc3NJdGVtPj4gbV9w cm9ncmVzc0l0ZW1zOwo= 227801 2014-03-25 14:44:51 -0700 2014-03-25 14:53:51 -0700 patch.3 bug-130623-20140325144430.patch text/plain 10797 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQ4ODI5OTk3NTRmNjY5 NDgwNjUxNDY0Y2JiODAwZWQxNjliZWZmOS4uNmQzZDVjZGE0Y2VmNjE5NDlkNjhhZDFjYjdkMDJl ZThkNWUxMzljOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAzLTI1ICBCcmlh biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBSZXBsYXk6IHJlc291cmNl IHVuaXF1ZSBpZGVudGlmaWVycyBzaG91bGQgYmUgdW5pcXVlLXBlci1mcmFtZSwgbm90IGdsb2Jh bGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA2 MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3Ig cmVwbGF5IHB1cnBvc2VzLCB3ZSB3YW50IHRvIGRldGVybWluaXN0aWNhbGx5IGFzc2lnbiByZXNv dXJjZSBsb2FkIGlkZW50aWZpZXJzCisgICAgICAgIHRvIHJlc291cmNlIGxvYWRlcnMsIHByb3Zp ZGVkIHRoYXQgdGhlIHJlc291cmNlIGxvYWRlcnMgYXJlIGNyZWF0ZWQgaW4gdGhlIHNhbWUKKyAg ICAgICAgb3JkZXIuCisKKyAgICAgICAgVG8gZG8gdGhpcywgd2UgY29udmVydCB1bmlxdWUgaWRl bnRpZmllcnMgZnJvbSBiZWluZyBnbG9iYWxseS11bmlxdWUgdG8gYmVpbmcKKyAgICAgICAgZnJh bWUtdW5pcXVlLiBXaGVuIGEgbmV3IGZyYW1lIGlzIGJlaW5nIGxvYWRlZCwgdW5pcXVlIGlkZW50 aWZpZXJzIGZvcgorICAgICAgICBzdWJyZXNvdXJjZXMgb2YgdGhhdCBmcmFtZSBiZWdpbiBjb3Vu dGluZyBmcm9tIDEuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBJZGVudGlmaWVyIGludmFyaWFu dHMgYXJlIGV4ZXJjaXNlZCBieSBleGlzdGluZyBhc3NlcnRpb25zIGFuZCB0ZXN0cy4KKworICAg ICAgICAqIGxvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UHJv Z3Jlc3NUcmFja2VyOjpQcm9ncmVzc1RyYWNrZXIpOgorICAgICAgICAoV2ViQ29yZTo6UHJvZ3Jl c3NUcmFja2VyOjpyZXNldCk6CisgICAgICAgIChXZWJDb3JlOjpQcm9ncmVzc1RyYWNrZXI6OmNy ZWF0ZVVuaXF1ZUlkZW50aWZpZXIpOgorICAgICAgICAqIGxvYWRlci9Qcm9ncmVzc1RyYWNrZXIu aDoKKwogMjAxNC0wMy0yNSAgR2Fib3IgUmFwY3NhbnlpICA8cmdhYm9yQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW0FSTTY0XSBHTlUgYXNzZW1ibGVyIGZhaWxzIGluIFRyYW5zZm9ybWF0aW9uTWF0 cml4OjptdWx0aXBseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNz VHJhY2tlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcApp bmRleCAzMzM4NTA2NmJlNmMzNDMzZDU2ZTRjOTA1MjExZjg2YWFjYTQzZjVmLi5iYTEyOGE3YTZl YjVmNzMwZTg0MzhmMDNmZWE1OWMwMDg2MWQ2YzRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UHJvZ3Jlc3NUcmFja2VyLmNwcApAQCAtNzMsOCArNzMsNiBAQCBwdWJsaWM6CiAgICAgbG9uZyBs b25nIGVzdGltYXRlZExlbmd0aDsKIH07CiAKLXVuc2lnbmVkIGxvbmcgUHJvZ3Jlc3NUcmFja2Vy OjpzX3VuaXF1ZUlkZW50aWZpZXIgPSAwOwotCiBQcm9ncmVzc1RyYWNrZXI6OlByb2dyZXNzVHJh Y2tlcihQcm9ncmVzc1RyYWNrZXJDbGllbnQmIGNsaWVudCkKICAgICA6IG1fY2xpZW50KGNsaWVu dCkKICAgICAsIG1fdG90YWxQYWdlQW5kUmVzb3VyY2VCeXRlc1RvTG9hZCgwKQpAQCAtODQsNiAr ODIsNyBAQCBQcm9ncmVzc1RyYWNrZXI6OlByb2dyZXNzVHJhY2tlcihQcm9ncmVzc1RyYWNrZXJD bGllbnQmIGNsaWVudCkKICAgICAsIG1fcHJvZ3Jlc3NOb3RpZmljYXRpb25UaW1lSW50ZXJ2YWwo c3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcygxMDApKQogICAgICwgbV9maW5hbFByb2dyZXNzQ2hh bmdlZFNlbnQoZmFsc2UpCiAgICAgLCBtX3Byb2dyZXNzVmFsdWUoMCkKKyAgICAsIG1fbmV4dFVu aXF1ZUlkZW50aWZpZXIoMSkKICAgICAsIG1fbnVtUHJvZ3Jlc3NUcmFja2VkRnJhbWVzKDApCiAg ICAgLCBtX3Byb2dyZXNzSGVhcnRiZWF0VGltZXIodGhpcywgJlByb2dyZXNzVHJhY2tlcjo6cHJv Z3Jlc3NIZWFydGJlYXRUaW1lckZpcmVkKQogICAgICwgbV9oZWFydGJlYXRzV2l0aE5vUHJvZ3Jl c3MoMCkKQEAgLTExNCw2ICsxMTMsNyBAQCB2b2lkIFByb2dyZXNzVHJhY2tlcjo6cmVzZXQoKQog ICAgIG1fZmluYWxQcm9ncmVzc0NoYW5nZWRTZW50ID0gZmFsc2U7CiAgICAgbV9udW1Qcm9ncmVz c1RyYWNrZWRGcmFtZXMgPSAwOwogICAgIG1fb3JpZ2luYXRpbmdQcm9ncmVzc0ZyYW1lID0gMDsK KyAgICAvLyBEb24ndCByZXNldCBtX25leHRVbmlxdWVJZGVudGlmaWVyLiBNb3JlIGxvYWRzIGNv dWxkIHN0YXJ0IGFmdGVyIHJlc2V0KCkgaXMgY2FsbGVkLgogCiAgICAgbV9oZWFydGJlYXRzV2l0 aE5vUHJvZ3Jlc3MgPSAwOwogICAgIG1fdG90YWxCeXRlc1JlY2VpdmVkQmVmb3JlUHJldmlvdXNI ZWFydGJlYXQgPSAwOwpAQCAtMjk0LDcgKzI5NCw3IEBAIHZvaWQgUHJvZ3Jlc3NUcmFja2VyOjpj b21wbGV0ZVByb2dyZXNzKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKIAogdW5zaWduZWQgbG9u ZyBQcm9ncmVzc1RyYWNrZXI6OmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXIoKQogewotICAgIHJldHVy biArK3NfdW5pcXVlSWRlbnRpZmllcjsKKyAgICByZXR1cm4gbV9uZXh0VW5pcXVlSWRlbnRpZmll cisrOwogfQogCiBib29sIFByb2dyZXNzVHJhY2tlcjo6aXNNYWluTG9hZFByb2dyZXNzaW5nKCkg Y29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIu aCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuaAppbmRleCA0ZDgyZjMw OWFjYjUyZjRjY2E4MDY2ZjdiOTYwMzI1M2EzYjE0ODBiLi5kYWQ4NTQ2MzcxYzJlMmMzMWJjZDJj MThmYTQ3Y2U2MGRiYzQyNzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJv Z3Jlc3NUcmFja2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tl ci5oCkBAIC00Niw3ICs0Niw3IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBQcm9ncmVzc1RyYWNr ZXIoUHJvZ3Jlc3NUcmFja2VyQ2xpZW50Jik7CiAgICAgflByb2dyZXNzVHJhY2tlcigpOwogCi0g ICAgc3RhdGljIHVuc2lnbmVkIGxvbmcgY3JlYXRlVW5pcXVlSWRlbnRpZmllcigpOworICAgIHVu c2lnbmVkIGxvbmcgY3JlYXRlVW5pcXVlSWRlbnRpZmllcigpOwogCiAgICAgZG91YmxlIGVzdGlt YXRlZFByb2dyZXNzKCkgY29uc3Q7CiAKQEAgLTY4LDggKzY4LDYgQEAgcHJpdmF0ZToKIAogICAg IHZvaWQgcHJvZ3Jlc3NIZWFydGJlYXRUaW1lckZpcmVkKFRpbWVyPFByb2dyZXNzVHJhY2tlcj4m KTsKICAgICAKLSAgICBzdGF0aWMgdW5zaWduZWQgbG9uZyBzX3VuaXF1ZUlkZW50aWZpZXI7Ci0g ICAgCiAgICAgUHJvZ3Jlc3NUcmFja2VyQ2xpZW50JiBtX2NsaWVudDsKICAgICBsb25nIGxvbmcg bV90b3RhbFBhZ2VBbmRSZXNvdXJjZUJ5dGVzVG9Mb2FkOwogICAgIGxvbmcgbG9uZyBtX3RvdGFs Qnl0ZXNSZWNlaXZlZDsKQEAgLTgwLDYgKzc4LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fZmlu YWxQcm9ncmVzc0NoYW5nZWRTZW50OyAgICAKICAgICBkb3VibGUgbV9wcm9ncmVzc1ZhbHVlOwog ICAgIFJlZlB0cjxGcmFtZT4gbV9vcmlnaW5hdGluZ1Byb2dyZXNzRnJhbWU7CisgICAgdW5zaWdu ZWQgbG9uZyBtX25leHRVbmlxdWVJZGVudGlmaWVyOwogICAgIAogICAgIGludCBtX251bVByb2dy ZXNzVHJhY2tlZEZyYW1lczsKICAgICBIYXNoTWFwPHVuc2lnbmVkIGxvbmcsIHN0ZDo6dW5pcXVl X3B0cjxQcm9ncmVzc0l0ZW0+PiBtX3Byb2dyZXNzSXRlbXM7CmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTdiMzNmZDFlNWE5YTY1MmMxZDNiM2M0 OGNjOGFlNzFhZGUzYjE4Zi4uOWE5OGU3OWY2ZjY3YzljMTBiYjEyMTcwY2Y5NDZlNzRhYjVkMDI3 NiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI0IEBACisyMDE0LTAzLTI1ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgor CisgICAgICAgIFdlYiBSZXBsYXk6IHJlc291cmNlIHVuaXF1ZSBpZGVudGlmaWVycyBzaG91bGQg YmUgdW5pcXVlLXBlci1mcmFtZSwgbm90IGdsb2JhbGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA2MjMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcmVzb3VyY2UgbG9hZGVyIGNhbGxiYWNrIGR1 bXBpbmcgcm91dGluZXMgYXNzdW1lZCB0aGF0IHJlc291cmNlIGlkZW50aWZpZXJzCisgICAgICAg IHdlcmUgZ2xvYmFsbHkgdW5pcXVlLiBJdHMgbWFwIG9mIHJlc291cmNlIGlkZW50aWZpZXJzIHRv IFVSTHMgbXVzdCBhbHNvIHRyYWNrIHRoZQorICAgICAgICBmcmFtZSBhc3NvY2lhdGVkIHdpdGgg dGhlIHJlc291cmNlLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRs ZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwOgorICAgICAgICAoV1RSOjpkdW1wUmVzb3VyY2VVUkwp OiBBZGRpdGlvbmFsbHkgdGFrZSBhIFdLQnVuZGxlRnJhbWVSZWYgYXJndW1lbnQsIGFuZCB1c2Ug dGhlCisgICAgICAgIG9wYXF1ZSBwb2ludGVyIGFzIHBhcnQgb2YgdGhlIGtleSBmb3IgYXNzaWdu ZWRVcmxzQ2FjaGUuIFRoZSBmcmFtZSBwb2ludGVyIGlzCisgICAgICAgIHN0YWJsZSBhcyBsb25n IGFzIHRoZSBmcmFtZSBpcyB2YWxpZC4KKyAgICAgICAgKFdUUjo6SW5qZWN0ZWRCdW5kbGVQYWdl OjpkaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJjZSk6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVu ZGxlUGFnZTo6d2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUpOgorICAgICAgICAoV1RSOjpJbmplY3Rl ZEJ1bmRsZVBhZ2U6OmRpZFJlY2VpdmVSZXNwb25zZUZvclJlc291cmNlKToKKyAgICAgICAgKFdU Ujo6SW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2UpOgorICAgICAg ICAoV1RSOjpJbmplY3RlZEJ1bmRsZVBhZ2U6OmRpZEZhaWxMb2FkRm9yUmVzb3VyY2UpOgorCiAy MDE0LTAzLTI1ICBHYWJvciBSYXBjc2FueWkgIDxyZ2Fib3JAd2Via2l0Lm9yZz4KIAogICAgICAg ICBbRUZMXSBBZGQgQVJNNjQgYnVpbGQgc3VwcG9ydApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwCmlu ZGV4IDIxZDM0NzczMDJjNDhhZWI4MjcxYzFhNWVlODEyMThhMTQzYzAyMGUuLmM0NWM4YmQyMDAx NDI0NTJhMjJiZDJlMjMwZTE5OTUzNzU1ODc4MDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcAorKysgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAK QEAgLTI1NCwxMiArMjU0LDEzIEBAIHN0YXRpYyBpbmxpbmUgV1RGOjpTdHJpbmcgcGF0aFN1aXRh YmxlRm9yVGVzdFJlc3VsdChXS1VSTFJlZiBmaWxlVXJsKQogICAgIHJldHVybiB0b1dURlN0cmlu ZyhhZG9wdFdLKFdLVVJMQ29weUxhc3RQYXRoQ29tcG9uZW50KGZpbGVVcmwpKSk7IC8vIFdlIGxv c2Ugc29tZSBpbmZvcm1hdGlvbiBoZXJlLCBidXQgaXQncyBiZXR0ZXIgdGhhbiBleHBvc2luZyBh IGZ1bGwgcGF0aCwgd2hpY2ggaXMgYWx3YXlzIG1hY2hpbmUgc3BlY2lmaWMuCiB9CiAKLXN0YXRp YyBIYXNoTWFwPHVpbnQ2NF90LCBTdHJpbmc+IGFzc2lnbmVkVXJsc0NhY2hlOworc3RhdGljIEhh c2hNYXA8c3RkOjpwYWlyPFdLQnVuZGxlRnJhbWVSZWYsIHVpbnQ2NF90PiwgU3RyaW5nPiBhc3Np Z25lZFVybHNDYWNoZTsKIAotc3RhdGljIGlubGluZSB2b2lkIGR1bXBSZXNvdXJjZVVSTCh1aW50 NjRfdCBpZGVudGlmaWVyLCBTdHJpbmdCdWlsZGVyJiBzdHJpbmdCdWlsZGVyKQorc3RhdGljIGlu bGluZSB2b2lkIGR1bXBSZXNvdXJjZVVSTChXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCB1aW50NjRf dCBpZGVudGlmaWVyLCBTdHJpbmdCdWlsZGVyJiBzdHJpbmdCdWlsZGVyKQogewotICAgIGlmIChh c3NpZ25lZFVybHNDYWNoZS5jb250YWlucyhpZGVudGlmaWVyKSkKLSAgICAgICAgc3RyaW5nQnVp bGRlci5hcHBlbmQoYXNzaWduZWRVcmxzQ2FjaGUuZ2V0KGlkZW50aWZpZXIpKTsKKyAgICBzdGQ6 OnBhaXI8V0tCdW5kbGVGcmFtZVJlZiwgdWludDY0X3Q+IGtleSA9IHN0ZDo6bWFrZV9wYWlyKGZy YW1lLCBpZGVudGlmaWVyKTsKKyAgICBpZiAoYXNzaWduZWRVcmxzQ2FjaGUuY29udGFpbnMoa2V5 KSkKKyAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQoYXNzaWduZWRVcmxzQ2FjaGUuZ2V0KGtl eSkpOwogICAgIGVsc2UKICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmRMaXRlcmFsKCI8dW5r bm93bj4iKTsKIH0KQEAgLTEwMjcsMTMgKzEwMjgsMTUgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZVBh Z2U6OmRpZERldGVjdFhTU0ZvckZyYW1lKFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUpCiAgICAgICAg IEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5vdXRwdXRUZXh0KCJkaWREZXRlY3RYU1NcbiIpOwog fQogCi12b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6ZGlkSW5pdGlhdGVMb2FkRm9yUmVzb3VyY2Uo V0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYsIHVpbnQ2NF90IGlkZW50aWZp ZXIsIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBib29sKQordm9pZCBJbmplY3RlZEJ1bmRsZVBh Z2U6OmRpZEluaXRpYXRlTG9hZEZvclJlc291cmNlKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1 bmRsZUZyYW1lUmVmIGZyYW1lLCB1aW50NjRfdCBpZGVudGlmaWVyLCBXS1VSTFJlcXVlc3RSZWYg cmVxdWVzdCwgYm9vbCkKIHsKICAgICBpZiAoIUluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5pc1Rl c3RSdW5uaW5nKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVm PiB1cmwgPSBhZG9wdFdLKFdLVVJMUmVxdWVzdENvcHlVUkwocmVxdWVzdCkpOwotICAgIGFzc2ln bmVkVXJsc0NhY2hlLmFkZChpZGVudGlmaWVyLCBwYXRoU3VpdGFibGVGb3JUZXN0UmVzdWx0KHVy bC5nZXQoKSkpOworICAgIGF1dG8gcmVzdWx0ID0gYXNzaWduZWRVcmxzQ2FjaGUuYWRkKHN0ZDo6 bWFrZV9wYWlyKGZyYW1lLCBpZGVudGlmaWVyKSwgcGF0aFN1aXRhYmxlRm9yVGVzdFJlc3VsdCh1 cmwuZ2V0KCkpKTsKKyAgICAvLyBJdCBpcyBhIGJ1ZyBpbiBXZWJDb3JlIGlmIG11bHRpcGxlIHJl c291cmNlcyBoYWQgdGhlIHNhbWUgZnJhbWUvaWRlbnRpZmllciBwYWlyLgorICAgIEFTU0VSVF9V TlVTRUQocmVzdWx0LCByZXN1bHQuaXNOZXdFbnRyeSk7CiB9CiAKIC8vIFJlc291cmNlIExvYWQg Q2xpZW50IENhbGxiYWNrcwpAQCAtMTA1Myw3ICsxMDU2LDcgQEAgV0tVUkxSZXF1ZXN0UmVmIElu amVjdGVkQnVuZGxlUGFnZTo6d2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUoV0tCdW5kbGVQYWdlUmVm IHBhZ2UKICAgICBpZiAoSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLmlzVGVzdFJ1bm5pbmcoKQog ICAgICAgICAmJiBJbmplY3RlZEJ1bmRsZTo6c2hhcmVkKCkudGVzdFJ1bm5lcigpLT5zaG91bGRE dW1wUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCkpIHsKICAgICAgICAgU3RyaW5nQnVpbGRlciBzdHJp bmdCdWlsZGVyOwotICAgICAgICBkdW1wUmVzb3VyY2VVUkwoaWRlbnRpZmllciwgc3RyaW5nQnVp bGRlcik7CisgICAgICAgIGR1bXBSZXNvdXJjZVVSTChmcmFtZSwgaWRlbnRpZmllciwgc3RyaW5n QnVpbGRlcik7CiAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiIC0gd2lsbFNl bmRSZXF1ZXN0ICIpOwogICAgICAgICBkdW1wUmVxdWVzdERlc2NyaXB0aW9uU3VpdGFibGVGb3JU ZXN0UmVzdWx0KHJlcXVlc3QsIHN0cmluZ0J1aWxkZXIpOwogICAgICAgICBzdHJpbmdCdWlsZGVy LmFwcGVuZExpdGVyYWwoIiByZWRpcmVjdFJlc3BvbnNlICIpOwpAQCAtMTEwNCwxNCArMTEwNywx NCBAQCBXS1VSTFJlcXVlc3RSZWYgSW5qZWN0ZWRCdW5kbGVQYWdlOjp3aWxsU2VuZFJlcXVlc3RG b3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYgcGFnZQogICAgIHJldHVybiByZXF1ZXN0OwogfQogCi12 b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6ZGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVzb3VyY2UoV0tC dW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYsIHVpbnQ2NF90IGlkZW50aWZpZXIs IFdLVVJMUmVzcG9uc2VSZWYgcmVzcG9uc2UpCit2b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6ZGlk UmVjZWl2ZVJlc3BvbnNlRm9yUmVzb3VyY2UoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxl RnJhbWVSZWYgZnJhbWUsIHVpbnQ2NF90IGlkZW50aWZpZXIsIFdLVVJMUmVzcG9uc2VSZWYgcmVz cG9uc2UpCiB7CiAgICAgaWYgKCFJbmplY3RlZEJ1bmRsZTo6c2hhcmVkKCkuaXNUZXN0UnVubmlu ZygpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgp LnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcFJlc291cmNlTG9hZENhbGxiYWNrcygpKSB7CiAgICAg ICAgIFN0cmluZ0J1aWxkZXIgc3RyaW5nQnVpbGRlcjsKLSAgICAgICAgZHVtcFJlc291cmNlVVJM KGlkZW50aWZpZXIsIHN0cmluZ0J1aWxkZXIpOworICAgICAgICBkdW1wUmVzb3VyY2VVUkwoZnJh bWUsIGlkZW50aWZpZXIsIHN0cmluZ0J1aWxkZXIpOwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFw cGVuZExpdGVyYWwoIiAtIGRpZFJlY2VpdmVSZXNwb25zZSAiKTsKICAgICAgICAgZHVtcFJlc3Bv bnNlRGVzY3JpcHRpb25TdWl0YWJsZUZvclRlc3RSZXN1bHQocmVzcG9uc2UsIHN0cmluZ0J1aWxk ZXIpOwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgnXG4nKTsKQEAgLTExMzgsNyArMTE0 MSw3IEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRSZWNlaXZlQ29udGVudExlbmd0aEZv clJlc291cmNlKFdLQnVuZGxlUGFnZVJlZiwgV0tCCiB7CiB9CiAKLXZvaWQgSW5qZWN0ZWRCdW5k bGVQYWdlOjpkaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2UoV0tCdW5kbGVQYWdlUmVmLCBXS0J1bmRs ZUZyYW1lUmVmLCB1aW50NjRfdCBpZGVudGlmaWVyKQordm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2U6 OmRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZShXS0J1bmRsZVBhZ2VSZWYsIFdLQnVuZGxlRnJhbWVS ZWYgZnJhbWUsIHVpbnQ2NF90IGlkZW50aWZpZXIpCiB7CiAgICAgaWYgKCFJbmplY3RlZEJ1bmRs ZTo6c2hhcmVkKCkuaXNUZXN0UnVubmluZygpKQogICAgICAgICByZXR1cm47CkBAIC0xMTQ3LDEy ICsxMTUwLDEyIEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRGaW5pc2hMb2FkRm9yUmVz b3VyY2UoV0tCdW5kbGVQYWdlUmVmLCBXS0J1bmRsZUZyYW1lCiAgICAgICAgIHJldHVybjsKIAog ICAgIFN0cmluZ0J1aWxkZXIgc3RyaW5nQnVpbGRlcjsKLSAgICBkdW1wUmVzb3VyY2VVUkwoaWRl bnRpZmllciwgc3RyaW5nQnVpbGRlcik7CisgICAgZHVtcFJlc291cmNlVVJMKGZyYW1lLCBpZGVu dGlmaWVyLCBzdHJpbmdCdWlsZGVyKTsKICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZExpdGVyYWwo IiAtIGRpZEZpbmlzaExvYWRpbmdcbiIpOwogICAgIEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5v dXRwdXRUZXh0KHN0cmluZ0J1aWxkZXIudG9TdHJpbmcoKSk7CiB9CiAKLXZvaWQgSW5qZWN0ZWRC dW5kbGVQYWdlOjpkaWRGYWlsTG9hZEZvclJlc291cmNlKFdLQnVuZGxlUGFnZVJlZiwgV0tCdW5k bGVGcmFtZVJlZiwgdWludDY0X3QgaWRlbnRpZmllciwgV0tFcnJvclJlZiBlcnJvcikKK3ZvaWQg SW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRGYWlsTG9hZEZvclJlc291cmNlKFdLQnVuZGxlUGFnZVJl ZiwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgdWludDY0X3QgaWRlbnRpZmllciwgV0tFcnJvclJl ZiBlcnJvcikKIHsKICAgICBpZiAoIUluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5pc1Rlc3RSdW5u aW5nKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTExNjEsNyArMTE2NCw3IEBAIHZvaWQgSW5qZWN0 ZWRCdW5kbGVQYWdlOjpkaWRGYWlsTG9hZEZvclJlc291cmNlKFdLQnVuZGxlUGFnZVJlZiwgV0tC dW5kbGVGcmFtZVJlCiAgICAgICAgIHJldHVybjsKIAogICAgIFN0cmluZ0J1aWxkZXIgc3RyaW5n QnVpbGRlcjsKLSAgICBkdW1wUmVzb3VyY2VVUkwoaWRlbnRpZmllciwgc3RyaW5nQnVpbGRlcik7 CisgICAgZHVtcFJlc291cmNlVVJMKGZyYW1lLCBpZGVudGlmaWVyLCBzdHJpbmdCdWlsZGVyKTsK ICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZExpdGVyYWwoIiAtIGRpZEZhaWxMb2FkaW5nV2l0aEVy cm9yOiAiKTsKIAogICAgIGR1bXBFcnJvckRlc2NyaXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0 KGVycm9yLCBzdHJpbmdCdWlsZGVyKTsK