149839 2015-10-06 05:09:31 -0700 [WinCairo] GStreamer compile errors. 2015-10-06 13:45:42 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 peavo webkit-unassigned achristensen cgarcia commit-queue zan oldest_to_newest 1130933 0 peavo 2015-10-06 05:09:31 -0700 There are currently a few compile errors when compiling WinCairo with GStreamer: InbandTextTrackPrivateGStreamer.cpp(86): error C2668: 'WTF::GThreadSafeMainLoopSource::schedule': ambiguous call to overloaded function 1130937 1 262511 peavo 2015-10-06 05:59:11 -0700 Created attachment 262511 Patch 1130967 2 262511 zan 2015-10-06 08:56:32 -0700 Comment on attachment 262511 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262511&action=review > Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:89 > - [protector] { protector->notifyTrackOfSample(); }); > + static_cast<std::function<void()>>( > + [protector] { > + protector->notifyTrackOfSample(); > + })); Just std::function<void ()>([protector] { ... }) should work, with no casts. 1131025 3 262523 peavo 2015-10-06 10:48:32 -0700 Created attachment 262523 Patch 1131027 4 peavo 2015-10-06 10:49:42 -0700 (In reply to comment #2) > Comment on attachment 262511 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=262511&action=review > > > Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:89 > > - [protector] { protector->notifyTrackOfSample(); }); > > + static_cast<std::function<void()>>( > > + [protector] { > > + protector->notifyTrackOfSample(); > > + })); > > Just > > std::function<void ()>([protector] { ... }) > > should work, with no casts. Thanks, that's much better than my casts :) 1131105 5 peavo 2015-10-06 13:29:39 -0700 Thanks for reviewing, Alex! 1131112 6 262523 commit-queue 2015-10-06 13:45:38 -0700 Comment on attachment 262523 Patch Clearing flags on attachment: 262523 Committed r190643: <http://trac.webkit.org/changeset/190643> 1131113 7 commit-queue 2015-10-06 13:45:42 -0700 All reviewed patches have been landed. Closing bug. 262511 2015-10-06 05:59:11 -0700 2015-10-06 10:48:23 -0700 Patch bug-149839-20151006145826.patch text/plain 12333 peavo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MDYxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQzIEBACisyMDE1LTEwLTA2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwZWF2b0BvdXRsb29rLmNvbT4KKworICAgICAgICBbV2luQ2Fpcm9dIEdTdHJl YW1lciBjb21waWxlIGVycm9ycy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0OTgzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1TVkMgbmVlZHMgZXhwbGljaXQgY2FzdHMgdG8gcmVzb2x2ZSBhbWJpZ3Vv dXMgY2FsbHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbmJhbmRUZXh0VHJhY2tQcml2 YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZh dGVHU3RyZWFtZXI6OmhhbmRsZVNhbXBsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbmJhbmRUZXh0 VHJhY2tQcml2YXRlR1N0cmVhbWVyOjpzdHJlYW1DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6 OkluYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVRyYWNrT2ZTYW1wbGUpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjp2aWRlb0NoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjp2aWRlb0NhcHNDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZWaWRlbyk6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmF1ZGlvQ2hhbmdlZCk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVBsYXllck9mQXVk aW8pOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp0ZXh0 Q2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 Om5vdGlmeVBsYXllck9mVGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6dm9sdW1lQ2hhbmdlZCk6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpuZXR3b3JrU3Rh dGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6 bXV0ZUNoYW5nZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9UcmFj a1ByaXZhdGVCYXNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRyYWNrUHJpdmF0 ZUJhc2VHU3RyZWFtZXI6OmFjdGl2ZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6VHJhY2tQ cml2YXRlQmFzZUdTdHJlYW1lcjo6dGFnc0NoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6VHJh Y2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZkFjdGl2ZUNoYW5nZWQpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9WaWRlb1NpbmtHU3RyZWFtZXIuY3Bw OgorICAgICAgICAod2Via2l0VmlkZW9TaW5rUmVuZGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAg KHdlYktpdFdlYlNyY0NoYW5nZVN0YXRlKToKKyAgICAgICAgKHdlYktpdFdlYlNyY05lZWREYXRh Q2IpOgorICAgICAgICAod2ViS2l0V2ViU3JjRW5vdWdoRGF0YU1haW5DYik6CisgICAgICAgICh3 ZWJLaXRXZWJTcmNFbm91Z2hEYXRhQ2IpOgorICAgICAgICAod2ViS2l0V2ViU3JjU2Vla01haW5D Yik6CisgICAgICAgICh3ZWJLaXRXZWJTcmNTZWVrRGF0YUNiKToKKwogMjAxNS0xMC0wNiAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlcG9y dCBlcnJvciB3aGVuIG1haW4gcmVzb3VyY2UgaXMgYmxvY2tlZCBieSBjb250ZW50IGJsb2NrZXIK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIu aAkocmV2aXNpb24gMTkwNjEyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNTcwLDcgKzU3MCw3IEBAIHB1YmxpYzoK ICAgICBzdGF0aWMgdm9pZCByZXNldE1lZGlhRW5naW5lcygpOwogCiAjaWYgVVNFKEdTVFJFQU1F UikKLSAgICB2b2lkIHNpbXVsYXRlQXVkaW9JbnRlcnJ1cHRpb24oKTsKKyAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHNpbXVsYXRlQXVkaW9JbnRlcnJ1cHRpb24oKTsKICNlbmRpZgogCiAgICAgU3Ry aW5nIGxhbmd1YWdlT2ZQcmltYXJ5QXVkaW9UcmFjaygpIGNvbnN0OwpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0luYmFuZFRleHRUcmFja1ByaXZhdGVH U3RyZWFtZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9JbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyLmNwcAkocmV2aXNp b24gMTkwNjEyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L0luYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04 MywxNCArODMsMjAgQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyOjpoYQog CiAgICAgUmVmUHRyPEluYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXI+IHByb3RlY3Rvcih0 aGlzKTsKICAgICBtX3NhbXBsZVRpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gSW5iYW5k VGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZlNhbXBsZSIsCi0gICAgICAg IFtwcm90ZWN0b3JdIHsgcHJvdGVjdG9yLT5ub3RpZnlUcmFja09mU2FtcGxlKCk7IH0pOworICAg ICAgICBzdGF0aWNfY2FzdDxzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4+KAorICAgICAgICAgICAgW3By b3RlY3Rvcl0geworICAgICAgICAgICAgICAgIHByb3RlY3Rvci0+bm90aWZ5VHJhY2tPZlNhbXBs ZSgpOworICAgICAgICAgICAgfSkpOwogfQogCiB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVH U3RyZWFtZXI6OnN0cmVhbUNoYW5nZWQoKQogewogICAgIFJlZlB0cjxJbmJhbmRUZXh0VHJhY2tQ cml2YXRlR1N0cmVhbWVyPiBwcm90ZWN0b3IodGhpcyk7CiAgICAgbV9zdHJlYW1UaW1lckhhbmRs ZXIuc2NoZWR1bGUoIltXZWJLaXRdIEluYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXI6Om5v dGlmeVRyYWNrT2ZTdHJlYW1DaGFuZ2VkIiwKLSAgICAgICAgW3Byb3RlY3Rvcl0geyBwcm90ZWN0 b3ItPm5vdGlmeVRyYWNrT2ZTdHJlYW1DaGFuZ2VkKCk7IH0pOworICAgICAgICBzdGF0aWNfY2Fz dDxzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4+KAorICAgICAgICAgICAgW3Byb3RlY3Rvcl0geworICAg ICAgICAgICAgICAgIHByb3RlY3Rvci0+bm90aWZ5VHJhY2tPZlN0cmVhbUNoYW5nZWQoKTsKKyAg ICAgICAgICAgIH0pKTsKIH0KIAogdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVy Ojpub3RpZnlUcmFja09mU2FtcGxlKCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIuY3BwCShyZXZpc2lvbiAxOTA2MTIpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUxLDEzICs2NTEsMTkgQEAgYm9vbCBNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXI6OnNlZWtpbgogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OnZpZGVvQ2hhbmdlZCgpCiB7CiAgICAgbV92aWRlb1RpbWVySGFuZGxlci5zY2hlZHVs ZSgiW1dlYktpdF0gTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2aWRlb0NoYW5nZWQiLAot ICAgICAgICBbdGhpc10geyBub3RpZnlQbGF5ZXJPZlZpZGVvKCk7IH0pOworICAgICAgICBzdGF0 aWNfY2FzdDxzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4+KAorICAgICAgICAgICAgW3RoaXNdIHsKKyAg ICAgICAgICAgICAgICBub3RpZnlQbGF5ZXJPZlZpZGVvKCk7CisgICAgICAgICAgICB9KSk7CiB9 CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2aWRlb0NhcHNDaGFuZ2VkKCkK IHsKICAgICBtX3ZpZGVvQ2Fwc1RpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2aWRlb0NhcHNDaGFuZ2VkIiwKLSAgICAgICAgW3RoaXNd IHsgbm90aWZ5UGxheWVyT2ZWaWRlb0NhcHMoKTsgfSk7CisgICAgICAgIHN0YXRpY19jYXN0PHN0 ZDo6ZnVuY3Rpb248dm9pZCgpPj4oCisgICAgICAgICAgICBbdGhpc10geworICAgICAgICAgICAg ICAgIG5vdGlmeVBsYXllck9mVmlkZW9DYXBzKCk7CisgICAgICAgICAgICB9KSk7CiB9CiAKIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZlZpZGVvKCkKQEAg LTcwNiw3ICs3MTIsMTAgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlm eQogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmF1ZGlvQ2hhbmdlZCgpCiB7CiAg ICAgbV9hdWRpb1RpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyOjphdWRpb0NoYW5nZWQiLAotICAgICAgICBbdGhpc10geyBub3RpZnlQbGF5 ZXJPZkF1ZGlvKCk7IH0pOworICAgICAgICBzdGF0aWNfY2FzdDxzdGQ6OmZ1bmN0aW9uPHZvaWQo KT4+KAorICAgICAgICAgICAgW3RoaXNdIHsKKyAgICAgICAgICAgICAgICBub3RpZnlQbGF5ZXJP ZkF1ZGlvKCk7CisgICAgICAgICAgICB9KSk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZkF1ZGlvKCkKQEAgLTc1MCw3ICs3NTksMTAgQEAgdm9p ZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeQogdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OnRleHRDaGFuZ2VkKCkKIHsKICAgICBtX3RleHRUaW1lckhhbmRsZXIu c2NoZWR1bGUoIltXZWJLaXRdIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dGV4dENoYW5n ZWQiLAotICAgICAgICBbdGhpc10geyBub3RpZnlQbGF5ZXJPZlRleHQoKTsgfSk7CisgICAgICAg IHN0YXRpY19jYXN0PHN0ZDo6ZnVuY3Rpb248dm9pZCgpPj4oCisgICAgICAgICAgICBbdGhpc10g eworICAgICAgICAgICAgICAgIG5vdGlmeVBsYXllck9mVGV4dCgpOworICAgICAgICAgICAgfSkp OwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZU ZXh0KCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZS5jcHAJKHJldmlzaW9uIDE5MDYxMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzYyLDcgKzM2MiwxMCBAQCB2b2lkIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lckJhc2U6Om5vCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJh c2U6OnZvbHVtZUNoYW5nZWQoKQogewogICAgIG1fdm9sdW1lVGltZXJIYW5kbGVyLnNjaGVkdWxl KCJbV2ViS2l0XSBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjp2b2x1bWVDaGFuZ2Vk IiwKLSAgICAgICAgW3RoaXNdIHsgbm90aWZ5UGxheWVyT2ZWb2x1bWVDaGFuZ2UoKTsgfSk7Cisg ICAgICAgIHN0YXRpY19jYXN0PHN0ZDo6ZnVuY3Rpb248dm9pZCgpPj4oCisgICAgICAgICAgICBb dGhpc10geworICAgICAgICAgICAgICAgIG5vdGlmeVBsYXllck9mVm9sdW1lQ2hhbmdlKCk7Cisg ICAgICAgICAgICB9KSk7CiB9CiAKIE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6bmV0d29ya1N0YXRlKCkgY29uc3QKQEAgLTQxMSw3ICs0 MTQsMTAgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpubwogdm9pZCBN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjptdXRlQ2hhbmdlZCgpCiB7CiAgICAgbV9t dXRlVGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlOjptdXRlQ2hhbmdlZCIsCi0gICAgICAgIFt0aGlzXSB7IG5vdGlmeVBsYXllck9m TXV0ZSgpOyB9KTsKKyAgICAgICAgc3RhdGljX2Nhc3Q8c3RkOjpmdW5jdGlvbjx2b2lkKCk+PigK KyAgICAgICAgICAgIFt0aGlzXSB7CisgICAgICAgICAgICAgICAgbm90aWZ5UGxheWVyT2ZNdXRl KCk7CisgICAgICAgICAgICB9KSk7CiB9CiAKICNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYm ICFVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1RyYWNr UHJpdmF0ZUJhc2VHU3RyZWFtZXIuY3BwCShyZXZpc2lvbiAxOTA2MTIpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1l ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkzLDcgKzkzLDEwIEBAIHZvaWQgVHJhY2tQcml2YXRl QmFzZUdTdHJlYW1lcjo6ZGlzY29ubmUKIHZvaWQgVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6 YWN0aXZlQ2hhbmdlZCgpCiB7CiAgICAgbV9hY3RpdmVUaW1lckhhbmRsZXIuc2NoZWR1bGUoIltX ZWJLaXRdIFRyYWNrUHJpdmF0ZUJhc2VHU3RyZWFtZXI6Om5vdGlmeVRyYWNrT2ZBY3RpdmVDaGFu Z2VkIiwKLSAgICAgICAgW3RoaXNdIHsgbm90aWZ5VHJhY2tPZkFjdGl2ZUNoYW5nZWQoKTsgfSk7 CisgICAgICAgIHN0YXRpY19jYXN0PHN0ZDo6ZnVuY3Rpb248dm9pZCgpPj4oCisgICAgICAgICAg ICBbdGhpc10geworICAgICAgICAgICAgICAgIG5vdGlmeVRyYWNrT2ZBY3RpdmVDaGFuZ2VkKCk7 CisgICAgICAgICAgICB9KSk7CiB9CiAKIHZvaWQgVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6 dGFnc0NoYW5nZWQoKQpAQCAtMTA4LDcgKzExMSwxMCBAQCB2b2lkIFRyYWNrUHJpdmF0ZUJhc2VH U3RyZWFtZXI6OnRhZ3NDaGFuCiAgICAgfQogCiAgICAgbV90YWdUaW1lckhhbmRsZXIuc2NoZWR1 bGUoIltXZWJLaXRdIFRyYWNrUHJpdmF0ZUJhc2VHU3RyZWFtZXI6Om5vdGlmeVRyYWNrT2ZUYWdz Q2hhbmdlZCIsCi0gICAgICAgIFt0aGlzXSB7IG5vdGlmeVRyYWNrT2ZUYWdzQ2hhbmdlZCgpOyB9 KTsKKyAgICAgICAgc3RhdGljX2Nhc3Q8c3RkOjpmdW5jdGlvbjx2b2lkKCk+PigKKyAgICAgICAg ICAgIFt0aGlzXSB7CisgICAgICAgICAgICAgICAgbm90aWZ5VHJhY2tPZlRhZ3NDaGFuZ2VkKCk7 CisgICAgICAgICAgICB9KSk7CiB9CiAKIHZvaWQgVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6 bm90aWZ5VHJhY2tPZkFjdGl2ZUNoYW5nZWQoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1ZpZGVvU2lua0dT dHJlYW1lci5jcHAJKHJldmlzaW9uIDE5MDYxMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9WaWRlb1NpbmtHU3RyZWFtZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yMTksNyArMjE5LDEwIEBAIHN0YXRpYyBHc3RGbG93UmV0dXJuIHdlYmtpdFZpZGVvU2lu a1JlbmQKICAgICAvLyBTZWU6IGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNn aT9pZD02MTA4MzAuCiAgICAgR1JlZlB0cjxXZWJLaXRWaWRlb1Npbms+IHByb3RlY3RvcihzaW5r KTsKICAgICBwcml2LT50aW1lb3V0U291cmNlLnNjaGVkdWxlKCJbV2ViS2l0XSB3ZWJraXRWaWRl b1NpbmtUaW1lb3V0Q2FsbGJhY2siLAotICAgICAgICBbcHJvdGVjdG9yXSB7IHdlYmtpdFZpZGVv U2lua1RpbWVvdXRDYWxsYmFjayhwcm90ZWN0b3IuZ2V0KCkpOyB9LCBHX1BSSU9SSVRZX0RFRkFV TFQpOworICAgICAgICBzdGF0aWNfY2FzdDxzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4+KAorICAgICAg ICAgICAgW3Byb3RlY3Rvcl0geworICAgICAgICAgICAgICAgIHdlYmtpdFZpZGVvU2lua1RpbWVv dXRDYWxsYmFjayhwcm90ZWN0b3IuZ2V0KCkpOworICAgICAgICAgICAgfSkpOwogCiAgICAgZ19j b25kX3dhaXQoJnByaXYtPmRhdGFDb25kaXRpb24sICZwcml2LT5zYW1wbGVNdXRleCk7CiAgICAg cmV0dXJuIEdTVF9GTE9XX09LOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJj ZUdTdHJlYW1lci5jcHAJKHJldmlzaW9uIDE5MDYxMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02NjYsNyArNjY2LDEwIEBAIHN0YXRpYyBHc3RTdGF0ZUNoYW5nZVJldHVy biB3ZWJLaXRXZWJTcmMKICAgICAgICAgcHJpdi0+cGVuZGluZ1N0YXJ0ID0gVFJVRTsKICAgICAg ICAgR1JlZlB0cjxXZWJLaXRXZWJTcmM+IHByb3RlY3RvcihzcmMpOwogICAgICAgICBwcml2LT5z dGFydFNvdXJjZS5zY2hlZHVsZSgiW1dlYktpdF0gd2ViS2l0V2ViU3JjU3RhcnQiLAotICAgICAg ICAgICAgW3Byb3RlY3Rvcl0geyB3ZWJLaXRXZWJTcmNTdGFydChwcm90ZWN0b3IuZ2V0KCkpOyB9 LCBHX1BSSU9SSVRZX0RFRkFVTFQpOworICAgICAgICAgICAgc3RhdGljX2Nhc3Q8c3RkOjpmdW5j dGlvbjx2b2lkKCk+PigKKyAgICAgICAgICAgICAgICBbcHJvdGVjdG9yXSB7CisgICAgICAgICAg ICAgICAgICAgIHdlYktpdFdlYlNyY1N0YXJ0KHByb3RlY3Rvci5nZXQoKSk7CisgICAgICAgICAg ICAgICAgfSkpOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgY2FzZSBHU1RfU1RBVEVfQ0hB TkdFX1BBVVNFRF9UT19SRUFEWToKQEAgLTY3Nyw3ICs2ODAsMTAgQEAgc3RhdGljIEdzdFN0YXRl Q2hhbmdlUmV0dXJuIHdlYktpdFdlYlNyYwogICAgICAgICByZW1vdmVUaW1lb3V0U291cmNlcyhz cmMpOwogICAgICAgICBHUmVmUHRyPFdlYktpdFdlYlNyYz4gcHJvdGVjdG9yKHNyYyk7CiAgICAg ICAgIHByaXYtPnN0b3BTb3VyY2Uuc2NoZWR1bGUoIltXZWJLaXRdIHdlYktpdFdlYlNyY1N0b3Ai LAotICAgICAgICAgICAgW3Byb3RlY3Rvcl0geyB3ZWJLaXRXZWJTcmNTdG9wKHByb3RlY3Rvci5n ZXQoKSk7IH0sIEdfUFJJT1JJVFlfREVGQVVMVCk7CisgICAgICAgICAgICBzdGF0aWNfY2FzdDxz dGQ6OmZ1bmN0aW9uPHZvaWQoKT4+KAorICAgICAgICAgICAgICAgIFtwcm90ZWN0b3JdIHsKKyAg ICAgICAgICAgICAgICAgICAgd2ViS2l0V2ViU3JjU3RvcChwcm90ZWN0b3IuZ2V0KCkpOworICAg ICAgICAgICAgICAgIH0pKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGRlZmF1bHQ6CkBA IC04MzMsNyArODM5LDEwIEBAIHN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY05lZWREYXRhQ2IoR3N0 QXAKIAogICAgIEdSZWZQdHI8V2ViS2l0V2ViU3JjPiBwcm90ZWN0b3Ioc3JjKTsKICAgICBwcml2 LT5uZWVkRGF0YVNvdXJjZS5zY2hlZHVsZSgiW1dlYktpdF0gd2ViS2l0V2ViU3JjTmVlZERhdGFN YWluQ2IiLAotICAgICAgICBbcHJvdGVjdG9yXSB7IHdlYktpdFdlYlNyY05lZWREYXRhTWFpbkNi KHByb3RlY3Rvci5nZXQoKSk7IH0sIEdfUFJJT1JJVFlfREVGQVVMVCk7CisgICAgICAgIHN0YXRp Y19jYXN0PHN0ZDo6ZnVuY3Rpb248dm9pZCgpPj4oCisgICAgICAgICAgICBbcHJvdGVjdG9yXSB7 CisgICAgICAgICAgICAgICAgd2ViS2l0V2ViU3JjTmVlZERhdGFNYWluQ2IocHJvdGVjdG9yLmdl dCgpKTsKKyAgICAgICAgICAgIH0pKTsKIH0KIAogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjRW5v dWdoRGF0YU1haW5DYihXZWJLaXRXZWJTcmMqIHNyYykKQEAgLTg2NSw3ICs4NzQsMTAgQEAgc3Rh dGljIHZvaWQgd2ViS2l0V2ViU3JjRW5vdWdoRGF0YUNiKEdzdAogCiAgICAgR1JlZlB0cjxXZWJL aXRXZWJTcmM+IHByb3RlY3RvcihzcmMpOwogICAgIHByaXYtPmVub3VnaERhdGFTb3VyY2Uuc2No ZWR1bGUoIltXZWJLaXRdIHdlYktpdFdlYlNyY0Vub3VnaERhdGFNYWluQ2IiLAotICAgICAgICBb cHJvdGVjdG9yXSB7IHdlYktpdFdlYlNyY0Vub3VnaERhdGFNYWluQ2IocHJvdGVjdG9yLmdldCgp KTsgfSwgR19QUklPUklUWV9ERUZBVUxUKTsKKyAgICAgICAgc3RhdGljX2Nhc3Q8c3RkOjpmdW5j dGlvbjx2b2lkKCk+PigKKyAgICAgICAgICAgIFtwcm90ZWN0b3JdIHsKKyAgICAgICAgICAgICAg ICB3ZWJLaXRXZWJTcmNFbm91Z2hEYXRhTWFpbkNiKHByb3RlY3Rvci5nZXQoKSk7CisgICAgICAg ICAgICB9KSk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY1NlZWtNYWluQ2IoV2ViS2l0 V2ViU3JjKiBzcmMpCkBAIC04OTQsNyArOTA2LDEwIEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJLaXRX ZWJTcmNTZWVrRGF0YUNiKEcKIAogICAgIEdSZWZQdHI8V2ViS2l0V2ViU3JjPiBwcm90ZWN0b3Io c3JjKTsKICAgICBwcml2LT5zZWVrU291cmNlLnNjaGVkdWxlKCJbV2ViS2l0XSB3ZWJLaXRXZWJT cmNTZWVrTWFpbkNiIiwKLSAgICAgICAgW3Byb3RlY3Rvcl0geyB3ZWJLaXRXZWJTcmNTZWVrTWFp bkNiKFdFQktJVF9XRUJfU1JDKHByb3RlY3Rvci5nZXQoKSkpOyB9LCBHX1BSSU9SSVRZX0RFRkFV TFQpOworICAgICAgICBzdGF0aWNfY2FzdDxzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4+KAorICAgICAg ICAgICAgW3Byb3RlY3Rvcl0geworICAgICAgICAgICAgICAgIHdlYktpdFdlYlNyY1NlZWtNYWlu Q2IoV0VCS0lUX1dFQl9TUkMocHJvdGVjdG9yLmdldCgpKSk7CisgICAgICAgICAgICB9KSk7CiAg ICAgcmV0dXJuIFRSVUU7CiB9CiAK 262523 2015-10-06 10:48:32 -0700 2015-10-06 13:45:38 -0700 Patch bug-149839-20151006194747.patch text/plain 12109 peavo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MDYxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQzIEBACisyMDE1LTEwLTA2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwZWF2b0BvdXRsb29rLmNvbT4KKworICAgICAgICBbV2luQ2Fpcm9dIEdTdHJl YW1lciBjb21waWxlIGVycm9ycy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0OTgzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEhlbHAgTVNWQyB0byByZXNvbHZlIGFtYmlndW91cyBjYWxscy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmg6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0luYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcjo6aGFu ZGxlU2FtcGxlKToKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZhdGVHU3Ry ZWFtZXI6OnN0cmVhbUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kVGV4dFRyYWNr UHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZlNhbXBsZSk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVvQ2hhbmdl ZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVv Q2Fwc0NoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjpub3RpZnlQbGF5ZXJPZlZpZGVvKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6YXVkaW9DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZBdWRpbyk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnRleHRDaGFuZ2VkKToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZU ZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJCYXNlOjp2b2x1bWVDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Om5ldHdvcmtTdGF0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjptdXRlQ2hhbmdlZCk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1RyYWNrUHJpdmF0ZUJhc2VHU3Ry ZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6 YWN0aXZlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpUcmFja1ByaXZhdGVCYXNlR1N0cmVh bWVyOjp0YWdzQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpUcmFja1ByaXZhdGVCYXNlR1N0 cmVhbWVyOjpub3RpZnlUcmFja09mQWN0aXZlQ2hhbmdlZCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHA6CisgICAgICAgICh3ZWJr aXRWaWRlb1NpbmtSZW5kZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAod2ViS2l0V2ViU3JjQ2hh bmdlU3RhdGUpOgorICAgICAgICAod2ViS2l0V2ViU3JjTmVlZERhdGFDYik6CisgICAgICAgICh3 ZWJLaXRXZWJTcmNFbm91Z2hEYXRhTWFpbkNiKToKKyAgICAgICAgKHdlYktpdFdlYlNyY0Vub3Vn aERhdGFDYik6CisgICAgICAgICh3ZWJLaXRXZWJTcmNTZWVrTWFpbkNiKToKKyAgICAgICAgKHdl YktpdFdlYlNyY1NlZWtEYXRhQ2IpOgorCiAyMDE1LTEwLTA2ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVwb3J0IGVycm9yIHdoZW4gbWFp biByZXNvdXJjZSBpcyBibG9ja2VkIGJ5IGNvbnRlbnQgYmxvY2tlcgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCShyZXZpc2lvbiAxOTA2 MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCSh3 b3JraW5nIGNvcHkpCkBAIC01NzAsNyArNTcwLDcgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lk IHJlc2V0TWVkaWFFbmdpbmVzKCk7CiAKICNpZiBVU0UoR1NUUkVBTUVSKQotICAgIHZvaWQgc2lt dWxhdGVBdWRpb0ludGVycnVwdGlvbigpOworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2ltdWxh dGVBdWRpb0ludGVycnVwdGlvbigpOwogI2VuZGlmCiAKICAgICBTdHJpbmcgbGFuZ3VhZ2VPZlBy aW1hcnlBdWRpb1RyYWNrKCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0lu YmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXIuY3BwCShyZXZpc2lvbiAxOTA2MTIpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvSW5iYW5kVGV4dFRyYWNr UHJpdmF0ZUdTdHJlYW1lci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDE0ICs4MywyMCBAQCB2 b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXI6OmhhCiAKICAgICBSZWZQdHI8SW5i YW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcj4gcHJvdGVjdG9yKHRoaXMpOwogICAgIG1fc2Ft cGxlVGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBJbmJhbmRUZXh0VHJhY2tQcml2YXRl R1N0cmVhbWVyOjpub3RpZnlUcmFja09mU2FtcGxlIiwKLSAgICAgICAgW3Byb3RlY3Rvcl0geyBw cm90ZWN0b3ItPm5vdGlmeVRyYWNrT2ZTYW1wbGUoKTsgfSk7CisgICAgICAgIHN0ZDo6ZnVuY3Rp b248dm9pZCgpPigKKyAgICAgICAgICAgIFtwcm90ZWN0b3JdIHsKKyAgICAgICAgICAgICAgICBw cm90ZWN0b3ItPm5vdGlmeVRyYWNrT2ZTYW1wbGUoKTsKKyAgICAgICAgICAgIH0pKTsKIH0KIAog dm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyOjpzdHJlYW1DaGFuZ2VkKCkKIHsK ICAgICBSZWZQdHI8SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcj4gcHJvdGVjdG9yKHRo aXMpOwogICAgIG1fc3RyZWFtVGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBJbmJhbmRU ZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlUcmFja09mU3RyZWFtQ2hhbmdlZCIsCi0g ICAgICAgIFtwcm90ZWN0b3JdIHsgcHJvdGVjdG9yLT5ub3RpZnlUcmFja09mU3RyZWFtQ2hhbmdl ZCgpOyB9KTsKKyAgICAgICAgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KAorICAgICAgICAgICAgW3By b3RlY3Rvcl0geworICAgICAgICAgICAgICAgIHByb3RlY3Rvci0+bm90aWZ5VHJhY2tPZlN0cmVh bUNoYW5nZWQoKTsKKyAgICAgICAgICAgIH0pKTsKIH0KIAogdm9pZCBJbmJhbmRUZXh0VHJhY2tQ cml2YXRlR1N0cmVhbWVyOjpub3RpZnlUcmFja09mU2FtcGxlKCkKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCShyZXZpc2lvbiAxOTA2MTIp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUxLDEzICs2NTEsMTkg QEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNlZWtpbgogdm9pZCBNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVvQ2hhbmdlZCgpCiB7CiAgICAgbV92aWRlb1RpbWVy SGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2 aWRlb0NoYW5nZWQiLAotICAgICAgICBbdGhpc10geyBub3RpZnlQbGF5ZXJPZlZpZGVvKCk7IH0p OworICAgICAgICBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4oCisgICAgICAgICAgICBbdGhpc10gewor ICAgICAgICAgICAgICAgIG5vdGlmeVBsYXllck9mVmlkZW8oKTsKKyAgICAgICAgICAgIH0pKTsK IH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVvQ2Fwc0NoYW5nZWQo KQogewogICAgIG1fdmlkZW9DYXBzVGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVvQ2Fwc0NoYW5nZWQiLAotICAgICAgICBbdGhp c10geyBub3RpZnlQbGF5ZXJPZlZpZGVvQ2FwcygpOyB9KTsKKyAgICAgICAgc3RkOjpmdW5jdGlv bjx2b2lkKCk+KAorICAgICAgICAgICAgW3RoaXNdIHsKKyAgICAgICAgICAgICAgICBub3RpZnlQ bGF5ZXJPZlZpZGVvQ2FwcygpOworICAgICAgICAgICAgfSkpOwogfQogCiB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZWaWRlbygpCkBAIC03MDYsNyArNzEy LDEwIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnkKIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjphdWRpb0NoYW5nZWQoKQogewogICAgIG1fYXVkaW9U aW1lckhhbmRsZXIuc2NoZWR1bGUoIltXZWJLaXRdIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6YXVkaW9DaGFuZ2VkIiwKLSAgICAgICAgW3RoaXNdIHsgbm90aWZ5UGxheWVyT2ZBdWRpbygp OyB9KTsKKyAgICAgICAgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KAorICAgICAgICAgICAgW3RoaXNd IHsKKyAgICAgICAgICAgICAgICBub3RpZnlQbGF5ZXJPZkF1ZGlvKCk7CisgICAgICAgICAgICB9 KSk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJP ZkF1ZGlvKCkKQEAgLTc1MCw3ICs3NTksMTAgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6Om5vdGlmeQogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnRleHRDaGFu Z2VkKCkKIHsKICAgICBtX3RleHRUaW1lckhhbmRsZXIuc2NoZWR1bGUoIltXZWJLaXRdIE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dGV4dENoYW5nZWQiLAotICAgICAgICBbdGhpc10geyBu b3RpZnlQbGF5ZXJPZlRleHQoKTsgfSk7CisgICAgICAgIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPigK KyAgICAgICAgICAgIFt0aGlzXSB7CisgICAgICAgICAgICAgICAgbm90aWZ5UGxheWVyT2ZUZXh0 KCk7CisgICAgICAgICAgICB9KSk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjpub3RpZnlQbGF5ZXJPZlRleHQoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAkocmV2aXNpb24gMTkwNjEyKQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lckJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjIsNyArMzYyLDEwIEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6bm8KIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6dm9sdW1lQ2hhbmdlZCgpCiB7CiAgICAgbV92b2x1bWVU aW1lckhhbmRsZXIuc2NoZWR1bGUoIltXZWJLaXRdIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2U6OnZvbHVtZUNoYW5nZWQiLAotICAgICAgICBbdGhpc10geyBub3RpZnlQbGF5ZXJPZlZv bHVtZUNoYW5nZSgpOyB9KTsKKyAgICAgICAgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KAorICAgICAg ICAgICAgW3RoaXNdIHsKKyAgICAgICAgICAgICAgICBub3RpZnlQbGF5ZXJPZlZvbHVtZUNoYW5n ZSgpOworICAgICAgICAgICAgfSkpOwogfQogCiBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Om5ldHdvcmtTdGF0ZSgpIGNvbnN0CkBAIC00 MTEsNyArNDE0LDEwIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6bm8K IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6bXV0ZUNoYW5nZWQoKQogewog ICAgIG1fbXV0ZVRpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyQmFzZTo6bXV0ZUNoYW5nZWQiLAotICAgICAgICBbdGhpc10geyBub3RpZnlQ bGF5ZXJPZk11dGUoKTsgfSk7CisgICAgICAgIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPigKKyAgICAg ICAgICAgIFt0aGlzXSB7CisgICAgICAgICAgICAgICAgbm90aWZ5UGxheWVyT2ZNdXRlKCk7Cisg ICAgICAgICAgICB9KSk7CiB9CiAKICNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmICFVU0Uo Q09PUkRJTkFURURfR1JBUEhJQ1MpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1RyYWNrUHJpdmF0 ZUJhc2VHU3RyZWFtZXIuY3BwCShyZXZpc2lvbiAxOTA2MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTkzLDcgKzkzLDEwIEBAIHZvaWQgVHJhY2tQcml2YXRlQmFzZUdT dHJlYW1lcjo6ZGlzY29ubmUKIHZvaWQgVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6YWN0aXZl Q2hhbmdlZCgpCiB7CiAgICAgbV9hY3RpdmVUaW1lckhhbmRsZXIuc2NoZWR1bGUoIltXZWJLaXRd IFRyYWNrUHJpdmF0ZUJhc2VHU3RyZWFtZXI6Om5vdGlmeVRyYWNrT2ZBY3RpdmVDaGFuZ2VkIiwK LSAgICAgICAgW3RoaXNdIHsgbm90aWZ5VHJhY2tPZkFjdGl2ZUNoYW5nZWQoKTsgfSk7CisgICAg ICAgIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPigKKyAgICAgICAgICAgIFt0aGlzXSB7CisgICAgICAg ICAgICAgICAgbm90aWZ5VHJhY2tPZkFjdGl2ZUNoYW5nZWQoKTsKKyAgICAgICAgICAgIH0pKTsK IH0KIAogdm9pZCBUcmFja1ByaXZhdGVCYXNlR1N0cmVhbWVyOjp0YWdzQ2hhbmdlZCgpCkBAIC0x MDgsNyArMTExLDEwIEBAIHZvaWQgVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6dGFnc0NoYW4K ICAgICB9CiAKICAgICBtX3RhZ1RpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gVHJhY2tQ cml2YXRlQmFzZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZlRhZ3NDaGFuZ2VkIiwKLSAgICAgICAg W3RoaXNdIHsgbm90aWZ5VHJhY2tPZlRhZ3NDaGFuZ2VkKCk7IH0pOworICAgICAgICBzdGQ6OmZ1 bmN0aW9uPHZvaWQoKT4oCisgICAgICAgICAgICBbdGhpc10geworICAgICAgICAgICAgICAgIG5v dGlmeVRyYWNrT2ZUYWdzQ2hhbmdlZCgpOworICAgICAgICAgICAgfSkpOwogfQogCiB2b2lkIFRy YWNrUHJpdmF0ZUJhc2VHU3RyZWFtZXI6Om5vdGlmeVRyYWNrT2ZBY3RpdmVDaGFuZ2VkKCkKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9WaWRlb1NpbmtH U3RyZWFtZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9WaWRlb1NpbmtHU3RyZWFtZXIuY3BwCShyZXZpc2lvbiAxOTA2MTIpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVmlkZW9TaW5rR1N0 cmVhbWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE5LDcgKzIxOSwxMCBAQCBzdGF0aWMgR3N0 Rmxvd1JldHVybiB3ZWJraXRWaWRlb1NpbmtSZW5kCiAgICAgLy8gU2VlOiBodHRwczovL2J1Z3pp bGxhLmdub21lLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjEwODMwLgogICAgIEdSZWZQdHI8V2ViS2l0 VmlkZW9TaW5rPiBwcm90ZWN0b3Ioc2luayk7CiAgICAgcHJpdi0+dGltZW91dFNvdXJjZS5zY2hl ZHVsZSgiW1dlYktpdF0gd2Via2l0VmlkZW9TaW5rVGltZW91dENhbGxiYWNrIiwKLSAgICAgICAg W3Byb3RlY3Rvcl0geyB3ZWJraXRWaWRlb1NpbmtUaW1lb3V0Q2FsbGJhY2socHJvdGVjdG9yLmdl dCgpKTsgfSwgR19QUklPUklUWV9ERUZBVUxUKTsKKyAgICAgICAgc3RkOjpmdW5jdGlvbjx2b2lk KCk+KAorICAgICAgICAgICAgW3Byb3RlY3Rvcl0geworICAgICAgICAgICAgICAgIHdlYmtpdFZp ZGVvU2lua1RpbWVvdXRDYWxsYmFjayhwcm90ZWN0b3IuZ2V0KCkpOworICAgICAgICAgICAgfSkp OwogCiAgICAgZ19jb25kX3dhaXQoJnByaXYtPmRhdGFDb25kaXRpb24sICZwcml2LT5zYW1wbGVN dXRleCk7CiAgICAgcmV0dXJuIEdTVF9GTE9XX09LOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dl YktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAJKHJldmlzaW9uIDE5MDYxMikKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFt ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NjYsNyArNjY2LDEwIEBAIHN0YXRpYyBHc3RTdGF0 ZUNoYW5nZVJldHVybiB3ZWJLaXRXZWJTcmMKICAgICAgICAgcHJpdi0+cGVuZGluZ1N0YXJ0ID0g VFJVRTsKICAgICAgICAgR1JlZlB0cjxXZWJLaXRXZWJTcmM+IHByb3RlY3RvcihzcmMpOwogICAg ICAgICBwcml2LT5zdGFydFNvdXJjZS5zY2hlZHVsZSgiW1dlYktpdF0gd2ViS2l0V2ViU3JjU3Rh cnQiLAotICAgICAgICAgICAgW3Byb3RlY3Rvcl0geyB3ZWJLaXRXZWJTcmNTdGFydChwcm90ZWN0 b3IuZ2V0KCkpOyB9LCBHX1BSSU9SSVRZX0RFRkFVTFQpOworICAgICAgICAgICAgc3RkOjpmdW5j dGlvbjx2b2lkKCk+KAorICAgICAgICAgICAgICAgIFtwcm90ZWN0b3JdIHsKKyAgICAgICAgICAg ICAgICAgICAgd2ViS2l0V2ViU3JjU3RhcnQocHJvdGVjdG9yLmdldCgpKTsKKyAgICAgICAgICAg ICAgICB9KSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIEdTVF9TVEFURV9DSEFO R0VfUEFVU0VEX1RPX1JFQURZOgpAQCAtNjc3LDcgKzY4MCwxMCBAQCBzdGF0aWMgR3N0U3RhdGVD aGFuZ2VSZXR1cm4gd2ViS2l0V2ViU3JjCiAgICAgICAgIHJlbW92ZVRpbWVvdXRTb3VyY2VzKHNy Yyk7CiAgICAgICAgIEdSZWZQdHI8V2ViS2l0V2ViU3JjPiBwcm90ZWN0b3Ioc3JjKTsKICAgICAg ICAgcHJpdi0+c3RvcFNvdXJjZS5zY2hlZHVsZSgiW1dlYktpdF0gd2ViS2l0V2ViU3JjU3RvcCIs Ci0gICAgICAgICAgICBbcHJvdGVjdG9yXSB7IHdlYktpdFdlYlNyY1N0b3AocHJvdGVjdG9yLmdl dCgpKTsgfSwgR19QUklPUklUWV9ERUZBVUxUKTsKKyAgICAgICAgICAgIHN0ZDo6ZnVuY3Rpb248 dm9pZCgpPigKKyAgICAgICAgICAgICAgICBbcHJvdGVjdG9yXSB7CisgICAgICAgICAgICAgICAg ICAgIHdlYktpdFdlYlNyY1N0b3AocHJvdGVjdG9yLmdldCgpKTsKKyAgICAgICAgICAgICAgICB9 KSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBkZWZhdWx0OgpAQCAtODMzLDcgKzgzOSwx MCBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNOZWVkRGF0YUNiKEdzdEFwCiAKICAgICBHUmVm UHRyPFdlYktpdFdlYlNyYz4gcHJvdGVjdG9yKHNyYyk7CiAgICAgcHJpdi0+bmVlZERhdGFTb3Vy Y2Uuc2NoZWR1bGUoIltXZWJLaXRdIHdlYktpdFdlYlNyY05lZWREYXRhTWFpbkNiIiwKLSAgICAg ICAgW3Byb3RlY3Rvcl0geyB3ZWJLaXRXZWJTcmNOZWVkRGF0YU1haW5DYihwcm90ZWN0b3IuZ2V0 KCkpOyB9LCBHX1BSSU9SSVRZX0RFRkFVTFQpOworICAgICAgICBzdGQ6OmZ1bmN0aW9uPHZvaWQo KT4oCisgICAgICAgICAgICBbcHJvdGVjdG9yXSB7CisgICAgICAgICAgICAgICAgd2ViS2l0V2Vi U3JjTmVlZERhdGFNYWluQ2IocHJvdGVjdG9yLmdldCgpKTsKKyAgICAgICAgICAgIH0pKTsKIH0K IAogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjRW5vdWdoRGF0YU1haW5DYihXZWJLaXRXZWJTcmMq IHNyYykKQEAgLTg2NSw3ICs4NzQsMTAgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjRW5vdWdo RGF0YUNiKEdzdAogCiAgICAgR1JlZlB0cjxXZWJLaXRXZWJTcmM+IHByb3RlY3RvcihzcmMpOwog ICAgIHByaXYtPmVub3VnaERhdGFTb3VyY2Uuc2NoZWR1bGUoIltXZWJLaXRdIHdlYktpdFdlYlNy Y0Vub3VnaERhdGFNYWluQ2IiLAotICAgICAgICBbcHJvdGVjdG9yXSB7IHdlYktpdFdlYlNyY0Vu b3VnaERhdGFNYWluQ2IocHJvdGVjdG9yLmdldCgpKTsgfSwgR19QUklPUklUWV9ERUZBVUxUKTsK KyAgICAgICAgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KAorICAgICAgICAgICAgW3Byb3RlY3Rvcl0g eworICAgICAgICAgICAgICAgIHdlYktpdFdlYlNyY0Vub3VnaERhdGFNYWluQ2IocHJvdGVjdG9y LmdldCgpKTsKKyAgICAgICAgICAgIH0pKTsKIH0KIAogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3Jj U2Vla01haW5DYihXZWJLaXRXZWJTcmMqIHNyYykKQEAgLTg5NCw3ICs5MDYsMTAgQEAgc3RhdGlj IGdib29sZWFuIHdlYktpdFdlYlNyY1NlZWtEYXRhQ2IoRwogCiAgICAgR1JlZlB0cjxXZWJLaXRX ZWJTcmM+IHByb3RlY3RvcihzcmMpOwogICAgIHByaXYtPnNlZWtTb3VyY2Uuc2NoZWR1bGUoIltX ZWJLaXRdIHdlYktpdFdlYlNyY1NlZWtNYWluQ2IiLAotICAgICAgICBbcHJvdGVjdG9yXSB7IHdl YktpdFdlYlNyY1NlZWtNYWluQ2IoV0VCS0lUX1dFQl9TUkMocHJvdGVjdG9yLmdldCgpKSk7IH0s IEdfUFJJT1JJVFlfREVGQVVMVCk7CisgICAgICAgIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPigKKyAg ICAgICAgICAgIFtwcm90ZWN0b3JdIHsKKyAgICAgICAgICAgICAgICB3ZWJLaXRXZWJTcmNTZWVr TWFpbkNiKFdFQktJVF9XRUJfU1JDKHByb3RlY3Rvci5nZXQoKSkpOworICAgICAgICAgICAgfSkp OwogICAgIHJldHVybiBUUlVFOwogfQogCg==