148727 2015-09-02 15:57:32 -0700 Add a new ResourceLoaderOption to avoid page defers loading mechanisms for inspector 2015-09-05 01:47:35 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck ap bburg beidson commit-queue graouts joepeck koivisto mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1122940 0 joepeck 2015-09-02 15:57:32 -0700 * SUMMARY Add a new ResourceLoaderOption to avoid page defers loading mechanisms for inspector. Web Inspector has the capability to load arbitrary URLs through the inspected page (Network.loadResource). This capability is used for loading SourceMap resources through the inspected page. We also want to use this in tests, to load test resources through the inspected page. In WebCore, defers loading is a Page attribute. When the Page's defersLoading state changes it cascades to all ResourceHandles tied to that page (cascading through FrameResourceLoader, DocumentLoader, SubresourceLoader, ResourceLoader, ResourceHandle). However, this Web Inspector resource load doesn't want to respect the Page's defersLoading status. For instance, if the page is Paused it will be deferring network loads, but we still want this inspector resource load to finish. InspectorResourceAgent right now, always attempts to disable the defers loading state of the loader. This will ASSERT in ResourceHandle if the value didn't change, which is a useful ASSERT to detect accidental imbalances. As such, no manipulation of this flag apart from matching the Page would be perfect. A better approach, would be to disallow defers loading entirely for this loader. We can add a ResourceLoaderOption to this extent, and just never allow it to be deferred. 1122941 1 260448 joepeck 2015-09-02 15:59:59 -0700 Created attachment 260448 [PATCH] Proposed Fix 1122991 2 260466 joepeck 2015-09-02 18:11:40 -0700 Created attachment 260466 [PATCH] Proposed Fix 1123917 3 260466 commit-queue 2015-09-05 01:47:30 -0700 Comment on attachment 260466 [PATCH] Proposed Fix Clearing flags on attachment: 260466 Committed r189432: <http://trac.webkit.org/changeset/189432> 1123918 4 commit-queue 2015-09-05 01:47:35 -0700 All reviewed patches have been landed. Closing bug. 260448 2015-09-02 15:59:59 -0700 2015-09-02 18:11:40 -0700 [PATCH] Proposed Fix loader-option.patch text/plain 17028 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwODEwNWQ2Li5iZTgxZjI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQg QEAKKzIwMTUtMDktMDIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBBZGQgYSBuZXcgUmVzb3VyY2VMb2FkZXJPcHRpb24gdG8gYXZvaWQgcGFnZSBkZWZl cnMgbG9hZGluZyBtZWNoYW5pc21zIGZvciBpbnNwZWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODcyNworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgd2lsbCBiZSB0ZXN0ZWQgc2hvcnRseSBi eSBpbnNwZWN0b3IgdGVzdHMuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkZXJPcHRp b25zLmg6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlck9wdGlvbnM6OlJlc291cmNl TG9hZGVyT3B0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlck9wdGlvbnM6 OmRlZmVyc0xvYWRpbmdQb2xpY3kpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXJP cHRpb25zOjpzZXREZWZlcnNMb2FkaW5nUG9saWN5KToKKyAgICAgICAgQWRkIGEgbmV3IHBvbGlj eSBmb3IgZGVmZXJzIGxvYWRpbmcuIFRoZSBkZWZhdWx0IGlzIHRvIGFsbG93IGRlZmVycyBsb2Fk aW5nLgorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlTG9hZGVyOjpSZXNvdXJjZUxvYWRlcik6CisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZUxvYWRlcjo6aW5pdCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRl cjo6c2V0RGVmZXJzTG9hZGluZyk6CisgICAgICAgIFJlc3BlY3QgdGhlIGRlZmVycyBsb2FkaW5n IHBvbGljeSB3aGVuZXZlciB3ZSB3b3VsZCBzZXQgZGVmZXJzIGxvYWRpbmcgc3RhdHVzLgorCisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6bG9hZFJlc291cmNlKToKKyAgICAgICAg U3dpdGNoIGZyb20gaW5jb3JyZWN0bHkgY2hhbmdpbmcgdGhlIGRlZmVyc0xvYWRpbmcgc3RhdGUg b2YgdGhlIGxvYWRlcgorICAgICAgICB0byBzZXR0aW5nIGFuIG9wdGlvbiB0byBkaXNhbGxvdyBk ZWZlcnMgbG9hZGluZyBlbnRpcmVseSBmb3IgdGhlIGxvYWRlci4KKworICAgICAgICAqIGxvYWRl ci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6 c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKToKKyAgICAgICAgKiBsb2FkZXIvTWVkaWFSZXNvdXJj ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVJlc291cmNlTG9hZGVyOjpzdGFy dCk6CisgICAgICAgICogbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpOZXRzY2FwZVBsdWdJ blN0cmVhbUxvYWRlcik6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9h ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0 VXNlckNTU1N0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2Fk ZXI6OmRlZmF1bHRDYWNoZWRSZXNvdXJjZU9wdGlvbnMpOgorICAgICAgICAqIGxvYWRlci9pY29u L0ljb25Mb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkxvYWRlcjo6c3RhcnRMb2Fk aW5nKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJD b3JlQVZGUmVzb3VyY2VMb2FkZXIubW06CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlQVZGUmVz b3VyY2VMb2FkZXI6OnN0YXJ0TG9hZGluZyk6CisgICAgICAgIEFkZCB0aGUgbmV3IHZhbHVlIHRv IGluc3RhbmNlIG9mIHRoZSBsb25naGFuZCBSZXNvdXJjZUxvYWRlck9wdGlvbnMgY29uc3RydWN0 b3IuCisKIDIwMTUtMDktMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmVuYW1lIFNoYWRvd1Jvb3Q6Omhvc3RFbGVtZW50IHRvIHNoYWRvd1Jvb3Q6Omhvc3Qg dG8gbWF0Y2ggdGhlIGxhdGVzdCBzcGVjCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggODU3OTE5OS4uNTYwNTFmNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50 LmNwcApAQCAtNzAzLDYgKzcwMyw3IEBAIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6bG9h ZFJlc291cmNlKEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nCiAgICAgVGhy ZWFkYWJsZUxvYWRlck9wdGlvbnMgb3B0aW9uczsKICAgICBvcHRpb25zLnNldFNlbmRMb2FkQ2Fs bGJhY2tzKFNlbmRDYWxsYmFja3MpOyAvLyBTbyB3ZSByZW1vdmUgdGhpcyBmcm9tIG1faGlkZGVu UmVxdWVzdElkZW50aWZpZXJzIG9uIGNvbXBsZXRpb24uCiAgICAgb3B0aW9ucy5zZXRBbGxvd0Ny ZWRlbnRpYWxzKEFsbG93U3RvcmVkQ3JlZGVudGlhbHMpOworICAgIG9wdGlvbnMuc2V0RGVmZXJz TG9hZGluZ1BvbGljeShEZWZlcnNMb2FkaW5nUG9saWN5OjpEaXNhbGxvd0RlZmVyc0xvYWRpbmcp OyAvLyBTbyB0aGUgcmVxdWVzdCBpcyBuZXZlciBkZWZlcnJlZC4KICAgICBvcHRpb25zLmNyb3Nz T3JpZ2luUmVxdWVzdFBvbGljeSA9IEFsbG93Q3Jvc3NPcmlnaW5SZXF1ZXN0czsKIAogICAgIC8v IEluc3BlY3RvclRocmVhZGFibGVMb2FkZXJDbGllbnQgZGVsZXRlcyBpdHNlbGYgd2hlbiB0aGUg bG9hZCBjb21wbGV0ZXMuCkBAIC03MTQsOCArNzE1LDYgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJj ZUFnZW50Ojpsb2FkUmVzb3VyY2UoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBTdHJp bmcKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGxvYWRlci0+c2V0RGVmZXJzTG9hZGlu ZyhmYWxzZSk7Ci0KICAgICAvLyBJZiB0aGUgbG9hZCBhbHJlYWR5IGNvbXBsZXRlZCwgaW5zcGVj dG9yVGhyZWFkYWJsZUxvYWRlckNsaWVudCB3aWxsIGhhdmUgYmVlbiBkZWxldGVkIGFuZCB3ZSB3 aWxsIGhhdmUgYWxyZWFkeSBjYWxsZWQgdGhlIGNhbGxiYWNrLgogICAgIGlmICghY2FsbGJhY2st PmlzQWN0aXZlKCkpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1l bnRMb2FkZXIuY3BwCmluZGV4IGRmNmU5MGEuLjI5Y2E4ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAtMTQzMyw3ICsxNDMzLDcgQEAgdm9pZCBEb2N1bWVu dExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKCkKICAgICAvLyBJZiB0aGlzIGlzIGEg cmVsb2FkIHRoZSBjYWNoZSBsYXllciBtaWdodCBoYXZlIG1hZGUgdGhlIHByZXZpb3VzIHJlcXVl c3QgY29uZGl0aW9uYWwuIERvY3VtZW50TG9hZGVyIGNhbid0IGhhbmRsZSAzMDQgcmVzcG9uc2Vz IGl0c2VsZi4KICAgICByZXF1ZXN0Lm1ha2VVbmNvbmRpdGlvbmFsKCk7CiAKLSAgICBzdGF0aWMg TmV2ZXJEZXN0cm95ZWQ8UmVzb3VyY2VMb2FkZXJPcHRpb25zPiBtYWluUmVzb3VyY2VMb2FkT3B0 aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIEJ1ZmZlckRhdGEsIEFsbG93U3RvcmVk Q3JlZGVudGlhbHMsIEFza0NsaWVudEZvckFsbENyZWRlbnRpYWxzLCBTa2lwU2VjdXJpdHlDaGVj aywgVXNlRGVmYXVsdE9yaWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIEluY2x1ZGVDZXJ0aWZpY2F0 ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2spOwor ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxSZXNvdXJjZUxvYWRlck9wdGlvbnM+IG1haW5SZXNv dXJjZUxvYWRPcHRpb25zKFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwg QWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIFNraXBT ZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9yVHlwZSwgSW5jbHVk ZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xp Y3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nKTsKICAgICBD YWNoZWRSZXNvdXJjZVJlcXVlc3QgY2FjaGVkUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QsIG1haW5S ZXNvdXJjZUxvYWRPcHRpb25zKTsKICAgICBjYWNoZWRSZXNvdXJjZVJlcXVlc3Quc2V0SW5pdGlh dG9yKCp0aGlzKTsKICAgICBtX21haW5SZXNvdXJjZSA9IG1fY2FjaGVkUmVzb3VyY2VMb2FkZXIt PnJlcXVlc3RNYWluUmVzb3VyY2UoY2FjaGVkUmVzb3VyY2VSZXF1ZXN0KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcAppbmRleCAxZDkyNjdlLi4yMGQy ZTZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWVkaWFSZXNvdXJjZUxvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01lZGlhUmVzb3VyY2VMb2FkZXIuY3Bw CkBAIC02MSw3ICs2MSw3IEBAIGJvb2wgTWVkaWFSZXNvdXJjZUxvYWRlcjo6c3RhcnQoY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBMb2FkT3B0aW9ucyBvcHRpCiAgICAgU3RvcmVkQ3Jl ZGVudGlhbHMgYWxsb3dDcmVkZW50aWFscyA9IG1fY3Jvc3NPcmlnaW5Nb2RlLmlzTnVsbCgpIHx8 IGVxdWFsSWdub3JpbmdDYXNlKG1fY3Jvc3NPcmlnaW5Nb2RlLCAidXNlLWNyZWRlbnRpYWxzIikg PyBBbGxvd1N0b3JlZENyZWRlbnRpYWxzIDogRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzOwog CiAgICAgLy8gQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjayBp cyBhIHBsYWNlaG9sZGVyIHZhbHVlLiBJdCBkb2VzIG5vdCBhZmZlY3QgdGhlIHJlcXVlc3Qgc2lu Y2UgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgZG9lcyBub3QgYXBwbHkgdG8gcmF3IHJlc291cmNl cy4KLSAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgY2FjaGVSZXF1ZXN0KHJlcXVlc3QsIFJlc291 cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBEb05vdFNuaWZmQ29udGVudCwgYnVmZmVy aW5nUG9saWN5LCBhbGxvd0NyZWRlbnRpYWxzLCBEb05vdEFza0NsaWVudEZvckNyb3NzT3JpZ2lu Q3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgY29yc1BvbGljeSwgRG9Ob3RJbmNsdWRlQ2Vy dGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNo ZWNrKSk7CisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IGNhY2hlUmVxdWVzdChyZXF1ZXN0LCBS ZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIGJ1 ZmZlcmluZ1BvbGljeSwgYWxsb3dDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JDcm9zc09y aWdpbkNyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIGNvcnNQb2xpY3ksIERvTm90SW5jbHVk ZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xp Y3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nKSk7CiAKICAg ICBpZiAoIW1fY3Jvc3NPcmlnaW5Nb2RlLmlzTnVsbCgpKQogICAgICAgICB1cGRhdGVSZXF1ZXN0 Rm9yQWNjZXNzQ29udHJvbChjYWNoZVJlcXVlc3QubXV0YWJsZVJlc291cmNlUmVxdWVzdCgpLCBt X2RvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCksIGFsbG93Q3JlZGVudGlhbHMpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAKaW5k ZXggYmRmNDczNy4uNGEyMTI5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL05l dHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwCkBAIC00Myw3ICs0Myw3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIC8vIEZJWE1FOiBTa2lwIENvbnRlbnQgU2VjdXJpdHkgUG9saWN5IGNoZWNr IHdoZW4gYXNzb2NpYXRlZCBwbHVnaW4gZWxlbWVudCBpcyBpbiBhIHVzZXIgYWdlbnQgc2hhZG93 IHRyZWUuCiAvLyBTZWUgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDY2NjM+LgogTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6Ok5ldHNjYXBlUGx1Z0luU3RyZWFt TG9hZGVyKEZyYW1lKiBmcmFtZSwgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXJDbGllbnQqIGNs aWVudCkKLSAgICA6IFJlc291cmNlTG9hZGVyKGZyYW1lLCBSZXNvdXJjZUxvYWRlck9wdGlvbnMo U2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBEb05vdEJ1ZmZlckRhdGEsIEFsbG93U3RvcmVk Q3JlZGVudGlhbHMsIEFza0NsaWVudEZvckFsbENyZWRlbnRpYWxzLCBTa2lwU2VjdXJpdHlDaGVj aywgVXNlRGVmYXVsdE9yaWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIERvTm90SW5jbHVkZUNlcnRp ZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVj aykpCisgICAgOiBSZXNvdXJjZUxvYWRlcihmcmFtZSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNl bmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwgRG9Ob3RCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENy ZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JBbGxDcmVkZW50aWFscywgU2tpcFNlY3VyaXR5Q2hlY2ss IFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZp Y2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ss IERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZykpCiAgICAgLCBtX2NsaWVu dChjbGllbnQpCiB7CiAjaWYgRU5BQkxFKENPTlRFTlRfRVhURU5TSU9OUykKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDQ4MmZlOTAuLjQ5OWY1ZGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcApAQCAtNjcsNyArNjcsNyBAQCBS ZXNvdXJjZUxvYWRlcjo6UmVzb3VyY2VMb2FkZXIoRnJhbWUqIGZyYW1lLCBSZXNvdXJjZUxvYWRl ck9wdGlvbnMgb3B0aW9ucykKICAgICAsIG1fcmVhY2hlZFRlcm1pbmFsU3RhdGUoZmFsc2UpCiAg ICAgLCBtX25vdGlmaWVkTG9hZENvbXBsZXRlKGZhbHNlKQogICAgICwgbV9jYW5jZWxsYXRpb25T dGF0dXMoTm90Q2FuY2VsbGVkKQotICAgICwgbV9kZWZlcnNMb2FkaW5nKGZyYW1lLT5wYWdlKCkt PmRlZmVyc0xvYWRpbmcoKSkKKyAgICAsIG1fZGVmZXJzTG9hZGluZyhvcHRpb25zLmRlZmVyc0xv YWRpbmdQb2xpY3koKSA9PSBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxvd0RlZmVyc0xvYWRpbmcg JiYgZnJhbWUtPnBhZ2UoKS0+ZGVmZXJzTG9hZGluZygpKQogICAgICwgbV9vcHRpb25zKG9wdGlv bnMpCiAgICAgLCBtX2lzUXVpY2tMb29rUmVzb3VyY2UoZmFsc2UpCiAjaWYgRU5BQkxFKENPTlRF TlRfRVhURU5TSU9OUykKQEAgLTEzNSw3ICsxMzUsOCBAQCBib29sIFJlc291cmNlTG9hZGVyOjpp bml0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcikKICAgICB9CiAjZW5kaWYKICAgICAKLSAgICBt X2RlZmVyc0xvYWRpbmcgPSBtX2ZyYW1lLT5wYWdlKCktPmRlZmVyc0xvYWRpbmcoKTsKKyAgICBt X2RlZmVyc0xvYWRpbmcgPSBtX29wdGlvbnMuZGVmZXJzTG9hZGluZ1BvbGljeSgpID09IERlZmVy c0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZyAmJiBtX2ZyYW1lLT5wYWdlKCktPmRl ZmVyc0xvYWRpbmcoKTsKKwogICAgIGlmIChtX29wdGlvbnMuc2VjdXJpdHlDaGVjaygpID09IERv U2VjdXJpdHlDaGVjayAmJiAhbV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+ Y2FuRGlzcGxheShjbGllbnRSZXF1ZXN0LnVybCgpKSkgewogICAgICAgICBGcmFtZUxvYWRlcjo6 cmVwb3J0TG9jYWxMb2FkRmFpbGVkKG1fZnJhbWUuZ2V0KCksIGNsaWVudFJlcXVlc3QudXJsKCku c3RyaW5nKCkpOwogICAgICAgICByZWxlYXNlUmVzb3VyY2VzKCk7CkBAIC0yMjAsNiArMjIxLDkg QEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6c3RhcnQoKQogCiB2b2lkIFJlc291cmNlTG9hZGVyOjpz ZXREZWZlcnNMb2FkaW5nKGJvb2wgZGVmZXJzKQogeworICAgIGlmIChtX29wdGlvbnMuZGVmZXJz TG9hZGluZ1BvbGljeSgpID09IERlZmVyc0xvYWRpbmdQb2xpY3k6OkRpc2FsbG93RGVmZXJzTG9h ZGluZykKKyAgICAgICAgcmV0dXJuOworCiAgICAgbV9kZWZlcnNMb2FkaW5nID0gZGVmZXJzOwog ICAgIGlmIChtX2hhbmRsZSkKICAgICAgICAgbV9oYW5kbGUtPnNldERlZmVyc0xvYWRpbmcoZGVm ZXJzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9w dGlvbnMuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaApp bmRleCA0OGY4NTYxLi5lYzhlODljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkZXJPcHRpb25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291 cmNlTG9hZGVyT3B0aW9ucy5oCkBAIC03MSw2ICs3MSwxMSBAQCBlbnVtIGNsYXNzIENvbnRlbnRT ZWN1cml0eVBvbGljeUltcG9zaXRpb24gOiB1aW50OF90IHsKICAgICBEb1BvbGljeUNoZWNrCiB9 OwogCitlbnVtIGNsYXNzIERlZmVyc0xvYWRpbmdQb2xpY3kgOiB1aW50OF90IHsKKyAgICBBbGxv d0RlZmVyc0xvYWRpbmcsCisgICAgRGlzYWxsb3dEZWZlcnNMb2FkaW5nCit9OworCiBzdHJ1Y3Qg UmVzb3VyY2VMb2FkZXJPcHRpb25zIHsKICAgICBSZXNvdXJjZUxvYWRlck9wdGlvbnMoKQogICAg ICAgICA6IG1fc2VuZExvYWRDYWxsYmFja3MoRG9Ob3RTZW5kQ2FsbGJhY2tzKQpAQCAtODQsNyAr ODksNyBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zIHsKICAgICB7CiAgICAgfQogCi0g ICAgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja1BvbGljeSBzZW5kTG9hZENhbGxi YWNrcywgQ29udGVudFNuaWZmaW5nUG9saWN5IHNuaWZmQ29udGVudCwgRGF0YUJ1ZmZlcmluZ1Bv bGljeSBkYXRhQnVmZmVyaW5nUG9saWN5LCBTdG9yZWRDcmVkZW50aWFscyBhbGxvd0NyZWRlbnRp YWxzLCBDbGllbnRDcmVkZW50aWFsUG9saWN5IGNyZWRlbnRpYWxQb2xpY3ksIFNlY3VyaXR5Q2hl Y2tQb2xpY3kgc2VjdXJpdHlDaGVjaywgUmVxdWVzdE9yaWdpblBvbGljeSByZXF1ZXN0T3JpZ2lu UG9saWN5LCBDZXJ0aWZpY2F0ZUluZm9Qb2xpY3kgY2VydGlmaWNhdGVJbmZvUG9saWN5LCBDb250 ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uIGNvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRp b24pCisgICAgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja1BvbGljeSBzZW5kTG9h ZENhbGxiYWNrcywgQ29udGVudFNuaWZmaW5nUG9saWN5IHNuaWZmQ29udGVudCwgRGF0YUJ1ZmZl cmluZ1BvbGljeSBkYXRhQnVmZmVyaW5nUG9saWN5LCBTdG9yZWRDcmVkZW50aWFscyBhbGxvd0Ny ZWRlbnRpYWxzLCBDbGllbnRDcmVkZW50aWFsUG9saWN5IGNyZWRlbnRpYWxQb2xpY3ksIFNlY3Vy aXR5Q2hlY2tQb2xpY3kgc2VjdXJpdHlDaGVjaywgUmVxdWVzdE9yaWdpblBvbGljeSByZXF1ZXN0 T3JpZ2luUG9saWN5LCBDZXJ0aWZpY2F0ZUluZm9Qb2xpY3kgY2VydGlmaWNhdGVJbmZvUG9saWN5 LCBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uIGNvbnRlbnRTZWN1cml0eVBvbGljeUlt cG9zaXRpb24sIERlZmVyc0xvYWRpbmdQb2xpY3kgZGVmZXJzTG9hZGluZ1BvbGljeSkKICAgICAg ICAgOiBtX3NlbmRMb2FkQ2FsbGJhY2tzKHNlbmRMb2FkQ2FsbGJhY2tzKQogICAgICAgICAsIG1f c25pZmZDb250ZW50KHNuaWZmQ29udGVudCkKICAgICAgICAgLCBtX2RhdGFCdWZmZXJpbmdQb2xp Y3koZGF0YUJ1ZmZlcmluZ1BvbGljeSkKQEAgLTk0LDYgKzk5LDcgQEAgc3RydWN0IFJlc291cmNl TG9hZGVyT3B0aW9ucyB7CiAgICAgICAgICwgbV9yZXF1ZXN0T3JpZ2luUG9saWN5KHJlcXVlc3RP cmlnaW5Qb2xpY3kpCiAgICAgICAgICwgbV9jZXJ0aWZpY2F0ZUluZm9Qb2xpY3koY2VydGlmaWNh dGVJbmZvUG9saWN5KQogICAgICAgICAsIG1fY29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlv bihjb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uKQorICAgICAgICAsIG1fZGVmZXJzTG9h ZGluZ1BvbGljeShkZWZlcnNMb2FkaW5nUG9saWN5KQogICAgIHsKICAgICB9CiAKQEAgLTExNSw2 ICsxMjEsOCBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zIHsKICAgICB2b2lkIHNldENl cnRpZmljYXRlSW5mb1BvbGljeShDZXJ0aWZpY2F0ZUluZm9Qb2xpY3kgcG9saWN5KSB7IG1fY2Vy dGlmaWNhdGVJbmZvUG9saWN5ID0gcG9saWN5OyB9CiAgICAgQ29udGVudFNlY3VyaXR5UG9saWN5 SW1wb3NpdGlvbiBjb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uKCkgY29uc3QgeyByZXR1 cm4gbV9jb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOyB9CiAgICAgdm9pZCBzZXRDb250 ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uKENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRp b24gaW1wb3NpdGlvbikgeyBtX2NvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24gPSBpbXBv c2l0aW9uOyB9CisgICAgRGVmZXJzTG9hZGluZ1BvbGljeSBkZWZlcnNMb2FkaW5nUG9saWN5KCkg Y29uc3QgeyByZXR1cm4gbV9kZWZlcnNMb2FkaW5nUG9saWN5OyB9CisgICAgdm9pZCBzZXREZWZl cnNMb2FkaW5nUG9saWN5KERlZmVyc0xvYWRpbmdQb2xpY3kgZGVmZXJzTG9hZGluZ1BvbGljeSkg eyBtX2RlZmVyc0xvYWRpbmdQb2xpY3kgPSBkZWZlcnNMb2FkaW5nUG9saWN5OyB9CiAKICAgICB1 bnNpZ25lZCBtX3NlbmRMb2FkQ2FsbGJhY2tzIDogMTsKICAgICB1bnNpZ25lZCBtX3NuaWZmQ29u dGVudCA6IDE7CkBAIC0xMjUsNiArMTMzLDcgQEAgc3RydWN0IFJlc291cmNlTG9hZGVyT3B0aW9u cyB7CiAgICAgdW5zaWduZWQgbV9yZXF1ZXN0T3JpZ2luUG9saWN5IDogMjsKICAgICB1bnNpZ25l ZCBtX2NlcnRpZmljYXRlSW5mb1BvbGljeSA6IDE7IC8vIFdoZXRoZXIgdGhlIHJlc3BvbnNlIHNo b3VsZCBpbmNsdWRlIGNlcnRpZmljYXRlIGluZm8uCiAgICAgQ29udGVudFNlY3VyaXR5UG9saWN5 SW1wb3NpdGlvbiBtX2NvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24geyBDb250ZW50U2Vj dXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrIH07CisgICAgRGVmZXJzTG9hZGlu Z1BvbGljeSBtX2RlZmVyc0xvYWRpbmdQb2xpY3kgeyBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxv d0RlZmVyc0xvYWRpbmcgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUgICAgCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNw cAppbmRleCA5YWNmODI2Li5lZDY1NTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTIzMyw3ICsyMzMsNyBAQCBD YWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRDU1NTdHlsZVNoZWV0PiBDYWNoZWRSZXNvdXJjZUxv YWRlcjo6cmVxdWVzdFVzZXJDU1NTdAogICAgIG1lbW9yeUNhY2hlLmFkZCgqdXNlclNoZWV0KTsK ICAgICAvLyBGSVhNRTogbG9hZFJlc291cmNlIGNhbGxzIHNldE93bmluZ0NhY2hlZFJlc291cmNl TG9hZGVyKCkgaWYgdGhlIHJlc291cmNlIGNvdWxkbid0IGJlIGFkZGVkIHRvIGNhY2hlLiBEb2Vz IHRoaXMgZnVuY3Rpb24gbmVlZCB0byBjYWxsIGl0LCB0b28/CiAKLSAgICB1c2VyU2hlZXQtPmxv YWQoKnRoaXMsIFJlc291cmNlTG9hZGVyT3B0aW9ucyhEb05vdFNlbmRDYWxsYmFja3MsIFNuaWZm Q29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9y QWxsQ3JlZGVudGlhbHMsIFNraXBTZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJp Y3Rpb25zRm9yVHlwZSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJp dHlQb2xpY3lJbXBvc2l0aW9uOjpTa2lwUG9saWN5Q2hlY2spKTsKKyAgICB1c2VyU2hlZXQtPmxv YWQoKnRoaXMsIFJlc291cmNlTG9hZGVyT3B0aW9ucyhEb05vdFNlbmRDYWxsYmFja3MsIFNuaWZm Q29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9y QWxsQ3JlZGVudGlhbHMsIFNraXBTZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJp Y3Rpb25zRm9yVHlwZSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJp dHlQb2xpY3lJbXBvc2l0aW9uOjpTa2lwUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6 OkFsbG93RGVmZXJzTG9hZGluZykpOwogICAgIAogICAgIHJldHVybiB1c2VyU2hlZXQ7CiB9CkBA IC0xMTM5LDcgKzExMzksNyBAQCB2b2lkIENhY2hlZFJlc291cmNlTG9hZGVyOjpwcmludFByZWxv YWRTdGF0cygpCiAKIGNvbnN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyYgQ2FjaGVkUmVzb3VyY2VM b2FkZXI6OmRlZmF1bHRDYWNoZWRSZXNvdXJjZU9wdGlvbnMoKQogewotICAgIHN0YXRpYyBSZXNv dXJjZUxvYWRlck9wdGlvbnMgb3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIEJ1 ZmZlckRhdGEsIEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIEFza0NsaWVudEZvckFsbENyZWRlbnRp YWxzLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBl LCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9z aXRpb246OkRvUG9saWN5Q2hlY2spOworICAgIHN0YXRpYyBSZXNvdXJjZUxvYWRlck9wdGlvbnMg b3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIEJ1ZmZlckRhdGEsIEFsbG93U3Rv cmVkQ3JlZGVudGlhbHMsIEFza0NsaWVudEZvckFsbENyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hl Y2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0 aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hl Y2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZyk7CiAgICAgcmV0dXJu IG9wdGlvbnM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0lj b25Mb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkxvYWRlci5jcHAK aW5kZXggZjdjYTgwMi4uZTgyNmE5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L2ljb24vSWNvbkxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNv bkxvYWRlci5jcHAKQEAgLTU5LDcgKzU5LDcgQEAgdm9pZCBJY29uTG9hZGVyOjpzdGFydExvYWRp bmcoKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBv c2l0aW9uOjpEb1BvbGljeUNoZWNrIGlzIGEgcGxhY2Vob2xkZXIgdmFsdWUuIEl0IGRvZXMgbm90 IGFmZmVjdCB0aGUgcmVxdWVzdCBzaW5jZSBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBkb2VzIG5v dCBhcHBseSB0byByYXcgcmVzb3VyY2VzLgotICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1 ZXN0KFJlc291cmNlUmVxdWVzdChtX2ZyYW1lLmxvYWRlcigpLmljb24oKS51cmwoKSksIFJlc291 cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIEJ1ZmZlckRhdGEs IERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JBbnlDcmVkZW50 aWFscywgRG9TZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9yVHlw ZSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBv c2l0aW9uOjpEb1BvbGljeUNoZWNrKSk7CisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVl c3QoUmVzb3VyY2VSZXF1ZXN0KG1fZnJhbWUubG9hZGVyKCkuaWNvbigpLnVybCgpKSwgUmVzb3Vy Y2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwg RG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRp YWxzLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBl LCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9z aXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9h ZGluZykpOwogCiAgICAgcmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1ZXN0KCkuc2V0UHJpb3Jp dHkoUmVzb3VyY2VMb2FkUHJpb3JpdHk6Okxvdyk7CiAgICAgcmVxdWVzdC5zZXRJbml0aWF0b3Io Y2FjaGVkUmVzb3VyY2VSZXF1ZXN0SW5pdGlhdG9ycygpLmljb24pOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFW RlJlc291cmNlTG9hZGVyLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1tCmluZGV4IDI3ODI1NTEu LmZjMWU0OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVz b3VyY2VMb2FkZXIubW0KQEAgLTY4LDcgKzY4LDcgQEAgdm9pZCBXZWJDb3JlQVZGUmVzb3VyY2VM b2FkZXI6OnN0YXJ0TG9hZGluZygpCiAgICAgVVJMIHJlcXVlc3RVUkwgPSBbW21fYXZSZXF1ZXN0 LmdldCgpIHJlcXVlc3RdIFVSTF07CiAKICAgICAvLyBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBv c2l0aW9uOjpEb1BvbGljeUNoZWNrIGlzIGEgcGxhY2Vob2xkZXIgdmFsdWUuIEl0IGRvZXMgbm90 IGFmZmVjdCB0aGUgcmVxdWVzdCBzaW5jZSBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBkb2VzIG5v dCBhcHBseSB0byByYXcgcmVzb3VyY2VzLgotICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1 ZXN0KFJlc291cmNlUmVxdWVzdChyZXF1ZXN0VVJMKSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNl bmRDYWxsYmFja3MsIERvTm90U25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBEb05vdEFsbG93U3Rv cmVkQ3JlZGVudGlhbHMsIERvTm90QXNrQ2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscywg RG9TZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9yVHlwZSwgRG9O b3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9u OjpEb1BvbGljeUNoZWNrKSk7CisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoUmVz b3VyY2VSZXF1ZXN0KHJlcXVlc3RVUkwpLCBSZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxi YWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIEJ1ZmZlckRhdGEsIERvTm90QWxsb3dTdG9yZWRDcmVk ZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JDcm9zc09yaWdpbkNyZWRlbnRpYWxzLCBEb1NlY3Vy aXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1 ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9s aWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZykpOwogCiAg ICAgcmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1ZXN0KCkuc2V0UHJpb3JpdHkoUmVzb3VyY2VM b2FkUHJpb3JpdHk6Okxvdyk7CiAgICAgQ2FjaGVkUmVzb3VyY2VMb2FkZXIqIGxvYWRlciA9IG1f cGFyZW50LT5wbGF5ZXIoKS0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKTsK 260466 2015-09-02 18:11:40 -0700 2015-09-05 01:47:30 -0700 [PATCH] Proposed Fix loader-options-2.patch text/plain 18709 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwODEwNWQ2Li4zYTRlYzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDYg QEAKKzIwMTUtMDktMDIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBBZGQgYSBuZXcgUmVzb3VyY2VMb2FkZXJPcHRpb24gdG8gYXZvaWQgcGFnZSBkZWZl cnMgbG9hZGluZyBtZWNoYW5pc21zIGZvciBpbnNwZWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODcyNworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgd2lsbCBiZSB0ZXN0ZWQgc2hvcnRseSBi eSBpbnNwZWN0b3IgdGVzdHMuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkZXJPcHRp b25zLmg6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlck9wdGlvbnM6OlJlc291cmNl TG9hZGVyT3B0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlck9wdGlvbnM6 OmRlZmVyc0xvYWRpbmdQb2xpY3kpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXJP cHRpb25zOjpzZXREZWZlcnNMb2FkaW5nUG9saWN5KToKKyAgICAgICAgQWRkIGEgbmV3IHBvbGlj eSBmb3IgZGVmZXJzIGxvYWRpbmcuIFRoZSBkZWZhdWx0IGlzIHRvIGFsbG93IGRlZmVycyBsb2Fk aW5nLgorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlTG9hZGVyOjpSZXNvdXJjZUxvYWRlcik6CisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZUxvYWRlcjo6aW5pdCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRl cjo6c2V0RGVmZXJzTG9hZGluZyk6CisgICAgICAgIFJlc3BlY3QgdGhlIGRlZmVycyBsb2FkaW5n IHBvbGljeSB3aGVuZXZlciB3ZSB3b3VsZCBzZXQgZGVmZXJzIGxvYWRpbmcgc3RhdHVzLgorCisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6bG9hZFJlc291cmNlKToKKyAgICAgICAg U3dpdGNoIGZyb20gaW5jb3JyZWN0bHkgY2hhbmdpbmcgdGhlIGRlZmVyc0xvYWRpbmcgc3RhdGUg b2YgdGhlIGxvYWRlcgorICAgICAgICB0byBzZXR0aW5nIGFuIG9wdGlvbiB0byBkaXNhbGxvdyBk ZWZlcnMgbG9hZGluZyBlbnRpcmVseSBmb3IgdGhlIGxvYWRlci4KKworICAgICAgICAqIGxvYWRl ci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6 c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKToKKyAgICAgICAgKiBsb2FkZXIvTWVkaWFSZXNvdXJj ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVJlc291cmNlTG9hZGVyOjpzdGFy dCk6CisgICAgICAgICogbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpOZXRzY2FwZVBsdWdJ blN0cmVhbUxvYWRlcik6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9h ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0 VXNlckNTU1N0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2Fk ZXI6OmRlZmF1bHRDYWNoZWRSZXNvdXJjZU9wdGlvbnMpOgorICAgICAgICAqIGxvYWRlci9pY29u L0ljb25Mb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkxvYWRlcjo6c3RhcnRMb2Fk aW5nKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvV2ViQ29y ZUFWQ0ZSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlQVZDRlJl c291cmNlTG9hZGVyOjpzdGFydExvYWRpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbToKKyAgICAgICAg KFdlYkNvcmU6OldlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6c3RhcnRMb2FkaW5nKToKKyAgICAg ICAgQWRkIHRoZSBuZXcgdmFsdWUgdG8gaW5zdGFuY2Ugb2YgdGhlIGxvbmdoYW5kIFJlc291cmNl TG9hZGVyT3B0aW9ucyBjb25zdHJ1Y3Rvci4KKwogMjAxNS0wOS0wMSAgUnlvc3VrZSBOaXdhICA8 cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZW5hbWUgU2hhZG93Um9vdDo6aG9zdEVsZW1l bnQgdG8gc2hhZG93Um9vdDo6aG9zdCB0byBtYXRjaCB0aGUgbGF0ZXN0IHNwZWMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAppbmRl eCA4NTc5MTk5Li41NjA1MWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCkBAIC03MDMsNiArNzAzLDcgQEAgdm9pZCBJbnNw ZWN0b3JSZXNvdXJjZUFnZW50Ojpsb2FkUmVzb3VyY2UoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5n LCBjb25zdCBTdHJpbmcKICAgICBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyBvcHRpb25zOwogICAg IG9wdGlvbnMuc2V0U2VuZExvYWRDYWxsYmFja3MoU2VuZENhbGxiYWNrcyk7IC8vIFNvIHdlIHJl bW92ZSB0aGlzIGZyb20gbV9oaWRkZW5SZXF1ZXN0SWRlbnRpZmllcnMgb24gY29tcGxldGlvbi4K ICAgICBvcHRpb25zLnNldEFsbG93Q3JlZGVudGlhbHMoQWxsb3dTdG9yZWRDcmVkZW50aWFscyk7 CisgICAgb3B0aW9ucy5zZXREZWZlcnNMb2FkaW5nUG9saWN5KERlZmVyc0xvYWRpbmdQb2xpY3k6 OkRpc2FsbG93RGVmZXJzTG9hZGluZyk7IC8vIFNvIHRoZSByZXF1ZXN0IGlzIG5ldmVyIGRlZmVy cmVkLgogICAgIG9wdGlvbnMuY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5ID0gQWxsb3dDcm9zc09y aWdpblJlcXVlc3RzOwogCiAgICAgLy8gSW5zcGVjdG9yVGhyZWFkYWJsZUxvYWRlckNsaWVudCBk ZWxldGVzIGl0c2VsZiB3aGVuIHRoZSBsb2FkIGNvbXBsZXRlcy4KQEAgLTcxNCw4ICs3MTUsNiBA QCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmxvYWRSZXNvdXJjZShFcnJvclN0cmluZyYg ZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAg bG9hZGVyLT5zZXREZWZlcnNMb2FkaW5nKGZhbHNlKTsKLQogICAgIC8vIElmIHRoZSBsb2FkIGFs cmVhZHkgY29tcGxldGVkLCBpbnNwZWN0b3JUaHJlYWRhYmxlTG9hZGVyQ2xpZW50IHdpbGwgaGF2 ZSBiZWVuIGRlbGV0ZWQgYW5kIHdlIHdpbGwgaGF2ZSBhbHJlYWR5IGNhbGxlZCB0aGUgY2FsbGJh Y2suCiAgICAgaWYgKCFjYWxsYmFjay0+aXNBY3RpdmUoKSkKICAgICAgICAgcmV0dXJuOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKaW5kZXggZGY2ZTkwYS4uMjljYThl YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC0xNDMzLDcg KzE0MzMsNyBAQCB2b2lkIERvY3VtZW50TG9hZGVyOjpzdGFydExvYWRpbmdNYWluUmVzb3VyY2Uo KQogICAgIC8vIElmIHRoaXMgaXMgYSByZWxvYWQgdGhlIGNhY2hlIGxheWVyIG1pZ2h0IGhhdmUg bWFkZSB0aGUgcHJldmlvdXMgcmVxdWVzdCBjb25kaXRpb25hbC4gRG9jdW1lbnRMb2FkZXIgY2Fu J3QgaGFuZGxlIDMwNCByZXNwb25zZXMgaXRzZWxmLgogICAgIHJlcXVlc3QubWFrZVVuY29uZGl0 aW9uYWwoKTsKIAotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxSZXNvdXJjZUxvYWRlck9wdGlv bnM+IG1haW5SZXNvdXJjZUxvYWRPcHRpb25zKFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwg QnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVu dGlhbHMsIFNraXBTZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9y VHlwZSwgSW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3Np dGlvbjo6RG9Qb2xpY3lDaGVjayk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFJlc291cmNl TG9hZGVyT3B0aW9ucz4gbWFpblJlc291cmNlTG9hZE9wdGlvbnMoU2VuZENhbGxiYWNrcywgU25p ZmZDb250ZW50LCBCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBBc2tDbGllbnRG b3JBbGxDcmVkZW50aWFscywgU2tpcFNlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0 cmljdGlvbnNGb3JUeXBlLCBJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJpdHlQ b2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrLCBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxv d0RlZmVyc0xvYWRpbmcpOwogICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCBjYWNoZWRSZXNvdXJj ZVJlcXVlc3QocmVxdWVzdCwgbWFpblJlc291cmNlTG9hZE9wdGlvbnMpOwogICAgIGNhY2hlZFJl c291cmNlUmVxdWVzdC5zZXRJbml0aWF0b3IoKnRoaXMpOwogICAgIG1fbWFpblJlc291cmNlID0g bV9jYWNoZWRSZXNvdXJjZUxvYWRlci0+cmVxdWVzdE1haW5SZXNvdXJjZShjYWNoZWRSZXNvdXJj ZVJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL01lZGlhUmVzb3Vy Y2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01lZGlhUmVzb3VyY2VMb2FkZXIu Y3BwCmluZGV4IDFkOTI2N2UuLjIwZDJlNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv TWVkaWFSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTYxLDcgKzYxLDcgQEAgYm9vbCBNZWRpYVJlc291 cmNlTG9hZGVyOjpzdGFydChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIExvYWRPcHRp b25zIG9wdGkKICAgICBTdG9yZWRDcmVkZW50aWFscyBhbGxvd0NyZWRlbnRpYWxzID0gbV9jcm9z c09yaWdpbk1vZGUuaXNOdWxsKCkgfHwgZXF1YWxJZ25vcmluZ0Nhc2UobV9jcm9zc09yaWdpbk1v ZGUsICJ1c2UtY3JlZGVudGlhbHMiKSA/IEFsbG93U3RvcmVkQ3JlZGVudGlhbHMgOiBEb05vdEFs bG93U3RvcmVkQ3JlZGVudGlhbHM7CiAKICAgICAvLyBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBv c2l0aW9uOjpEb1BvbGljeUNoZWNrIGlzIGEgcGxhY2Vob2xkZXIgdmFsdWUuIEl0IGRvZXMgbm90 IGFmZmVjdCB0aGUgcmVxdWVzdCBzaW5jZSBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBkb2VzIG5v dCBhcHBseSB0byByYXcgcmVzb3VyY2VzLgotICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCBjYWNo ZVJlcXVlc3QocmVxdWVzdCwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIERv Tm90U25pZmZDb250ZW50LCBidWZmZXJpbmdQb2xpY3ksIGFsbG93Q3JlZGVudGlhbHMsIERvTm90 QXNrQ2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscywgRG9TZWN1cml0eUNoZWNrLCBjb3Jz UG9saWN5LCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGlj eUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2spKTsKKyAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3Qg Y2FjaGVSZXF1ZXN0KHJlcXVlc3QsIFJlc291cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tz LCBEb05vdFNuaWZmQ29udGVudCwgYnVmZmVyaW5nUG9saWN5LCBhbGxvd0NyZWRlbnRpYWxzLCBE b05vdEFza0NsaWVudEZvckNyb3NzT3JpZ2luQ3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywg Y29yc1BvbGljeSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJpdHlQ b2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrLCBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxv d0RlZmVyc0xvYWRpbmcpKTsKIAogICAgIGlmICghbV9jcm9zc09yaWdpbk1vZGUuaXNOdWxsKCkp CiAgICAgICAgIHVwZGF0ZVJlcXVlc3RGb3JBY2Nlc3NDb250cm9sKGNhY2hlUmVxdWVzdC5tdXRh YmxlUmVzb3VyY2VSZXF1ZXN0KCksIG1fZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKSwgYWxsb3dD cmVkZW50aWFscyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQ bHVnSW5TdHJlYW1Mb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05ldHNjYXBlUGx1 Z0luU3RyZWFtTG9hZGVyLmNwcAppbmRleCBiZGY0NzM3Li40YTIxMjkxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAKQEAg LTQzLDcgKzQzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogLy8gRklYTUU6IFNraXAgQ29udGVu dCBTZWN1cml0eSBQb2xpY3kgY2hlY2sgd2hlbiBhc3NvY2lhdGVkIHBsdWdpbiBlbGVtZW50IGlz IGluIGEgdXNlciBhZ2VudCBzaGFkb3cgdHJlZS4KIC8vIFNlZSA8aHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjY2Mz4uCiBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRl cjo6TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIoRnJhbWUqIGZyYW1lLCBOZXRzY2FwZVBsdWdJ blN0cmVhbUxvYWRlckNsaWVudCogY2xpZW50KQotICAgIDogUmVzb3VyY2VMb2FkZXIoZnJhbWUs IFJlc291cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIERvTm90 QnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVu dGlhbHMsIFNraXBTZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9y VHlwZSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJpdHlQb2xpY3lJ bXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrKSkKKyAgICA6IFJlc291cmNlTG9hZGVyKGZyYW1lLCBS ZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBEb05vdEJ1 ZmZlckRhdGEsIEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIEFza0NsaWVudEZvckFsbENyZWRlbnRp YWxzLCBTa2lwU2VjdXJpdHlDaGVjaywgVXNlRGVmYXVsdE9yaWdpblJlc3RyaWN0aW9uc0ZvclR5 cGUsIERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1w b3NpdGlvbjo6RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNM b2FkaW5nKSkKICAgICAsIG1fY2xpZW50KGNsaWVudCkKIHsKICNpZiBFTkFCTEUoQ09OVEVOVF9F WFRFTlNJT05TKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAKaW5kZXgg NDgyZmU5MC4uNDk5ZjVkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291 cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIu Y3BwCkBAIC02Nyw3ICs2Nyw3IEBAIFJlc291cmNlTG9hZGVyOjpSZXNvdXJjZUxvYWRlcihGcmFt ZSogZnJhbWUsIFJlc291cmNlTG9hZGVyT3B0aW9ucyBvcHRpb25zKQogICAgICwgbV9yZWFjaGVk VGVybWluYWxTdGF0ZShmYWxzZSkKICAgICAsIG1fbm90aWZpZWRMb2FkQ29tcGxldGUoZmFsc2Up CiAgICAgLCBtX2NhbmNlbGxhdGlvblN0YXR1cyhOb3RDYW5jZWxsZWQpCi0gICAgLCBtX2RlZmVy c0xvYWRpbmcoZnJhbWUtPnBhZ2UoKS0+ZGVmZXJzTG9hZGluZygpKQorICAgICwgbV9kZWZlcnNM b2FkaW5nKG9wdGlvbnMuZGVmZXJzTG9hZGluZ1BvbGljeSgpID09IERlZmVyc0xvYWRpbmdQb2xp Y3k6OkFsbG93RGVmZXJzTG9hZGluZyAmJiBmcmFtZS0+cGFnZSgpLT5kZWZlcnNMb2FkaW5nKCkp CiAgICAgLCBtX29wdGlvbnMob3B0aW9ucykKICAgICAsIG1faXNRdWlja0xvb2tSZXNvdXJjZShm YWxzZSkKICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQpAQCAtMTM1LDcgKzEzNSw4IEBA IGJvb2wgUmVzb3VyY2VMb2FkZXI6OmluaXQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByKQogICAg IH0KICNlbmRpZgogICAgIAotICAgIG1fZGVmZXJzTG9hZGluZyA9IG1fZnJhbWUtPnBhZ2UoKS0+ ZGVmZXJzTG9hZGluZygpOworICAgIG1fZGVmZXJzTG9hZGluZyA9IG1fb3B0aW9ucy5kZWZlcnNM b2FkaW5nUG9saWN5KCkgPT0gRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5n ICYmIG1fZnJhbWUtPnBhZ2UoKS0+ZGVmZXJzTG9hZGluZygpOworCiAgICAgaWYgKG1fb3B0aW9u cy5zZWN1cml0eUNoZWNrKCkgPT0gRG9TZWN1cml0eUNoZWNrICYmICFtX2ZyYW1lLT5kb2N1bWVu dCgpLT5zZWN1cml0eU9yaWdpbigpLT5jYW5EaXNwbGF5KGNsaWVudFJlcXVlc3QudXJsKCkpKSB7 CiAgICAgICAgIEZyYW1lTG9hZGVyOjpyZXBvcnRMb2NhbExvYWRGYWlsZWQobV9mcmFtZS5nZXQo KSwgY2xpZW50UmVxdWVzdC51cmwoKS5zdHJpbmcoKSk7CiAgICAgICAgIHJlbGVhc2VSZXNvdXJj ZXMoKTsKQEAgLTIyMCw2ICsyMjEsOSBAQCB2b2lkIFJlc291cmNlTG9hZGVyOjpzdGFydCgpCiAK IHZvaWQgUmVzb3VyY2VMb2FkZXI6OnNldERlZmVyc0xvYWRpbmcoYm9vbCBkZWZlcnMpCiB7Cisg ICAgaWYgKG1fb3B0aW9ucy5kZWZlcnNMb2FkaW5nUG9saWN5KCkgPT0gRGVmZXJzTG9hZGluZ1Bv bGljeTo6RGlzYWxsb3dEZWZlcnNMb2FkaW5nKQorICAgICAgICByZXR1cm47CisKICAgICBtX2Rl ZmVyc0xvYWRpbmcgPSBkZWZlcnM7CiAgICAgaWYgKG1faGFuZGxlKQogICAgICAgICBtX2hhbmRs ZS0+c2V0RGVmZXJzTG9hZGluZyhkZWZlcnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL1Jlc291cmNlTG9hZGVyT3B0aW9ucy5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZGVyT3B0aW9ucy5oCmluZGV4IDQ4Zjg1NjEuLmVjOGU4OWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXJPcHRpb25zLmgKQEAgLTcxLDYgKzcxLDEx IEBAIGVudW0gY2xhc3MgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiA6IHVpbnQ4X3Qg ewogICAgIERvUG9saWN5Q2hlY2sKIH07CiAKK2VudW0gY2xhc3MgRGVmZXJzTG9hZGluZ1BvbGlj eSA6IHVpbnQ4X3QgeworICAgIEFsbG93RGVmZXJzTG9hZGluZywKKyAgICBEaXNhbGxvd0RlZmVy c0xvYWRpbmcKK307CisKIHN0cnVjdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMgewogICAgIFJlc291 cmNlTG9hZGVyT3B0aW9ucygpCiAgICAgICAgIDogbV9zZW5kTG9hZENhbGxiYWNrcyhEb05vdFNl bmRDYWxsYmFja3MpCkBAIC04NCw3ICs4OSw3IEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRlck9wdGlv bnMgewogICAgIHsKICAgICB9CiAKLSAgICBSZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxi YWNrUG9saWN5IHNlbmRMb2FkQ2FsbGJhY2tzLCBDb250ZW50U25pZmZpbmdQb2xpY3kgc25pZmZD b250ZW50LCBEYXRhQnVmZmVyaW5nUG9saWN5IGRhdGFCdWZmZXJpbmdQb2xpY3ksIFN0b3JlZENy ZWRlbnRpYWxzIGFsbG93Q3JlZGVudGlhbHMsIENsaWVudENyZWRlbnRpYWxQb2xpY3kgY3JlZGVu dGlhbFBvbGljeSwgU2VjdXJpdHlDaGVja1BvbGljeSBzZWN1cml0eUNoZWNrLCBSZXF1ZXN0T3Jp Z2luUG9saWN5IHJlcXVlc3RPcmlnaW5Qb2xpY3ksIENlcnRpZmljYXRlSW5mb1BvbGljeSBjZXJ0 aWZpY2F0ZUluZm9Qb2xpY3ksIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24gY29udGVu dFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbikKKyAgICBSZXNvdXJjZUxvYWRlck9wdGlvbnMoU2Vu ZENhbGxiYWNrUG9saWN5IHNlbmRMb2FkQ2FsbGJhY2tzLCBDb250ZW50U25pZmZpbmdQb2xpY3kg c25pZmZDb250ZW50LCBEYXRhQnVmZmVyaW5nUG9saWN5IGRhdGFCdWZmZXJpbmdQb2xpY3ksIFN0 b3JlZENyZWRlbnRpYWxzIGFsbG93Q3JlZGVudGlhbHMsIENsaWVudENyZWRlbnRpYWxQb2xpY3kg Y3JlZGVudGlhbFBvbGljeSwgU2VjdXJpdHlDaGVja1BvbGljeSBzZWN1cml0eUNoZWNrLCBSZXF1 ZXN0T3JpZ2luUG9saWN5IHJlcXVlc3RPcmlnaW5Qb2xpY3ksIENlcnRpZmljYXRlSW5mb1BvbGlj eSBjZXJ0aWZpY2F0ZUluZm9Qb2xpY3ksIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24g Y29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiwgRGVmZXJzTG9hZGluZ1BvbGljeSBkZWZl cnNMb2FkaW5nUG9saWN5KQogICAgICAgICA6IG1fc2VuZExvYWRDYWxsYmFja3Moc2VuZExvYWRD YWxsYmFja3MpCiAgICAgICAgICwgbV9zbmlmZkNvbnRlbnQoc25pZmZDb250ZW50KQogICAgICAg ICAsIG1fZGF0YUJ1ZmZlcmluZ1BvbGljeShkYXRhQnVmZmVyaW5nUG9saWN5KQpAQCAtOTQsNiAr OTksNyBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zIHsKICAgICAgICAgLCBtX3JlcXVl c3RPcmlnaW5Qb2xpY3kocmVxdWVzdE9yaWdpblBvbGljeSkKICAgICAgICAgLCBtX2NlcnRpZmlj YXRlSW5mb1BvbGljeShjZXJ0aWZpY2F0ZUluZm9Qb2xpY3kpCiAgICAgICAgICwgbV9jb250ZW50 U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uKGNvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24p CisgICAgICAgICwgbV9kZWZlcnNMb2FkaW5nUG9saWN5KGRlZmVyc0xvYWRpbmdQb2xpY3kpCiAg ICAgewogICAgIH0KIApAQCAtMTE1LDYgKzEyMSw4IEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRlck9w dGlvbnMgewogICAgIHZvaWQgc2V0Q2VydGlmaWNhdGVJbmZvUG9saWN5KENlcnRpZmljYXRlSW5m b1BvbGljeSBwb2xpY3kpIHsgbV9jZXJ0aWZpY2F0ZUluZm9Qb2xpY3kgPSBwb2xpY3k7IH0KICAg ICBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uIGNvbnRlbnRTZWN1cml0eVBvbGljeUlt cG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRp b247IH0KICAgICB2b2lkIHNldENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24oQ29udGVu dFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiBpbXBvc2l0aW9uKSB7IG1fY29udGVudFNlY3VyaXR5 UG9saWN5SW1wb3NpdGlvbiA9IGltcG9zaXRpb247IH0KKyAgICBEZWZlcnNMb2FkaW5nUG9saWN5 IGRlZmVyc0xvYWRpbmdQb2xpY3koKSBjb25zdCB7IHJldHVybiBtX2RlZmVyc0xvYWRpbmdQb2xp Y3k7IH0KKyAgICB2b2lkIHNldERlZmVyc0xvYWRpbmdQb2xpY3koRGVmZXJzTG9hZGluZ1BvbGlj eSBkZWZlcnNMb2FkaW5nUG9saWN5KSB7IG1fZGVmZXJzTG9hZGluZ1BvbGljeSA9IGRlZmVyc0xv YWRpbmdQb2xpY3k7IH0KIAogICAgIHVuc2lnbmVkIG1fc2VuZExvYWRDYWxsYmFja3MgOiAxOwog ICAgIHVuc2lnbmVkIG1fc25pZmZDb250ZW50IDogMTsKQEAgLTEyNSw2ICsxMzMsNyBAQCBzdHJ1 Y3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zIHsKICAgICB1bnNpZ25lZCBtX3JlcXVlc3RPcmlnaW5Q b2xpY3kgOiAyOwogICAgIHVuc2lnbmVkIG1fY2VydGlmaWNhdGVJbmZvUG9saWN5IDogMTsgLy8g V2hldGhlciB0aGUgcmVzcG9uc2Ugc2hvdWxkIGluY2x1ZGUgY2VydGlmaWNhdGUgaW5mby4KICAg ICBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uIG1fY29udGVudFNlY3VyaXR5UG9saWN5 SW1wb3NpdGlvbiB7IENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hl Y2sgfTsKKyAgICBEZWZlcnNMb2FkaW5nUG9saWN5IG1fZGVmZXJzTG9hZGluZ1BvbGljeSB7IERl ZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZyB9OwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZSAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDlhY2Y4MjYuLmVkNjU1MTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNw cApAQCAtMjMzLDcgKzIzMyw3IEBAIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZENTU1N0eWxl U2hlZXQ+IENhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0VXNlckNTU1N0CiAgICAgbWVtb3J5 Q2FjaGUuYWRkKCp1c2VyU2hlZXQpOwogICAgIC8vIEZJWE1FOiBsb2FkUmVzb3VyY2UgY2FsbHMg c2V0T3duaW5nQ2FjaGVkUmVzb3VyY2VMb2FkZXIoKSBpZiB0aGUgcmVzb3VyY2UgY291bGRuJ3Qg YmUgYWRkZWQgdG8gY2FjaGUuIERvZXMgdGhpcyBmdW5jdGlvbiBuZWVkIHRvIGNhbGwgaXQsIHRv bz8KIAotICAgIHVzZXJTaGVldC0+bG9hZCgqdGhpcywgUmVzb3VyY2VMb2FkZXJPcHRpb25zKERv Tm90U2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENy ZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JBbGxDcmVkZW50aWFscywgU2tpcFNlY3VyaXR5Q2hlY2ss IFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZp Y2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OlNraXBQb2xpY3lDaGVj aykpOworICAgIHVzZXJTaGVldC0+bG9hZCgqdGhpcywgUmVzb3VyY2VMb2FkZXJPcHRpb25zKERv Tm90U2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENy ZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JBbGxDcmVkZW50aWFscywgU2tpcFNlY3VyaXR5Q2hlY2ss IFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZp Y2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OlNraXBQb2xpY3lDaGVj aywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nKSk7CiAgICAgCiAgICAg cmV0dXJuIHVzZXJTaGVldDsKIH0KQEAgLTExMzksNyArMTEzOSw3IEBAIHZvaWQgQ2FjaGVkUmVz b3VyY2VMb2FkZXI6OnByaW50UHJlbG9hZFN0YXRzKCkKIAogY29uc3QgUmVzb3VyY2VMb2FkZXJP cHRpb25zJiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6ZGVmYXVsdENhY2hlZFJlc291cmNlT3B0aW9u cygpCiB7Ci0gICAgc3RhdGljIFJlc291cmNlTG9hZGVyT3B0aW9ucyBvcHRpb25zKFNlbmRDYWxs YmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywg QXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgVXNlRGVmYXVsdE9y aWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29u dGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjayk7CisgICAgc3RhdGlj IFJlc291cmNlTG9hZGVyT3B0aW9ucyBvcHRpb25zKFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVu dCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3Jl ZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgVXNlRGVmYXVsdE9yaWdpblJlc3RyaWN0aW9uc0Zv clR5cGUsIERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5 SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZl cnNMb2FkaW5nKTsKICAgICByZXR1cm4gb3B0aW9uczsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvaWNvbi9JY29uTG9hZGVyLmNwcAppbmRleCBmN2NhODAyLi5lODI2YTljIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uTG9hZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uTG9hZGVyLmNwcApAQCAtNTksNyArNTksNyBAQCB2b2lk IEljb25Mb2FkZXI6OnN0YXJ0TG9hZGluZygpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIENv bnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2sgaXMgYSBwbGFjZWhv bGRlciB2YWx1ZS4gSXQgZG9lcyBub3QgYWZmZWN0IHRoZSByZXF1ZXN0IHNpbmNlIENvbnRlbnQg U2VjdXJpdHkgUG9saWN5IGRvZXMgbm90IGFwcGx5IHRvIHJhdyByZXNvdXJjZXMuCi0gICAgQ2Fj aGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KG1fZnJhbWUubG9hZGVy KCkuaWNvbigpLnVybCgpKSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIFNu aWZmQ29udGVudCwgQnVmZmVyRGF0YSwgRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBEb05v dEFza0NsaWVudEZvckFueUNyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRP cmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENv bnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2spKTsKKyAgICBDYWNo ZWRSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChSZXNvdXJjZVJlcXVlc3QobV9mcmFtZS5sb2FkZXIo KS5pY29uKCkudXJsKCkpLCBSZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgU25p ZmZDb250ZW50LCBCdWZmZXJEYXRhLCBEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIERvTm90 QXNrQ2xpZW50Rm9yQW55Q3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgVXNlRGVmYXVsdE9y aWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29u dGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9hZGlu Z1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nKSk7CiAKICAgICByZXF1ZXN0Lm11dGFibGVSZXNv dXJjZVJlcXVlc3QoKS5zZXRQcmlvcml0eShSZXNvdXJjZUxvYWRQcmlvcml0eTo6TG93KTsKICAg ICByZXF1ZXN0LnNldEluaXRpYXRvcihjYWNoZWRSZXNvdXJjZVJlcXVlc3RJbml0aWF0b3JzKCku aWNvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vY2YvV2ViQ29yZUFWQ0ZSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvV2ViQ29yZUFWQ0ZSZXNvdXJjZUxv YWRlci5jcHAKaW5kZXggZDgwODJmZC4uMzVlZjc0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL1dlYkNvcmVBVkNGUmVzb3VyY2VM b2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9jZi9XZWJDb3JlQVZDRlJlc291cmNlTG9hZGVyLmNwcApAQCAtNzIsNyArNzIsNyBAQCB2 b2lkIFdlYkNvcmVBVkNGUmVzb3VyY2VMb2FkZXI6OnN0YXJ0TG9hZGluZygpCiAgICAgVVJMIHJl cXVlc3RVUkwgPSBDRlVSTFJlcXVlc3RHZXRVUkwodXJsUmVxdWVzdC5nZXQoKSk7CiAKICAgICAv LyBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrIGlzIGEgcGxh Y2Vob2xkZXIgdmFsdWUuIEl0IGRvZXMgbm90IGFmZmVjdCB0aGUgcmVxdWVzdCBzaW5jZSBDb250 ZW50IFNlY3VyaXR5IFBvbGljeSBkb2VzIG5vdCBhcHBseSB0byByYXcgcmVzb3VyY2VzLgotICAg IENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVxdWVzdChyZXF1ZXN0VVJM KSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIERvTm90U25pZmZDb250ZW50 LCBCdWZmZXJEYXRhLCBEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIERvTm90QXNrQ2xpZW50 Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscywgRG9TZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3Jp Z2luUmVzdHJpY3Rpb25zRm9yVHlwZSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250 ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrKSk7CisgICAgQ2FjaGVk UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3RVUkwpLCBSZXNv dXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIEJ1ZmZl ckRhdGEsIERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JDcm9z c09yaWdpbkNyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0 cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1 cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6 OkFsbG93RGVmZXJzTG9hZGluZykpOwogCiAgICAgcmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1 ZXN0KCkuc2V0UHJpb3JpdHkoUmVzb3VyY2VMb2FkUHJpb3JpdHk6Okxvdyk7CiAgICAgQ2FjaGVk UmVzb3VyY2VMb2FkZXIqIGxvYWRlciA9IG1fcGFyZW50LT5wbGF5ZXIoKS0+Y2FjaGVkUmVzb3Vy Y2VMb2FkZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbSBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNv dXJjZUxvYWRlci5tbQppbmRleCAyNzgyNTUxLi5mYzFlNDhhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVz b3VyY2VMb2FkZXIubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1tCkBAIC02OCw3ICs2OCw3 IEBAIHZvaWQgV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyOjpzdGFydExvYWRpbmcoKQogICAgIFVS TCByZXF1ZXN0VVJMID0gW1ttX2F2UmVxdWVzdC5nZXQoKSByZXF1ZXN0XSBVUkxdOwogCiAgICAg Ly8gQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjayBpcyBhIHBs YWNlaG9sZGVyIHZhbHVlLiBJdCBkb2VzIG5vdCBhZmZlY3QgdGhlIHJlcXVlc3Qgc2luY2UgQ29u dGVudCBTZWN1cml0eSBQb2xpY3kgZG9lcyBub3QgYXBwbHkgdG8gcmF3IHJlc291cmNlcy4KLSAg ICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChSZXNvdXJjZVJlcXVlc3QocmVxdWVzdFVS TCksIFJlc291cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBEb05vdFNuaWZmQ29udGVu dCwgQnVmZmVyRGF0YSwgRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBEb05vdEFza0NsaWVu dEZvckNyb3NzT3JpZ2luQ3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgVXNlRGVmYXVsdE9y aWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29u dGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjaykpOworICAgIENhY2hl ZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVxdWVzdChyZXF1ZXN0VVJMKSwgUmVz b3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIERvTm90U25pZmZDb250ZW50LCBCdWZm ZXJEYXRhLCBEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIERvTm90QXNrQ2xpZW50Rm9yQ3Jv c3NPcmlnaW5DcmVkZW50aWFscywgRG9TZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVz dHJpY3Rpb25zRm9yVHlwZSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2Vj dXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrLCBEZWZlcnNMb2FkaW5nUG9saWN5 OjpBbGxvd0RlZmVyc0xvYWRpbmcpKTsKIAogICAgIHJlcXVlc3QubXV0YWJsZVJlc291cmNlUmVx dWVzdCgpLnNldFByaW9yaXR5KFJlc291cmNlTG9hZFByaW9yaXR5OjpMb3cpOwogICAgIENhY2hl ZFJlc291cmNlTG9hZGVyKiBsb2FkZXIgPSBtX3BhcmVudC0+cGxheWVyKCktPmNhY2hlZFJlc291 cmNlTG9hZGVyKCk7Cg==