176241 2017-09-01 12:33:08 -0700 Do not Reject CacheStorage promises when updating the persistent filesystem data fails 2017-09-27 12:39:50 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen buildbot cdumez cgarcia commit-queue mkwst webkit-bug-importer oldest_to_newest 1344523 0 youennf 2017-09-01 12:33:08 -0700 Instead, log an error in the console. 1344532 1 319631 youennf 2017-09-01 12:43:52 -0700 Created attachment 319631 Patch 1344540 2 319635 youennf 2017-09-01 13:01:21 -0700 Created attachment 319635 Patch 1344597 3 319635 achristensen 2017-09-01 15:00:33 -0700 Comment on attachment 319635 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319635&action=review > Source/WebCore/Modules/cache/DOMCacheEngine.h:88 > + template<class Decoder> static bool decode(Decoder&, CacheIdentifierOperationResult&); This could return a std::optional<CacheIdentifierOperationResult> 1344602 4 youennf 2017-09-01 15:14:39 -0700 Thanks for the review. (In reply to Alex Christensen from comment #3) > Comment on attachment 319635 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=319635&action=review > > > Source/WebCore/Modules/cache/DOMCacheEngine.h:88 > > + template<class Decoder> static bool decode(Decoder&, CacheIdentifierOperationResult&); > > This could return a std::optional<CacheIdentifierOperationResult> Yes, I plan to update these two decoders to the modern ones. Note though that in the case it might be end up in more lines of code. 1344603 5 319635 commit-queue 2017-09-01 15:16:05 -0700 Comment on attachment 319635 Patch Rejecting attachment 319635 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 319635, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: ebCore/Modules/cache/DOMCacheEngine.h patching file Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp patching file Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp patching file Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp patching file Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.h Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Alex Christensen']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/4429024 1344615 6 319654 youennf 2017-09-01 15:27:46 -0700 Created attachment 319654 Patch for landing 1344636 7 319659 youennf 2017-09-01 15:58:45 -0700 Created attachment 319659 Patch for landing 1344652 8 319659 commit-queue 2017-09-01 16:28:13 -0700 Comment on attachment 319659 Patch for landing Clearing flags on attachment: 319659 Committed r221506: <http://trac.webkit.org/changeset/221506> 1344653 9 commit-queue 2017-09-01 16:28:14 -0700 All reviewed patches have been landed. Closing bug. 1353580 10 webkit-bug-importer 2017-09-27 12:39:50 -0700 <rdar://problem/34693714> 319631 2017-09-01 12:43:52 -0700 2017-09-01 13:01:20 -0700 Patch bug-176241-20170901124351.patch text/plain 12793 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxNDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE3Y2U0Yjc3ODhlNWU4 NDQ0M2VlNTdmNDM3YmQ2YjNjMGE0NDIyMy4uMGY0MThlMGQzMjk0MWExOGUxMGFkMjJhMDFlMmQ2 NDE4MzJhZTQwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE3LTA5LTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBEbyBub3QgUmVqZWN0IENh Y2hlU3RvcmFnZSBwcm9taXNlcyB3aGVuIHVwZGF0aW5nIHRoZSBwZXJzaXN0ZW50IGZpbGVzeXN0 ZW0gZGF0YSBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc2MjQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT3Blbi9SZW1vdmUgY2FjaGVzIG1heSBzdWNjZWVkIGluIHVwZGF0aW5nIHRoZSBtZW1v cnkgcmVwcmVzZW50YXRpb24gYnV0IHRoZSB3cml0ZS10by1kaXNrIG9wZXJhdGlvbiBtYXkgZmFp bC4KKyAgICAgICAgSW4gdGhhdCBjYXNlLCB0aGUgY29ycmVzcG9uZGluZyBwcm9taXNlIGlzIG5v dyByZXNvbHZlZCBzaW5jZSB0aGUgd2ViIHBhZ2UgY2FuIHN0aWxsIHByb2NlZWVkLgorCisgICAg ICAgIFRoZXJlIGlzIG5vIHdheSB0byB0ZXN0IHRoYXQgY3VycmVudGx5IGFzIHRoaXMgd291bGQg cmVxdWlyZSBhIHdyaXRlIGRpc2sgZmFpbHVyZSB0byBiZSB0cmlnZ2VyZWQuCisKKyAgICAgICAg KiBNb2R1bGVzL2NhY2hlL0NhY2hlU3RvcmFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2dD b25zb2xlUGVyc2lzdGVuY3lFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZVN0b3JhZ2U6 Om9wZW4pOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVTdG9yYWdlOjpyZW1vdmUpOgorICAgICAg ICAqIE1vZHVsZXMvY2FjaGUvRE9NQ2FjaGVFbmdpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRP TUNhY2hlRW5naW5lOjpDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQ6OmVuY29kZSBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpET01DYWNoZUVuZ2luZTo6Q2FjaGVJZGVudGlmaWVyT3Bl cmF0aW9uUmVzdWx0OjpkZWNvZGUpOgorCisyMDE3LTA5LTAxICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uQGFwcGxlLmNvbT4KKwogICAgICAgICBSZWplY3QgcHJvbWlzZXMgaW4gY2FzZSBvZiBpbnRl cm5hbCBDYWNoZVN0b3JhZ2UgZW5naW5lIGVycm9ycy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjE5NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU1YzU2ZmVhMGIz YjMzMjMxMThkYzkwOGU5NjM0MTQ3OTQwZjk0ODkuLmRlOWFiNmY2ZTQ0MGNhY2I0YjUyMmQ4YjU2 MWY2NDJjZDc3YmI2ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTctMDktMDEgIFlv dWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIERvIG5vdCBSZWplY3Qg Q2FjaGVTdG9yYWdlIHByb21pc2VzIHdoZW4gdXBkYXRpbmcgdGhlIHBlcnNpc3RlbnQgZmlsZXN5 c3RlbSBkYXRhIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzYyNDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBPcGVuL1JlbW92ZSBjYWNoZXMgbWF5IHN1Y2NlZWQgaW4gdGhlIG1lbW9yeSByZXBy ZXNlbnRhdGlvbiBidXQgdGhlIHdyaXRlLXRvLWRpc2sgb3BlcmF0aW9uIG1heSBmYWlsLgorICAg ICAgICBJbiB0aGF0IGNhc2UsIHRoZSBjYWxsYmFjayBkb2VzIG5vdCByZXR1cm4gYW4gZXJyb3Ig YnV0IGEgdmFsdWUgY29udGFpbmluZyB0aGUgY2FjaGUgaWRlbnRpZmllci4KKyAgICAgICAgVGhl IHZhbHVlIHdpbGwgYXNsbyBjb250YWluIGEgYm9vbGVhbiBmbGFnIHNldCB0byB0cnVlIHRvIG5v dGlmeSB0aGUgY2xpZW50IHRoYXQgcGVyc2lzdGVudCBzdG9yYWdlIGZhaWxlZCB0aGlzIHRpbWUu CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3Bw OgorICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6b3Blbik6CisgICAgICAg IChXZWJLaXQ6OkNhY2hlU3RvcmFnZTo6RW5naW5lOjpyZW1vdmUpOgorICAgICAgICAqIE5ldHdv cmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5jcHA6CisgICAgICAgIChX ZWJLaXQ6OkNhY2hlU3RvcmFnZTo6Q2FjaGVzOjpvcGVuKToKKyAgICAgICAgKFdlYktpdDo6Q2Fj aGVTdG9yYWdlOjpDYWNoZXM6OnJlbW92ZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2Fj aGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2FjaGVzLmg6CisKIDIwMTctMDktMDEgIFBlciBBcm5lIFZv bGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIENvbXBpbGUgZXJyb3Is ICdDYWNoZScgaXMgbm90IGRlY2xhcmVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9jYWNoZS9DYWNoZVN0b3JhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNo ZS9DYWNoZVN0b3JhZ2UuY3BwCmluZGV4IGUxMTQ1NzY2YzUzMDhiZDE0MGEzNTRiZDg2MzZkYTQ3 NzVhZTM4NTYuLjA3ODFkMzk0MWY4ZDU4YTNiMjdkMDJiOThjZDVmMjNiY2JmNzE0M2MgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUvQ2FjaGVTdG9yYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NhY2hlL0NhY2hlU3RvcmFnZS5jcHAKQEAgLTE2NSw2 ICsxNjUsMTQgQEAgdm9pZCBDYWNoZVN0b3JhZ2U6OnJldHJpZXZlQ2FjaGVzKFdURjo6RnVuY3Rp b248dm9pZChzdGQ6Om9wdGlvbmFsPEV4Y2VwdGlvbj4mJikKICAgICB9KTsKIH0KIAorc3RhdGlj IHZvaWQgbG9nQ29uc29sZVBlcnNpc3RlbmN5RXJyb3IoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCog Y29udGV4dCwgY29uc3QgU3RyaW5nJiBjYWNoZU5hbWUpCit7CisgICAgaWYgKCFjb250ZXh0KQor ICAgICAgICByZXR1cm47CisKKyAgICBjb250ZXh0LT5hZGRDb25zb2xlTWVzc2FnZShNZXNzYWdl U291cmNlOjpKUywgTWVzc2FnZUxldmVsOjpFcnJvciwgbWFrZVN0cmluZygiVGhlcmUgd2FzIGFu IGVycm9yIG1ha2luZyAiLCBjYWNoZU5hbWUsICIgcGVyc2lzdGVudCBvbiB0aGUgZmlsZXN5c3Rl bSIpKTsKK30KKwogdm9pZCBDYWNoZVN0b3JhZ2U6Om9wZW4oY29uc3QgU3RyaW5nJiBuYW1lLCBE T01Qcm9taXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPENhY2hlPj4mJiBwcm9taXNlKQogewogICAg IHJldHJpZXZlQ2FjaGVzKFt0aGlzLCBuYW1lLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKV0o c3RkOjpvcHRpb25hbDxFeGNlcHRpb24+JiYgZXhjZXB0aW9uKSBtdXRhYmxlIHsKQEAgLTE4OSw3 ICsxOTcsMTAgQEAgdm9pZCBDYWNoZVN0b3JhZ2U6Om9wZW4oY29uc3QgU3RyaW5nJiBuYW1lLCBE T01Qcm9taXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPENhY2gKICAgICAgICAgICAgICAgICBpZiAo IXJlc3VsdC5oYXNWYWx1ZSgpKQogICAgICAgICAgICAgICAgICAgICBwcm9taXNlLnJlamVjdChE T01DYWNoZUVuZ2luZTo6ZXJyb3JUb0V4Y2VwdGlvbihyZXN1bHQuZXJyb3IoKSkpOwogICAgICAg ICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgICAgICBhdXRvIGNhY2hlID0gQ2FjaGU6 OmNyZWF0ZSgqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBTdHJpbmcgeyBuYW1lIH0sIHJlc3Vs dC52YWx1ZSgpLCBtX2Nvbm5lY3Rpb24uY29weVJlZigpKTsKKyAgICAgICAgICAgICAgICAgICAg aWYgKHJlc3VsdC52YWx1ZSgpLmhhZFN0b3JhZ2VFcnJvcikKKyAgICAgICAgICAgICAgICAgICAg ICAgIGxvZ0NvbnNvbGVQZXJzaXN0ZW5jeUVycm9yKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwg bmFtZSk7CisKKyAgICAgICAgICAgICAgICAgICAgYXV0byBjYWNoZSA9IENhY2hlOjpjcmVhdGUo KnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgU3RyaW5nIHsgbmFtZSB9LCByZXN1bHQudmFsdWUo KS5pZGVudGlmaWVyLCBtX2Nvbm5lY3Rpb24uY29weVJlZigpKTsKICAgICAgICAgICAgICAgICAg ICAgcHJvbWlzZS5yZXNvbHZlKGNhY2hlKTsKICAgICAgICAgICAgICAgICAgICAgbV9jYWNoZXMu YXBwZW5kKFdURk1vdmUoY2FjaGUpKTsKICAgICAgICAgICAgICAgICB9CkBAIC0yMjEsOCArMjMy LDExIEBAIHZvaWQgQ2FjaGVTdG9yYWdlOjpyZW1vdmUoY29uc3QgU3RyaW5nJiBuYW1lLCBET01Q cm9taXNlRGVmZXJyZWQ8SURMQm9vbGVhbj4mJiBwCiAgICAgICAgICAgICBpZiAoIW1faXNTdG9w cGVkKSB7CiAgICAgICAgICAgICAgICAgaWYgKCFyZXN1bHQuaGFzVmFsdWUoKSkKICAgICAgICAg ICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoRE9NQ2FjaGVFbmdpbmU6OmVycm9yVG9FeGNlcHRp b24ocmVzdWx0LmVycm9yKCkpKTsKLSAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAg ICAgZWxzZSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChyZXN1bHQudmFsdWUoKS5oYWRTdG9y YWdlRXJyb3IpCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dDb25zb2xlUGVyc2lzdGVuY3lF cnJvcihzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIG5hbWUpOwogICAgICAgICAgICAgICAgICAg ICBwcm9taXNlLnJlc29sdmUodHJ1ZSk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQogICAgICAgICAgICAgdW5zZXRQZW5kaW5nQWN0aXZpdHkodGhpcyk7CiAgICAgICAgIH0pOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9ET01DYWNoZUVuZ2luZS5o IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9ET01DYWNoZUVuZ2luZS5oCmluZGV4IDQ5 N2U5N2RjZGMwNzY1OWExZDUxOWEzNGQxZmRiMWU5MTI5NzczMTcuLjhmNzRjMzE1MjRkMzQ4MDhj ZTg3NjJkM2M1OGVmNzdjYTJhZTA4OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvY2FjaGUvRE9NQ2FjaGVFbmdpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Nh Y2hlL0RPTUNhY2hlRW5naW5lLmgKQEAgLTgzLDcgKzgzLDE2IEBAIHN0cnVjdCBDYWNoZUluZm9z IHsKICAgICB1aW50NjRfdCB1cGRhdGVDb3VudGVyOwogfTsKIAotdXNpbmcgQ2FjaGVJZGVudGlm aWVyT3JFcnJvciA9IEV4cGVjdGVkPHVpbnQ2NF90LCBFcnJvcj47CitzdHJ1Y3QgQ2FjaGVJZGVu dGlmaWVyT3BlcmF0aW9uUmVzdWx0IHsKKyAgICB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lk IGVuY29kZShFbmNvZGVyJikgY29uc3Q7CisgICAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3Rh dGljIGJvb2wgZGVjb2RlKERlY29kZXImLCBDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQm KTsKKworICAgIHVpbnQ2NF90IGlkZW50aWZpZXIgeyAwIH07CisgICAgLy8gVHJ1ZSBpbiBjYXNl IHN0b3JpbmcgY2FjaGUgbGlzdCBvbiB0aGUgZmlsZXN5c3RlbSBmYWlsZWQuCisgICAgYm9vbCBo YWRTdG9yYWdlRXJyb3IgeyBmYWxzZSB9OworfTsKKwordXNpbmcgQ2FjaGVJZGVudGlmaWVyT3JF cnJvciA9IEV4cGVjdGVkPENhY2hlSWRlbnRpZmllck9wZXJhdGlvblJlc3VsdCwgRXJyb3I+Owog dXNpbmcgQ2FjaGVJZGVudGlmaWVyQ2FsbGJhY2sgPSBXVEY6OkZ1bmN0aW9uPHZvaWQoY29uc3Qg Q2FjaGVJZGVudGlmaWVyT3JFcnJvciYpPjsKIAogdXNpbmcgUmVjb3JkSWRlbnRpZmllcnNPckVy cm9yID0gRXhwZWN0ZWQ8VmVjdG9yPHVpbnQ2NF90PiwgRXJyb3I+OwpAQCAtMTExLDYgKzEyMCwy MCBAQCB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBpbmxpbmUgYm9vbCBDYWNoZUluZm9zOjpkZWNv ZGUoRGVjb2RlciYgZGVjb2RlciwgQ2FjaGVJbgogICAgIHJldHVybiBkZWNvZGVyLmRlY29kZShj YWNoZUluZm9zLnVwZGF0ZUNvdW50ZXIpOwogfQogCit0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiBp bmxpbmUgdm9pZCBDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQ6OmVuY29kZShFbmNvZGVy JiBlbmNvZGVyKSBjb25zdAoreworICAgIGVuY29kZXIgPDwgaWRlbnRpZmllcjsKKyAgICBlbmNv ZGVyIDw8IGhhZFN0b3JhZ2VFcnJvcjsKK30KKwordGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gaW5s aW5lIGJvb2wgQ2FjaGVJZGVudGlmaWVyT3BlcmF0aW9uUmVzdWx0OjpkZWNvZGUoRGVjb2RlciYg ZGVjb2RlciwgQ2FjaGVJZGVudGlmaWVyT3BlcmF0aW9uUmVzdWx0JiByZXN1bHQpCit7CisgICAg aWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaWRlbnRpZmllcikpCisgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgIHJldHVybiBkZWNvZGVyLmRlY29kZShyZXN1bHQuaGFkU3RvcmFnZUVycm9y KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgRE9NQ2FjaGVFbmdpbmUKIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9Xb3JrZXJD YWNoZVN0b3JhZ2VDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUv V29ya2VyQ2FjaGVTdG9yYWdlQ29ubmVjdGlvbi5jcHAKaW5kZXggZWQwNDkwOWZlNThkZmI3ZmIx ZTRlYzE5M2Y3MDE0YjAwNzA5MjcwZC4uNDcwMGIxYzhkMGZhY2JiNTY0OWRkNzQwZTIxMTlkNTdh MjYwMWQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9Xb3JrZXJD YWNoZVN0b3JhZ2VDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Nh Y2hlL1dvcmtlckNhY2hlU3RvcmFnZUNvbm5lY3Rpb24uY3BwCkBAIC0xMzMsNyArMTMzLDcgQEAg dm9pZCBXb3JrZXJDYWNoZVN0b3JhZ2VDb25uZWN0aW9uOjpkb1JlbW92ZSh1aW50NjRfdCByZXF1 ZXN0SWRlbnRpZmllciwgdWludDY0X3QKICAgICAgICAgQVNTRVJUKG1fbWFpblRocmVhZENvbm5l Y3Rpb24pOwogCiAgICAgICAgIG1fbWFpblRocmVhZENvbm5lY3Rpb24tPnJlbW92ZShjYWNoZUlk ZW50aWZpZXIsIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwg cmVxdWVzdElkZW50aWZpZXIsIGNhY2hlSWRlbnRpZmllcl0oY29uc3QgQ2FjaGVJZGVudGlmaWVy T3JFcnJvciYgcmVzdWx0KSBtdXRhYmxlIHsKLSAgICAgICAgICAgIEFTU0VSVCghcmVzdWx0Lmhh c1ZhbHVlKCkgfHwgcmVzdWx0LnZhbHVlKCkgPT0gY2FjaGVJZGVudGlmaWVyKTsKKyAgICAgICAg ICAgIEFTU0VSVCghcmVzdWx0Lmhhc1ZhbHVlKCkgfHwgcmVzdWx0LnZhbHVlKCkuaWRlbnRpZmll ciA9PSBjYWNoZUlkZW50aWZpZXIpOwogICAgICAgICAgICAgbV9wcm94eS5wb3N0VGFza0Zvck1v ZGVUb1dvcmtlckdsb2JhbFNjb3BlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90 ZWN0ZWRUaGlzKSwgcmVxdWVzdElkZW50aWZpZXIsIHJlc3VsdF0oU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCYgY29udGV4dCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgQVNTRVJUX1VOVVNFRChj b250ZXh0LCBjb250ZXh0LmlzV29ya2VyR2xvYmFsU2NvcGUoKSk7CiAgICAgICAgICAgICAgICAg cmVtb3ZlQ29tcGxldGVkKHJlcXVlc3RJZGVudGlmaWVyLCByZXN1bHQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3Bw IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUu Y3BwCmluZGV4IGNiYmNhZmJlOTgxZThmY2E2ZDFkNjE5ZmRkMGUzYzkxYjhhZWZhNDAuLjE0ZjI5 NjdjOTQ4OTVjMGJiZWY3MzYxOGJhMDY2ZmQ1ZjFmZDdmMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAK QEAgLTkwLDE2ICs5MCw3IEBAIHZvaWQgRW5naW5lOjpvcGVuKGNvbnN0IFN0cmluZyYgb3JpZ2lu LCBjb25zdCBTdHJpbmcmIGNhY2hlTmFtZSwgQ2FjaGVJZGVudGlmaWVyCiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBDYWNoZXMmIGNhY2hlcyA9IGNhY2hlc09yRXJy b3IudmFsdWUoKTsKLQotICAgICAgICBpZiAoYXV0byogY2FjaGUgPSBjYWNoZXMuZmluZChjYWNo ZU5hbWUpKSB7Ci0gICAgICAgICAgICBjYWxsYmFjayhjYWNoZS0+aWRlbnRpZmllcigpKTsKLSAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGNhY2hlcy5vcGVuKFN0cmlu ZyB7IGNhY2hlTmFtZSB9LCBbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oY29uc3QgQ2Fj aGVJZGVudGlmaWVyT3JFcnJvciYgcmVzdWx0KSBtdXRhYmxlIHsKLSAgICAgICAgICAgIGNhbGxi YWNrKHJlc3VsdCk7Ci0gICAgICAgIH0pOworICAgICAgICBjYWNoZXNPckVycm9yLnZhbHVlKCku Z2V0KCkub3BlbihjYWNoZU5hbWUsIFdURk1vdmUoY2FsbGJhY2spKTsKICAgICB9KTsKIH0KIApA QCAtMTE4LDEzICsxMDksNyBAQCB2b2lkIEVuZ2luZTo6cmVtb3ZlKHVpbnQ2NF90IGNhY2hlSWRl bnRpZmllciwgQ2FjaGVJZGVudGlmaWVyQ2FsbGJhY2smJiBjYWxsYmFjawogICAgICAgICByZXR1 cm47CiAgICAgfQogCi0gICAgY2FjaGVzVG9Nb2RpZnktPnJlbW92ZShjYWNoZUlkZW50aWZpZXIs IFtjYWNoZUlkZW50aWZpZXIsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKHN0ZDo6b3B0 aW9uYWw8RXJyb3I+JiYgZXJyb3IpIHsKLSAgICAgICAgaWYgKGVycm9yKSB7Ci0gICAgICAgICAg ICBjYWxsYmFjayhtYWtlVW5leHBlY3RlZChlcnJvci52YWx1ZSgpKSk7Ci0gICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgY2FsbGJhY2soY2FjaGVJZGVudGlmaWVyKTsKLSAg ICB9KTsKKyAgICBjYWNoZXNUb01vZGlmeS0+cmVtb3ZlKGNhY2hlSWRlbnRpZmllciwgV1RGTW92 ZShjYWxsYmFjaykpOwogfQogCiB2b2lkIEVuZ2luZTo6cmV0cmlldmVDYWNoZXMoY29uc3QgU3Ry aW5nJiBvcmlnaW4sIHVpbnQ2NF90IHVwZGF0ZUNvdW50ZXIsIENhY2hlSW5mb3NDYWxsYmFjayYm IGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZXMuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZXMuY3BwCmluZGV4IDViM2Y3ZjQ0ZmU1 NjI2ZDc0YzEzZGFkMGZlMTUyZDY3MzRmMGRmN2YuLmUyNjA5MDk1ZDhmZTBjNjFjNzk1ZTM0NDkx ZWQ3MjRjMTIzOGNkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2FjaGVzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5jcHAKQEAgLTExNywy NCArMTE3LDI1IEBAIENhY2hlKiBDYWNoZXM6OmZpbmQodWludDY0X3QgaWRlbnRpZmllcikKICAg ICByZXR1cm4gKHBvc2l0aW9uICE9IG5vdEZvdW5kKSA/ICZtX3JlbW92ZWRDYWNoZXNbcG9zaXRp b25dIDogbnVsbHB0cjsKIH0KIAotdm9pZCBDYWNoZXM6Om9wZW4oU3RyaW5nJiYgbmFtZSwgQ2Fj aGVJZGVudGlmaWVyQ2FsbGJhY2smJiBjYWxsYmFjaykKK3ZvaWQgQ2FjaGVzOjpvcGVuKGNvbnN0 IFN0cmluZyYgbmFtZSwgQ2FjaGVJZGVudGlmaWVyQ2FsbGJhY2smJiBjYWxsYmFjaykKIHsKICAg ICBBU1NFUlQobV9lbmdpbmUpOwogCisgICAgaWYgKGF1dG8qIGNhY2hlID0gZmluZChuYW1lKSkg eworICAgICAgICBjYWxsYmFjayhDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQgeyBjYWNo ZS0+aWRlbnRpZmllcigpLCBmYWxzZSB9KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAg IG1ha2VEaXJ0eSgpOwogCiAgICAgdWludDY0X3QgY2FjaGVJZGVudGlmaWVyID0gbV9lbmdpbmUt Pm5leHRDYWNoZUlkZW50aWZpZXIoKTsKLSAgICBtX2NhY2hlcy5hcHBlbmQoQ2FjaGUgeyBjYWNo ZUlkZW50aWZpZXIsIFdURk1vdmUobmFtZSkgfSk7CisgICAgbV9jYWNoZXMuYXBwZW5kKENhY2hl IHsgY2FjaGVJZGVudGlmaWVyLCBTdHJpbmcgeyBuYW1lIH0gfSk7CiAgICAgd3JpdGVDYWNoZXNU b0Rpc2soW2NhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGNhY2hlSWRlbnRpZmllcl0oc3Rk OjpvcHRpb25hbDxFcnJvcj4mJiBlcnJvcikgbXV0YWJsZSB7Ci0gICAgICAgIGlmIChlcnJvcikg ewotICAgICAgICAgICAgY2FsbGJhY2sobWFrZVVuZXhwZWN0ZWQoZXJyb3IudmFsdWUoKSkpOwot ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIGNhbGxiYWNrKGNhY2hlSWRl bnRpZmllcik7CisgICAgICAgIGNhbGxiYWNrKENhY2hlSWRlbnRpZmllck9wZXJhdGlvblJlc3Vs dCB7IGNhY2hlSWRlbnRpZmllciwgISFlcnJvciB9KTsKICAgICB9KTsKIH0KIAotdm9pZCBDYWNo ZXM6OnJlbW92ZSh1aW50NjRfdCBpZGVudGlmaWVyLCBDb21wbGV0aW9uQ2FsbGJhY2smJiBjYWxs YmFjaykKK3ZvaWQgQ2FjaGVzOjpyZW1vdmUodWludDY0X3QgaWRlbnRpZmllciwgQ2FjaGVJZGVu dGlmaWVyQ2FsbGJhY2smJiBjYWxsYmFjaykKIHsKICAgICBBU1NFUlQobV9lbmdpbmUpOwogCkBA IC0xNDIsNyArMTQzLDcgQEAgdm9pZCBDYWNoZXM6OnJlbW92ZSh1aW50NjRfdCBpZGVudGlmaWVy LCBDb21wbGV0aW9uQ2FsbGJhY2smJiBjYWxsYmFjaykKIAogICAgIGlmIChwb3NpdGlvbiA9PSBu b3RGb3VuZCkgewogICAgICAgICBBU1NFUlQobV9yZW1vdmVkQ2FjaGVzLmZpbmRNYXRjaGluZyhb Jl0oY29uc3QgYXV0byYgaXRlbSkgeyByZXR1cm4gaXRlbS5pZGVudGlmaWVyKCkgPT0gaWRlbnRp ZmllcjsgfSkgIT0gbm90Rm91bmQpOwotICAgICAgICBjYWxsYmFjayhzdGQ6Om51bGxvcHQpOwor ICAgICAgICBjYWxsYmFjayhDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQgeyBpZGVudGlm aWVyLCBmYWxzZSB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTUzLDcgKzE1NCw5 IEBAIHZvaWQgQ2FjaGVzOjpyZW1vdmUodWludDY0X3QgaWRlbnRpZmllciwgQ29tcGxldGlvbkNh bGxiYWNrJiYgY2FsbGJhY2spCiAgICAgbV9yZW1vdmVkQ2FjaGVzLmFwcGVuZChXVEZNb3ZlKGNh Y2hlKSk7CiAgICAgKyttX3VwZGF0ZUNvdW50ZXI7CiAKLSAgICB3cml0ZUNhY2hlc1RvRGlzayhX VEZNb3ZlKGNhbGxiYWNrKSk7CisgICAgd3JpdGVDYWNoZXNUb0Rpc2soW2NhbGxiYWNrID0gV1RG TW92ZShjYWxsYmFjayksIGlkZW50aWZpZXJdKHN0ZDo6b3B0aW9uYWw8RXJyb3I+JiYgZXJyb3Ip IG11dGFibGUgeworICAgICAgICBjYWxsYmFjayhDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1 bHQgeyBpZGVudGlmaWVyLCAhIWVycm9yIH0pOworICAgIH0pOwogfQogCiBzdGF0aWMgaW5saW5l IERhdGEgZW5jb2RlQ2FjaGVOYW1lcyhjb25zdCBWZWN0b3I8Q2FjaGU+JiBjYWNoZXMpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVu Z2luZUNhY2hlcy5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0 b3JhZ2VFbmdpbmVDYWNoZXMuaAppbmRleCAzNjMwZDZhOGQ4ZTZjY2RiMzU5Y2JkY2Y4MjY2ODI0 MzA2ODVjZTg1Li4xMzMzM2UwOWI1ZTI3MDA1MmE2YWE0NzBjMTczYjM1OGE4ODhhOWY1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVu Z2luZUNhY2hlcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2Fj aGVTdG9yYWdlRW5naW5lQ2FjaGVzLmgKQEAgLTM5LDggKzM5LDggQEAgcHVibGljOgogICAgIHN0 YXRpYyBSZWY8Q2FjaGVzPiBjcmVhdGUoRW5naW5lJiBlbmdpbmUsIGNvbnN0IFN0cmluZyYgb3Jp Z2luKSB7IHJldHVybiBhZG9wdFJlZigqbmV3IENhY2hlcyB7IGVuZ2luZSwgb3JpZ2luIH0pOyB9 CiAKICAgICB2b2lkIGluaXRpYWxpemUoV2ViQ29yZTo6RE9NQ2FjaGVFbmdpbmU6OkNvbXBsZXRp b25DYWxsYmFjayYmKTsKLSAgICB2b2lkIG9wZW4oU3RyaW5nJiYgbmFtZSwgV2ViQ29yZTo6RE9N Q2FjaGVFbmdpbmU6OkNhY2hlSWRlbnRpZmllckNhbGxiYWNrJiYpOwotICAgIHZvaWQgcmVtb3Zl KHVpbnQ2NF90IGlkZW50aWZpZXIsIFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpDb21wbGV0aW9u Q2FsbGJhY2smJik7CisgICAgdm9pZCBvcGVuKGNvbnN0IFN0cmluZyYgbmFtZSwgV2ViQ29yZTo6 RE9NQ2FjaGVFbmdpbmU6OkNhY2hlSWRlbnRpZmllckNhbGxiYWNrJiYpOworICAgIHZvaWQgcmVt b3ZlKHVpbnQ2NF90IGlkZW50aWZpZXIsIFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpDYWNoZUlk ZW50aWZpZXJDYWxsYmFjayYmKTsKICAgICB2b2lkIGNsZWFyTWVtb3J5UmVwcmVzZW50YXRpb24o KTsKIAogICAgIHZvaWQgZGV0YWNoKCk7Cg== 319635 2017-09-01 13:01:21 -0700 2017-09-01 15:27:44 -0700 Patch bug-176241-20170901130120.patch text/plain 12873 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxNDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE3Y2U0Yjc3ODhlNWU4 NDQ0M2VlNTdmNDM3YmQ2YjNjMGE0NDIyMy4uMGY0MThlMGQzMjk0MWExOGUxMGFkMjJhMDFlMmQ2 NDE4MzJhZTQwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE3LTA5LTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBEbyBub3QgUmVqZWN0IENh Y2hlU3RvcmFnZSBwcm9taXNlcyB3aGVuIHVwZGF0aW5nIHRoZSBwZXJzaXN0ZW50IGZpbGVzeXN0 ZW0gZGF0YSBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc2MjQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT3Blbi9SZW1vdmUgY2FjaGVzIG1heSBzdWNjZWVkIGluIHVwZGF0aW5nIHRoZSBtZW1v cnkgcmVwcmVzZW50YXRpb24gYnV0IHRoZSB3cml0ZS10by1kaXNrIG9wZXJhdGlvbiBtYXkgZmFp bC4KKyAgICAgICAgSW4gdGhhdCBjYXNlLCB0aGUgY29ycmVzcG9uZGluZyBwcm9taXNlIGlzIG5v dyByZXNvbHZlZCBzaW5jZSB0aGUgd2ViIHBhZ2UgY2FuIHN0aWxsIHByb2NlZWVkLgorCisgICAg ICAgIFRoZXJlIGlzIG5vIHdheSB0byB0ZXN0IHRoYXQgY3VycmVudGx5IGFzIHRoaXMgd291bGQg cmVxdWlyZSBhIHdyaXRlIGRpc2sgZmFpbHVyZSB0byBiZSB0cmlnZ2VyZWQuCisKKyAgICAgICAg KiBNb2R1bGVzL2NhY2hlL0NhY2hlU3RvcmFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2dD b25zb2xlUGVyc2lzdGVuY3lFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZVN0b3JhZ2U6 Om9wZW4pOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVTdG9yYWdlOjpyZW1vdmUpOgorICAgICAg ICAqIE1vZHVsZXMvY2FjaGUvRE9NQ2FjaGVFbmdpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRP TUNhY2hlRW5naW5lOjpDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQ6OmVuY29kZSBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpET01DYWNoZUVuZ2luZTo6Q2FjaGVJZGVudGlmaWVyT3Bl cmF0aW9uUmVzdWx0OjpkZWNvZGUpOgorCisyMDE3LTA5LTAxICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uQGFwcGxlLmNvbT4KKwogICAgICAgICBSZWplY3QgcHJvbWlzZXMgaW4gY2FzZSBvZiBpbnRl cm5hbCBDYWNoZVN0b3JhZ2UgZW5naW5lIGVycm9ycy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjE5NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU1YzU2ZmVhMGIz YjMzMjMxMThkYzkwOGU5NjM0MTQ3OTQwZjk0ODkuLmRjMmNlZjg0NTU0Zjg1ZjliZjcxYjdiMzhi YmE3ZDgwYWQwY2I2NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTctMDktMDEgIFlv dWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIERvIG5vdCBSZWplY3Qg Q2FjaGVTdG9yYWdlIHByb21pc2VzIHdoZW4gdXBkYXRpbmcgdGhlIHBlcnNpc3RlbnQgZmlsZXN5 c3RlbSBkYXRhIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzYyNDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBPcGVuL1JlbW92ZSBjYWNoZXMgbWF5IHN1Y2NlZWQgaW4gdGhlIG1lbW9yeSByZXBy ZXNlbnRhdGlvbiBidXQgdGhlIHdyaXRlLXRvLWRpc2sgb3BlcmF0aW9uIG1heSBmYWlsLgorICAg ICAgICBJbiB0aGF0IGNhc2UsIHRoZSBjYWxsYmFjayBkb2VzIG5vdCByZXR1cm4gYW4gZXJyb3Ig YnV0IGEgdmFsdWUgY29udGFpbmluZyB0aGUgY2FjaGUgaWRlbnRpZmllci4KKyAgICAgICAgVGhl IHZhbHVlIHdpbGwgYWxzbyBjb250YWluIGEgYm9vbGVhbiBmbGFnIHNldCB0byB0cnVlIHRvIG5v dGlmeSB0aGUgY2xpZW50IHRoYXQgcGVyc2lzdGVudCBzdG9yYWdlIGZhaWxlZCB0aGlzIHRpbWUu CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3Bw OgorICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6b3Blbik6CisgICAgICAg IChXZWJLaXQ6OkNhY2hlU3RvcmFnZTo6RW5naW5lOjpyZW1vdmUpOgorICAgICAgICAqIE5ldHdv cmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5jcHA6CisgICAgICAgIChX ZWJLaXQ6OkNhY2hlU3RvcmFnZTo6Q2FjaGVzOjpvcGVuKToKKyAgICAgICAgKFdlYktpdDo6Q2Fj aGVTdG9yYWdlOjpDYWNoZXM6OnJlbW92ZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2Fj aGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2FjaGVzLmg6CisKIDIwMTctMDktMDEgIFBlciBBcm5lIFZv bGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIENvbXBpbGUgZXJyb3Is ICdDYWNoZScgaXMgbm90IGRlY2xhcmVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9jYWNoZS9DYWNoZVN0b3JhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNo ZS9DYWNoZVN0b3JhZ2UuY3BwCmluZGV4IGUxMTQ1NzY2YzUzMDhiZDE0MGEzNTRiZDg2MzZkYTQ3 NzVhZTM4NTYuLjA3ODFkMzk0MWY4ZDU4YTNiMjdkMDJiOThjZDVmMjNiY2JmNzE0M2MgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUvQ2FjaGVTdG9yYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NhY2hlL0NhY2hlU3RvcmFnZS5jcHAKQEAgLTE2NSw2 ICsxNjUsMTQgQEAgdm9pZCBDYWNoZVN0b3JhZ2U6OnJldHJpZXZlQ2FjaGVzKFdURjo6RnVuY3Rp b248dm9pZChzdGQ6Om9wdGlvbmFsPEV4Y2VwdGlvbj4mJikKICAgICB9KTsKIH0KIAorc3RhdGlj IHZvaWQgbG9nQ29uc29sZVBlcnNpc3RlbmN5RXJyb3IoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCog Y29udGV4dCwgY29uc3QgU3RyaW5nJiBjYWNoZU5hbWUpCit7CisgICAgaWYgKCFjb250ZXh0KQor ICAgICAgICByZXR1cm47CisKKyAgICBjb250ZXh0LT5hZGRDb25zb2xlTWVzc2FnZShNZXNzYWdl U291cmNlOjpKUywgTWVzc2FnZUxldmVsOjpFcnJvciwgbWFrZVN0cmluZygiVGhlcmUgd2FzIGFu IGVycm9yIG1ha2luZyAiLCBjYWNoZU5hbWUsICIgcGVyc2lzdGVudCBvbiB0aGUgZmlsZXN5c3Rl bSIpKTsKK30KKwogdm9pZCBDYWNoZVN0b3JhZ2U6Om9wZW4oY29uc3QgU3RyaW5nJiBuYW1lLCBE T01Qcm9taXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPENhY2hlPj4mJiBwcm9taXNlKQogewogICAg IHJldHJpZXZlQ2FjaGVzKFt0aGlzLCBuYW1lLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKV0o c3RkOjpvcHRpb25hbDxFeGNlcHRpb24+JiYgZXhjZXB0aW9uKSBtdXRhYmxlIHsKQEAgLTE4OSw3 ICsxOTcsMTAgQEAgdm9pZCBDYWNoZVN0b3JhZ2U6Om9wZW4oY29uc3QgU3RyaW5nJiBuYW1lLCBE T01Qcm9taXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPENhY2gKICAgICAgICAgICAgICAgICBpZiAo IXJlc3VsdC5oYXNWYWx1ZSgpKQogICAgICAgICAgICAgICAgICAgICBwcm9taXNlLnJlamVjdChE T01DYWNoZUVuZ2luZTo6ZXJyb3JUb0V4Y2VwdGlvbihyZXN1bHQuZXJyb3IoKSkpOwogICAgICAg ICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgICAgICBhdXRvIGNhY2hlID0gQ2FjaGU6 OmNyZWF0ZSgqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBTdHJpbmcgeyBuYW1lIH0sIHJlc3Vs dC52YWx1ZSgpLCBtX2Nvbm5lY3Rpb24uY29weVJlZigpKTsKKyAgICAgICAgICAgICAgICAgICAg aWYgKHJlc3VsdC52YWx1ZSgpLmhhZFN0b3JhZ2VFcnJvcikKKyAgICAgICAgICAgICAgICAgICAg ICAgIGxvZ0NvbnNvbGVQZXJzaXN0ZW5jeUVycm9yKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwg bmFtZSk7CisKKyAgICAgICAgICAgICAgICAgICAgYXV0byBjYWNoZSA9IENhY2hlOjpjcmVhdGUo KnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgU3RyaW5nIHsgbmFtZSB9LCByZXN1bHQudmFsdWUo KS5pZGVudGlmaWVyLCBtX2Nvbm5lY3Rpb24uY29weVJlZigpKTsKICAgICAgICAgICAgICAgICAg ICAgcHJvbWlzZS5yZXNvbHZlKGNhY2hlKTsKICAgICAgICAgICAgICAgICAgICAgbV9jYWNoZXMu YXBwZW5kKFdURk1vdmUoY2FjaGUpKTsKICAgICAgICAgICAgICAgICB9CkBAIC0yMjEsOCArMjMy LDExIEBAIHZvaWQgQ2FjaGVTdG9yYWdlOjpyZW1vdmUoY29uc3QgU3RyaW5nJiBuYW1lLCBET01Q cm9taXNlRGVmZXJyZWQ8SURMQm9vbGVhbj4mJiBwCiAgICAgICAgICAgICBpZiAoIW1faXNTdG9w cGVkKSB7CiAgICAgICAgICAgICAgICAgaWYgKCFyZXN1bHQuaGFzVmFsdWUoKSkKICAgICAgICAg ICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoRE9NQ2FjaGVFbmdpbmU6OmVycm9yVG9FeGNlcHRp b24ocmVzdWx0LmVycm9yKCkpKTsKLSAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAg ICAgZWxzZSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChyZXN1bHQudmFsdWUoKS5oYWRTdG9y YWdlRXJyb3IpCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dDb25zb2xlUGVyc2lzdGVuY3lF cnJvcihzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIG5hbWUpOwogICAgICAgICAgICAgICAgICAg ICBwcm9taXNlLnJlc29sdmUodHJ1ZSk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQogICAgICAgICAgICAgdW5zZXRQZW5kaW5nQWN0aXZpdHkodGhpcyk7CiAgICAgICAgIH0pOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9ET01DYWNoZUVuZ2luZS5o IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9ET01DYWNoZUVuZ2luZS5oCmluZGV4IDQ5 N2U5N2RjZGMwNzY1OWExZDUxOWEzNGQxZmRiMWU5MTI5NzczMTcuLjhmNzRjMzE1MjRkMzQ4MDhj ZTg3NjJkM2M1OGVmNzdjYTJhZTA4OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvY2FjaGUvRE9NQ2FjaGVFbmdpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Nh Y2hlL0RPTUNhY2hlRW5naW5lLmgKQEAgLTgzLDcgKzgzLDE2IEBAIHN0cnVjdCBDYWNoZUluZm9z IHsKICAgICB1aW50NjRfdCB1cGRhdGVDb3VudGVyOwogfTsKIAotdXNpbmcgQ2FjaGVJZGVudGlm aWVyT3JFcnJvciA9IEV4cGVjdGVkPHVpbnQ2NF90LCBFcnJvcj47CitzdHJ1Y3QgQ2FjaGVJZGVu dGlmaWVyT3BlcmF0aW9uUmVzdWx0IHsKKyAgICB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lk IGVuY29kZShFbmNvZGVyJikgY29uc3Q7CisgICAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3Rh dGljIGJvb2wgZGVjb2RlKERlY29kZXImLCBDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQm KTsKKworICAgIHVpbnQ2NF90IGlkZW50aWZpZXIgeyAwIH07CisgICAgLy8gVHJ1ZSBpbiBjYXNl IHN0b3JpbmcgY2FjaGUgbGlzdCBvbiB0aGUgZmlsZXN5c3RlbSBmYWlsZWQuCisgICAgYm9vbCBo YWRTdG9yYWdlRXJyb3IgeyBmYWxzZSB9OworfTsKKwordXNpbmcgQ2FjaGVJZGVudGlmaWVyT3JF cnJvciA9IEV4cGVjdGVkPENhY2hlSWRlbnRpZmllck9wZXJhdGlvblJlc3VsdCwgRXJyb3I+Owog dXNpbmcgQ2FjaGVJZGVudGlmaWVyQ2FsbGJhY2sgPSBXVEY6OkZ1bmN0aW9uPHZvaWQoY29uc3Qg Q2FjaGVJZGVudGlmaWVyT3JFcnJvciYpPjsKIAogdXNpbmcgUmVjb3JkSWRlbnRpZmllcnNPckVy cm9yID0gRXhwZWN0ZWQ8VmVjdG9yPHVpbnQ2NF90PiwgRXJyb3I+OwpAQCAtMTExLDYgKzEyMCwy MCBAQCB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBpbmxpbmUgYm9vbCBDYWNoZUluZm9zOjpkZWNv ZGUoRGVjb2RlciYgZGVjb2RlciwgQ2FjaGVJbgogICAgIHJldHVybiBkZWNvZGVyLmRlY29kZShj YWNoZUluZm9zLnVwZGF0ZUNvdW50ZXIpOwogfQogCit0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiBp bmxpbmUgdm9pZCBDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQ6OmVuY29kZShFbmNvZGVy JiBlbmNvZGVyKSBjb25zdAoreworICAgIGVuY29kZXIgPDwgaWRlbnRpZmllcjsKKyAgICBlbmNv ZGVyIDw8IGhhZFN0b3JhZ2VFcnJvcjsKK30KKwordGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gaW5s aW5lIGJvb2wgQ2FjaGVJZGVudGlmaWVyT3BlcmF0aW9uUmVzdWx0OjpkZWNvZGUoRGVjb2RlciYg ZGVjb2RlciwgQ2FjaGVJZGVudGlmaWVyT3BlcmF0aW9uUmVzdWx0JiByZXN1bHQpCit7CisgICAg aWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaWRlbnRpZmllcikpCisgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgIHJldHVybiBkZWNvZGVyLmRlY29kZShyZXN1bHQuaGFkU3RvcmFnZUVycm9y KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgRE9NQ2FjaGVFbmdpbmUKIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9Xb3JrZXJD YWNoZVN0b3JhZ2VDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUv V29ya2VyQ2FjaGVTdG9yYWdlQ29ubmVjdGlvbi5jcHAKaW5kZXggZWQwNDkwOWZlNThkZmI3ZmIx ZTRlYzE5M2Y3MDE0YjAwNzA5MjcwZC4uNDcwMGIxYzhkMGZhY2JiNTY0OWRkNzQwZTIxMTlkNTdh MjYwMWQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9Xb3JrZXJD YWNoZVN0b3JhZ2VDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Nh Y2hlL1dvcmtlckNhY2hlU3RvcmFnZUNvbm5lY3Rpb24uY3BwCkBAIC0xMzMsNyArMTMzLDcgQEAg dm9pZCBXb3JrZXJDYWNoZVN0b3JhZ2VDb25uZWN0aW9uOjpkb1JlbW92ZSh1aW50NjRfdCByZXF1 ZXN0SWRlbnRpZmllciwgdWludDY0X3QKICAgICAgICAgQVNTRVJUKG1fbWFpblRocmVhZENvbm5l Y3Rpb24pOwogCiAgICAgICAgIG1fbWFpblRocmVhZENvbm5lY3Rpb24tPnJlbW92ZShjYWNoZUlk ZW50aWZpZXIsIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwg cmVxdWVzdElkZW50aWZpZXIsIGNhY2hlSWRlbnRpZmllcl0oY29uc3QgQ2FjaGVJZGVudGlmaWVy T3JFcnJvciYgcmVzdWx0KSBtdXRhYmxlIHsKLSAgICAgICAgICAgIEFTU0VSVCghcmVzdWx0Lmhh c1ZhbHVlKCkgfHwgcmVzdWx0LnZhbHVlKCkgPT0gY2FjaGVJZGVudGlmaWVyKTsKKyAgICAgICAg ICAgIEFTU0VSVCghcmVzdWx0Lmhhc1ZhbHVlKCkgfHwgcmVzdWx0LnZhbHVlKCkuaWRlbnRpZmll ciA9PSBjYWNoZUlkZW50aWZpZXIpOwogICAgICAgICAgICAgbV9wcm94eS5wb3N0VGFza0Zvck1v ZGVUb1dvcmtlckdsb2JhbFNjb3BlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90 ZWN0ZWRUaGlzKSwgcmVxdWVzdElkZW50aWZpZXIsIHJlc3VsdF0oU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCYgY29udGV4dCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgQVNTRVJUX1VOVVNFRChj b250ZXh0LCBjb250ZXh0LmlzV29ya2VyR2xvYmFsU2NvcGUoKSk7CiAgICAgICAgICAgICAgICAg cmVtb3ZlQ29tcGxldGVkKHJlcXVlc3RJZGVudGlmaWVyLCByZXN1bHQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3Bw IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUu Y3BwCmluZGV4IGNiYmNhZmJlOTgxZThmY2E2ZDFkNjE5ZmRkMGUzYzkxYjhhZWZhNDAuLjE0ZjI5 NjdjOTQ4OTVjMGJiZWY3MzYxOGJhMDY2ZmQ1ZjFmZDdmMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAK QEAgLTkwLDE2ICs5MCw3IEBAIHZvaWQgRW5naW5lOjpvcGVuKGNvbnN0IFN0cmluZyYgb3JpZ2lu LCBjb25zdCBTdHJpbmcmIGNhY2hlTmFtZSwgQ2FjaGVJZGVudGlmaWVyCiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBDYWNoZXMmIGNhY2hlcyA9IGNhY2hlc09yRXJy b3IudmFsdWUoKTsKLQotICAgICAgICBpZiAoYXV0byogY2FjaGUgPSBjYWNoZXMuZmluZChjYWNo ZU5hbWUpKSB7Ci0gICAgICAgICAgICBjYWxsYmFjayhjYWNoZS0+aWRlbnRpZmllcigpKTsKLSAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGNhY2hlcy5vcGVuKFN0cmlu ZyB7IGNhY2hlTmFtZSB9LCBbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oY29uc3QgQ2Fj aGVJZGVudGlmaWVyT3JFcnJvciYgcmVzdWx0KSBtdXRhYmxlIHsKLSAgICAgICAgICAgIGNhbGxi YWNrKHJlc3VsdCk7Ci0gICAgICAgIH0pOworICAgICAgICBjYWNoZXNPckVycm9yLnZhbHVlKCku Z2V0KCkub3BlbihjYWNoZU5hbWUsIFdURk1vdmUoY2FsbGJhY2spKTsKICAgICB9KTsKIH0KIApA QCAtMTE4LDEzICsxMDksNyBAQCB2b2lkIEVuZ2luZTo6cmVtb3ZlKHVpbnQ2NF90IGNhY2hlSWRl bnRpZmllciwgQ2FjaGVJZGVudGlmaWVyQ2FsbGJhY2smJiBjYWxsYmFjawogICAgICAgICByZXR1 cm47CiAgICAgfQogCi0gICAgY2FjaGVzVG9Nb2RpZnktPnJlbW92ZShjYWNoZUlkZW50aWZpZXIs IFtjYWNoZUlkZW50aWZpZXIsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKHN0ZDo6b3B0 aW9uYWw8RXJyb3I+JiYgZXJyb3IpIHsKLSAgICAgICAgaWYgKGVycm9yKSB7Ci0gICAgICAgICAg ICBjYWxsYmFjayhtYWtlVW5leHBlY3RlZChlcnJvci52YWx1ZSgpKSk7Ci0gICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgY2FsbGJhY2soY2FjaGVJZGVudGlmaWVyKTsKLSAg ICB9KTsKKyAgICBjYWNoZXNUb01vZGlmeS0+cmVtb3ZlKGNhY2hlSWRlbnRpZmllciwgV1RGTW92 ZShjYWxsYmFjaykpOwogfQogCiB2b2lkIEVuZ2luZTo6cmV0cmlldmVDYWNoZXMoY29uc3QgU3Ry aW5nJiBvcmlnaW4sIHVpbnQ2NF90IHVwZGF0ZUNvdW50ZXIsIENhY2hlSW5mb3NDYWxsYmFjayYm IGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZXMuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZXMuY3BwCmluZGV4IDViM2Y3ZjQ0ZmU1 NjI2ZDc0YzEzZGFkMGZlMTUyZDY3MzRmMGRmN2YuLmZlMWNmZmRkMjZmNTdjNDMxMzEzOTM1NGFl MzljODdlZTIxYzIxZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2FjaGVzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5jcHAKQEAgLTExNywy NCArMTE3LDI1IEBAIENhY2hlKiBDYWNoZXM6OmZpbmQodWludDY0X3QgaWRlbnRpZmllcikKICAg ICByZXR1cm4gKHBvc2l0aW9uICE9IG5vdEZvdW5kKSA/ICZtX3JlbW92ZWRDYWNoZXNbcG9zaXRp b25dIDogbnVsbHB0cjsKIH0KIAotdm9pZCBDYWNoZXM6Om9wZW4oU3RyaW5nJiYgbmFtZSwgQ2Fj aGVJZGVudGlmaWVyQ2FsbGJhY2smJiBjYWxsYmFjaykKK3ZvaWQgQ2FjaGVzOjpvcGVuKGNvbnN0 IFN0cmluZyYgbmFtZSwgQ2FjaGVJZGVudGlmaWVyQ2FsbGJhY2smJiBjYWxsYmFjaykKIHsKICAg ICBBU1NFUlQobV9lbmdpbmUpOwogCisgICAgaWYgKGF1dG8qIGNhY2hlID0gZmluZChuYW1lKSkg eworICAgICAgICBjYWxsYmFjayhDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQgeyBjYWNo ZS0+aWRlbnRpZmllcigpLCBmYWxzZSB9KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAg IG1ha2VEaXJ0eSgpOwogCiAgICAgdWludDY0X3QgY2FjaGVJZGVudGlmaWVyID0gbV9lbmdpbmUt Pm5leHRDYWNoZUlkZW50aWZpZXIoKTsKLSAgICBtX2NhY2hlcy5hcHBlbmQoQ2FjaGUgeyBjYWNo ZUlkZW50aWZpZXIsIFdURk1vdmUobmFtZSkgfSk7CisgICAgbV9jYWNoZXMuYXBwZW5kKENhY2hl IHsgY2FjaGVJZGVudGlmaWVyLCBTdHJpbmcgeyBuYW1lIH0gfSk7CiAgICAgd3JpdGVDYWNoZXNU b0Rpc2soW2NhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGNhY2hlSWRlbnRpZmllcl0oc3Rk OjpvcHRpb25hbDxFcnJvcj4mJiBlcnJvcikgbXV0YWJsZSB7Ci0gICAgICAgIGlmIChlcnJvcikg ewotICAgICAgICAgICAgY2FsbGJhY2sobWFrZVVuZXhwZWN0ZWQoZXJyb3IudmFsdWUoKSkpOwot ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIGNhbGxiYWNrKGNhY2hlSWRl bnRpZmllcik7CisgICAgICAgIGNhbGxiYWNrKENhY2hlSWRlbnRpZmllck9wZXJhdGlvblJlc3Vs dCB7IGNhY2hlSWRlbnRpZmllciwgISFlcnJvciB9KTsKICAgICB9KTsKIH0KIAotdm9pZCBDYWNo ZXM6OnJlbW92ZSh1aW50NjRfdCBpZGVudGlmaWVyLCBDb21wbGV0aW9uQ2FsbGJhY2smJiBjYWxs YmFjaykKK3ZvaWQgQ2FjaGVzOjpyZW1vdmUodWludDY0X3QgaWRlbnRpZmllciwgQ2FjaGVJZGVu dGlmaWVyQ2FsbGJhY2smJiBjYWxsYmFjaykKIHsKICAgICBBU1NFUlQobV9lbmdpbmUpOwogCkBA IC0xNDIsNyArMTQzLDcgQEAgdm9pZCBDYWNoZXM6OnJlbW92ZSh1aW50NjRfdCBpZGVudGlmaWVy LCBDb21wbGV0aW9uQ2FsbGJhY2smJiBjYWxsYmFjaykKIAogICAgIGlmIChwb3NpdGlvbiA9PSBu b3RGb3VuZCkgewogICAgICAgICBBU1NFUlQobV9yZW1vdmVkQ2FjaGVzLmZpbmRNYXRjaGluZyhb Jl0oY29uc3QgYXV0byYgaXRlbSkgeyByZXR1cm4gaXRlbS5pZGVudGlmaWVyKCkgPT0gaWRlbnRp ZmllcjsgfSkgIT0gbm90Rm91bmQpOwotICAgICAgICBjYWxsYmFjayhzdGQ6Om51bGxvcHQpOwor ICAgICAgICBjYWxsYmFjayhDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQgeyBpZGVudGlm aWVyLCBmYWxzZSB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTUxLDkgKzE1Miwx MCBAQCB2b2lkIENhY2hlczo6cmVtb3ZlKHVpbnQ2NF90IGlkZW50aWZpZXIsIENvbXBsZXRpb25D YWxsYmFjayYmIGNhbGxiYWNrKQogICAgIGF1dG8gY2FjaGUgPSBXVEZNb3ZlKG1fY2FjaGVzW3Bv c2l0aW9uXSk7CiAgICAgbV9jYWNoZXMucmVtb3ZlKHBvc2l0aW9uKTsKICAgICBtX3JlbW92ZWRD YWNoZXMuYXBwZW5kKFdURk1vdmUoY2FjaGUpKTsKLSAgICArK21fdXBkYXRlQ291bnRlcjsKIAot ICAgIHdyaXRlQ2FjaGVzVG9EaXNrKFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICB3cml0ZUNhY2hl c1RvRGlzayhbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgaWRlbnRpZmllcl0oc3RkOjpv cHRpb25hbDxFcnJvcj4mJiBlcnJvcikgbXV0YWJsZSB7CisgICAgICAgIGNhbGxiYWNrKENhY2hl SWRlbnRpZmllck9wZXJhdGlvblJlc3VsdCB7IGlkZW50aWZpZXIsICEhZXJyb3IgfSk7CisgICAg fSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgRGF0YSBlbmNvZGVDYWNoZU5hbWVzKGNvbnN0IFZlY3Rv cjxDYWNoZT4mIGNhY2hlcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2FjaGVzLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5oCmluZGV4IDM2MzBkNmE4 ZDhlNmNjZGIzNTljYmRjZjgyNjY4MjQzMDY4NWNlODUuLjEzMzMzZTA5YjVlMjcwMDUyYTZhYTQ3 MGMxNzNiMzU4YTg4OGE5ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2FjaGVzLmgKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZXMuaApAQCAtMzksOCAr MzksOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxDYWNoZXM+IGNyZWF0ZShFbmdpbmUmIGVu Z2luZSwgY29uc3QgU3RyaW5nJiBvcmlnaW4pIHsgcmV0dXJuIGFkb3B0UmVmKCpuZXcgQ2FjaGVz IHsgZW5naW5lLCBvcmlnaW4gfSk7IH0KIAogICAgIHZvaWQgaW5pdGlhbGl6ZShXZWJDb3JlOjpE T01DYWNoZUVuZ2luZTo6Q29tcGxldGlvbkNhbGxiYWNrJiYpOwotICAgIHZvaWQgb3BlbihTdHJp bmcmJiBuYW1lLCBXZWJDb3JlOjpET01DYWNoZUVuZ2luZTo6Q2FjaGVJZGVudGlmaWVyQ2FsbGJh Y2smJik7Ci0gICAgdm9pZCByZW1vdmUodWludDY0X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6RE9N Q2FjaGVFbmdpbmU6OkNvbXBsZXRpb25DYWxsYmFjayYmKTsKKyAgICB2b2lkIG9wZW4oY29uc3Qg U3RyaW5nJiBuYW1lLCBXZWJDb3JlOjpET01DYWNoZUVuZ2luZTo6Q2FjaGVJZGVudGlmaWVyQ2Fs bGJhY2smJik7CisgICAgdm9pZCByZW1vdmUodWludDY0X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6 RE9NQ2FjaGVFbmdpbmU6OkNhY2hlSWRlbnRpZmllckNhbGxiYWNrJiYpOwogICAgIHZvaWQgY2xl YXJNZW1vcnlSZXByZXNlbnRhdGlvbigpOwogCiAgICAgdm9pZCBkZXRhY2goKTsK 319654 2017-09-01 15:27:46 -0700 2017-09-01 15:58:44 -0700 Patch for landing bug-176241-20170901152745.patch text/plain 12731 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxNTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmNiODFmOGU4YjRlZTBh ZjAyMDBmY2RlYmVmYWIxNWQwZDQ4Y2Y4Mi4uNGIyOWZjZjRlZTUzMjRmYTE3NjM2ZmRkYjUxNzUw NGU0YWU2NzFkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA5LTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBEbyBub3QgUmVqZWN0IENh Y2hlU3RvcmFnZSBwcm9taXNlcyB3aGVuIHVwZGF0aW5nIHRoZSBwZXJzaXN0ZW50IGZpbGVzeXN0 ZW0gZGF0YSBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc2MjQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKwor ICAgICAgICBPcGVuL1JlbW92ZSBjYWNoZXMgbWF5IHN1Y2NlZWQgaW4gdXBkYXRpbmcgdGhlIG1l bW9yeSByZXByZXNlbnRhdGlvbiBidXQgdGhlIHdyaXRlLXRvLWRpc2sgb3BlcmF0aW9uIG1heSBm YWlsLgorICAgICAgICBJbiB0aGF0IGNhc2UsIHRoZSBjb3JyZXNwb25kaW5nIHByb21pc2UgaXMg bm93IHJlc29sdmVkIHNpbmNlIHRoZSB3ZWIgcGFnZSBjYW4gc3RpbGwgcHJvY2VlZWQuCisKKyAg ICAgICAgVGhlcmUgaXMgbm8gd2F5IHRvIHRlc3QgdGhhdCBjdXJyZW50bHkgYXMgdGhpcyB3b3Vs ZCByZXF1aXJlIGEgd3JpdGUgZGlzayBmYWlsdXJlIHRvIGJlIHRyaWdnZXJlZC4KKworICAgICAg ICAqIE1vZHVsZXMvY2FjaGUvQ2FjaGVTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omxv Z0NvbnNvbGVQZXJzaXN0ZW5jeUVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlU3RvcmFn ZTo6b3Blbik6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZVN0b3JhZ2U6OnJlbW92ZSk6CisgICAg ICAgICogTW9kdWxlcy9jYWNoZS9ET01DYWNoZUVuZ2luZS5oOgorICAgICAgICAoV2ViQ29yZTo6 RE9NQ2FjaGVFbmdpbmU6OkNhY2hlSWRlbnRpZmllck9wZXJhdGlvblJlc3VsdDo6ZW5jb2RlIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpDYWNoZUlkZW50aWZpZXJP cGVyYXRpb25SZXN1bHQ6OmRlY29kZSk6CisKIDIwMTctMDktMDEgIEVtaWxpbyBDb2JvcyDDgWx2 YXJleiAgPGVtaWxpb0BjcmlzYWwuaW8+CiAKICAgICAgICAgV3JvbmcgZ2V0Q29tcHV0ZWRTdHls ZSBiZWhhdmlvciBmb3IgcHNldWRvLWVsZW1lbnRzIGZvciBsYXlvdXQtZGVwZW5kZW50IHByb3Bl cnRpZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCmluZGV4IGIyMjY2N2YzODg4Y2ZmNTRkNWYxNWE4ZmQzMmNmODcwNmJmMDYy YWMuLmFkOWNhZTVhNGUwZThlMzkwNjI1MmI5ZTVkZTA5OTc2NjhmMWVmMmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTctMDktMDEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUu Y29tPgorCisgICAgICAgIERvIG5vdCBSZWplY3QgQ2FjaGVTdG9yYWdlIHByb21pc2VzIHdoZW4g dXBkYXRpbmcgdGhlIHBlcnNpc3RlbnQgZmlsZXN5c3RlbSBkYXRhIGZhaWxzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzYyNDEKKworICAgICAgICBS ZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIE9wZW4vUmVtb3ZlIGNhY2hl cyBtYXkgc3VjY2VlZCBpbiB0aGUgbWVtb3J5IHJlcHJlc2VudGF0aW9uIGJ1dCB0aGUgd3JpdGUt dG8tZGlzayBvcGVyYXRpb24gbWF5IGZhaWwuCisgICAgICAgIEluIHRoYXQgY2FzZSwgdGhlIGNh bGxiYWNrIGRvZXMgbm90IHJldHVybiBhbiBlcnJvciBidXQgYSB2YWx1ZSBjb250YWluaW5nIHRo ZSBjYWNoZSBpZGVudGlmaWVyLgorICAgICAgICBUaGUgdmFsdWUgd2lsbCBhbHNvIGNvbnRhaW4g YSBib29sZWFuIGZsYWcgc2V0IHRvIHRydWUgdG8gbm90aWZ5IHRoZSBjbGllbnQgdGhhdCBwZXJz aXN0ZW50IHN0b3JhZ2UgZmFpbGVkIHRoaXMgdGltZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNhY2hl U3RvcmFnZTo6RW5naW5lOjpvcGVuKToKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpF bmdpbmU6OnJlbW92ZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9y YWdlRW5naW5lQ2FjaGVzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpDYWNo ZXM6Om9wZW4pOgorICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkNhY2hlczo6cmVtb3Zl KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNo ZXMuaDoKKwogMjAxNy0wOS0wMSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJr aXQub3JnPgogCiAgICAgICAgIE1ha2UgUGFnZUNsaWVudEltcGxDb2NvYSBhIHByb3BlciBzdXBl cmNsYXNzIG9mIFBhZ2VDbGllbnRJbXBscyBmb3IgTWFjIGFuZCBpT1MKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUvQ2FjaGVTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvY2FjaGUvQ2FjaGVTdG9yYWdlLmNwcAppbmRleCAwY2I3NjJlN2YwNzkxOWY0 YzY1YzRkMjY0OTdlZDE5ZTFjODdlZDJlLi5jMmEyMmNhN2VhMzFiN2I5NDNmNzgxMTVjZGM3OTMw ZTU0Y2Y0N2ZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NhY2hlL0NhY2hl U3RvcmFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9DYWNoZVN0b3Jh Z2UuY3BwCkBAIC0xNjUsNiArMTY1LDE0IEBAIHZvaWQgQ2FjaGVTdG9yYWdlOjpyZXRyaWV2ZUNh Y2hlcyhXVEY6OkZ1bmN0aW9uPHZvaWQoc3RkOjpvcHRpb25hbDxFeGNlcHRpb24+JiYpCiAgICAg fSk7CiB9CiAKK3N0YXRpYyB2b2lkIGxvZ0NvbnNvbGVQZXJzaXN0ZW5jeUVycm9yKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFN0cmluZyYgY2FjaGVOYW1lKQoreworICAg IGlmICghY29udGV4dCkKKyAgICAgICAgcmV0dXJuOworCisgICAgY29udGV4dC0+YWRkQ29uc29s ZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6SlMsIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIG1ha2VTdHJp bmcoIlRoZXJlIHdhcyBhbiBlcnJvciBtYWtpbmcgIiwgY2FjaGVOYW1lLCAiIHBlcnNpc3RlbnQg b24gdGhlIGZpbGVzeXN0ZW0iKSk7Cit9CisKIHZvaWQgQ2FjaGVTdG9yYWdlOjpvcGVuKGNvbnN0 IFN0cmluZyYgbmFtZSwgRE9NUHJvbWlzZURlZmVycmVkPElETEludGVyZmFjZTxET01DYWNoZT4+ JiYgcHJvbWlzZSkKIHsKICAgICByZXRyaWV2ZUNhY2hlcyhbdGhpcywgbmFtZSwgcHJvbWlzZSA9 IFdURk1vdmUocHJvbWlzZSldKHN0ZDo6b3B0aW9uYWw8RXhjZXB0aW9uPiYmIGV4Y2VwdGlvbikg bXV0YWJsZSB7CkBAIC0xODksNiArMTk3LDkgQEAgdm9pZCBDYWNoZVN0b3JhZ2U6Om9wZW4oY29u c3QgU3RyaW5nJiBuYW1lLCBET01Qcm9taXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPERPTUMKICAg ICAgICAgICAgICAgICBpZiAoIXJlc3VsdC5oYXNWYWx1ZSgpKQogICAgICAgICAgICAgICAgICAg ICBwcm9taXNlLnJlamVjdChET01DYWNoZUVuZ2luZTo6ZXJyb3JUb0V4Y2VwdGlvbihyZXN1bHQu ZXJyb3IoKSkpOwogICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICBp ZiAocmVzdWx0LnZhbHVlKCkuaGFkU3RvcmFnZUVycm9yKQorICAgICAgICAgICAgICAgICAgICAg ICAgbG9nQ29uc29sZVBlcnNpc3RlbmN5RXJyb3Ioc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBu YW1lKTsKKwogICAgICAgICAgICAgICAgICAgICBhdXRvIGNhY2hlID0gRE9NQ2FjaGU6OmNyZWF0 ZSgqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBTdHJpbmcgeyBuYW1lIH0sIHJlc3VsdC52YWx1 ZSgpLCBtX2Nvbm5lY3Rpb24uY29weVJlZigpKTsKICAgICAgICAgICAgICAgICAgICAgcHJvbWlz ZS5yZXNvbHZlKGNhY2hlKTsKICAgICAgICAgICAgICAgICAgICAgbV9jYWNoZXMuYXBwZW5kKFdU Rk1vdmUoY2FjaGUpKTsKQEAgLTIyMSw4ICsyMzIsMTEgQEAgdm9pZCBDYWNoZVN0b3JhZ2U6OnJl bW92ZShjb25zdCBTdHJpbmcmIG5hbWUsIERPTVByb21pc2VEZWZlcnJlZDxJRExCb29sZWFuPiYm IHAKICAgICAgICAgICAgIGlmICghbV9pc1N0b3BwZWQpIHsKICAgICAgICAgICAgICAgICBpZiAo IXJlc3VsdC5oYXNWYWx1ZSgpKQogICAgICAgICAgICAgICAgICAgICBwcm9taXNlLnJlamVjdChE T01DYWNoZUVuZ2luZTo6ZXJyb3JUb0V4Y2VwdGlvbihyZXN1bHQuZXJyb3IoKSkpOwotICAgICAg ICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICAg ICAgaWYgKHJlc3VsdC52YWx1ZSgpLmhhZFN0b3JhZ2VFcnJvcikKKyAgICAgICAgICAgICAgICAg ICAgICAgIGxvZ0NvbnNvbGVQZXJzaXN0ZW5jeUVycm9yKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQo KSwgbmFtZSk7CiAgICAgICAgICAgICAgICAgICAgIHByb21pc2UucmVzb2x2ZSh0cnVlKTsKKyAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICB1bnNldFBlbmRpbmdB Y3Rpdml0eSh0aGlzKTsKICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2NhY2hlL0RPTUNhY2hlRW5naW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Nh Y2hlL0RPTUNhY2hlRW5naW5lLmgKaW5kZXggNDk3ZTk3ZGNkYzA3NjU5YTFkNTE5YTM0ZDFmZGIx ZTkxMjk3NzMxNy4uOGY3NGMzMTUyNGQzNDgwOGNlODc2MmQzYzU4ZWY3N2NhMmFlMDg4YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9ET01DYWNoZUVuZ2luZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUvRE9NQ2FjaGVFbmdpbmUuaApAQCAtODMs NyArODMsMTYgQEAgc3RydWN0IENhY2hlSW5mb3MgewogICAgIHVpbnQ2NF90IHVwZGF0ZUNvdW50 ZXI7CiB9OwogCi11c2luZyBDYWNoZUlkZW50aWZpZXJPckVycm9yID0gRXhwZWN0ZWQ8dWludDY0 X3QsIEVycm9yPjsKK3N0cnVjdCBDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQgeworICAg IHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+IHZvaWQgZW5jb2RlKEVuY29kZXImKSBjb25zdDsKKyAg ICB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGF0aWMgYm9vbCBkZWNvZGUoRGVjb2RlciYsIENh Y2hlSWRlbnRpZmllck9wZXJhdGlvblJlc3VsdCYpOworCisgICAgdWludDY0X3QgaWRlbnRpZmll ciB7IDAgfTsKKyAgICAvLyBUcnVlIGluIGNhc2Ugc3RvcmluZyBjYWNoZSBsaXN0IG9uIHRoZSBm aWxlc3lzdGVtIGZhaWxlZC4KKyAgICBib29sIGhhZFN0b3JhZ2VFcnJvciB7IGZhbHNlIH07Cit9 OworCit1c2luZyBDYWNoZUlkZW50aWZpZXJPckVycm9yID0gRXhwZWN0ZWQ8Q2FjaGVJZGVudGlm aWVyT3BlcmF0aW9uUmVzdWx0LCBFcnJvcj47CiB1c2luZyBDYWNoZUlkZW50aWZpZXJDYWxsYmFj ayA9IFdURjo6RnVuY3Rpb248dm9pZChjb25zdCBDYWNoZUlkZW50aWZpZXJPckVycm9yJik+Owog CiB1c2luZyBSZWNvcmRJZGVudGlmaWVyc09yRXJyb3IgPSBFeHBlY3RlZDxWZWN0b3I8dWludDY0 X3Q+LCBFcnJvcj47CkBAIC0xMTEsNiArMTIwLDIwIEBAIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+ IGlubGluZSBib29sIENhY2hlSW5mb3M6OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBDYWNoZUlu CiAgICAgcmV0dXJuIGRlY29kZXIuZGVjb2RlKGNhY2hlSW5mb3MudXBkYXRlQ291bnRlcik7CiB9 CiAKK3RlbXBsYXRlPGNsYXNzIEVuY29kZXI+IGlubGluZSB2b2lkIENhY2hlSWRlbnRpZmllck9w ZXJhdGlvblJlc3VsdDo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0Cit7CisgICAgZW5j b2RlciA8PCBpZGVudGlmaWVyOworICAgIGVuY29kZXIgPDwgaGFkU3RvcmFnZUVycm9yOworfQor Cit0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBpbmxpbmUgYm9vbCBDYWNoZUlkZW50aWZpZXJPcGVy YXRpb25SZXN1bHQ6OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBDYWNoZUlkZW50aWZpZXJPcGVy YXRpb25SZXN1bHQmIHJlc3VsdCkKK3sKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5p ZGVudGlmaWVyKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGRlY29kZXIu ZGVjb2RlKHJlc3VsdC5oYWRTdG9yYWdlRXJyb3IpOworfQorCiB9IC8vIG5hbWVzcGFjZSBET01D YWNoZUVuZ2luZQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2NhY2hlL1dvcmtlckNhY2hlU3RvcmFnZUNvbm5lY3Rpb24uY3BwIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9Xb3JrZXJDYWNoZVN0b3JhZ2VDb25uZWN0aW9u LmNwcAppbmRleCBlZDA0OTA5ZmU1OGRmYjdmYjFlNGVjMTkzZjcwMTRiMDA3MDkyNzBkLi40NzAw YjFjOGQwZmFjYmI1NjQ5ZGQ3NDBlMjExOWQ1N2EyNjAxZDkxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2NhY2hlL1dvcmtlckNhY2hlU3RvcmFnZUNvbm5lY3Rpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUvV29ya2VyQ2FjaGVTdG9yYWdlQ29ubmVj dGlvbi5jcHAKQEAgLTEzMyw3ICsxMzMsNyBAQCB2b2lkIFdvcmtlckNhY2hlU3RvcmFnZUNvbm5l Y3Rpb246OmRvUmVtb3ZlKHVpbnQ2NF90IHJlcXVlc3RJZGVudGlmaWVyLCB1aW50NjRfdAogICAg ICAgICBBU1NFUlQobV9tYWluVGhyZWFkQ29ubmVjdGlvbik7CiAKICAgICAgICAgbV9tYWluVGhy ZWFkQ29ubmVjdGlvbi0+cmVtb3ZlKGNhY2hlSWRlbnRpZmllciwgW3RoaXMsIHByb3RlY3RlZFRo aXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCByZXF1ZXN0SWRlbnRpZmllciwgY2FjaGVJZGVu dGlmaWVyXShjb25zdCBDYWNoZUlkZW50aWZpZXJPckVycm9yJiByZXN1bHQpIG11dGFibGUgewot ICAgICAgICAgICAgQVNTRVJUKCFyZXN1bHQuaGFzVmFsdWUoKSB8fCByZXN1bHQudmFsdWUoKSA9 PSBjYWNoZUlkZW50aWZpZXIpOworICAgICAgICAgICAgQVNTRVJUKCFyZXN1bHQuaGFzVmFsdWUo KSB8fCByZXN1bHQudmFsdWUoKS5pZGVudGlmaWVyID09IGNhY2hlSWRlbnRpZmllcik7CiAgICAg ICAgICAgICBtX3Byb3h5LnBvc3RUYXNrRm9yTW9kZVRvV29ya2VyR2xvYmFsU2NvcGUoW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCByZXF1ZXN0SWRlbnRpZmll ciwgcmVzdWx0XShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0KSBtdXRhYmxlIHsKICAg ICAgICAgICAgICAgICBBU1NFUlRfVU5VU0VEKGNvbnRleHQsIGNvbnRleHQuaXNXb3JrZXJHbG9i YWxTY29wZSgpKTsKICAgICAgICAgICAgICAgICByZW1vdmVDb21wbGV0ZWQocmVxdWVzdElkZW50 aWZpZXIsIHJlc3VsdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAKaW5kZXggY2JiY2FmYmU5ODFlOGZjYTZk MWQ2MTlmZGQwZTNjOTFiOGFlZmE0MC4uMTRmMjk2N2M5NDg5NWMwYmJlZjczNjE4YmEwNjZmZDVm MWZkN2YwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9D YWNoZVN0b3JhZ2VFbmdpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcApAQCAtOTAsMTYgKzkwLDcgQEAgdm9pZCBFbmdp bmU6Om9wZW4oY29uc3QgU3RyaW5nJiBvcmlnaW4sIGNvbnN0IFN0cmluZyYgY2FjaGVOYW1lLCBD YWNoZUlkZW50aWZpZXIKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAg IENhY2hlcyYgY2FjaGVzID0gY2FjaGVzT3JFcnJvci52YWx1ZSgpOwotCi0gICAgICAgIGlmIChh dXRvKiBjYWNoZSA9IGNhY2hlcy5maW5kKGNhY2hlTmFtZSkpIHsKLSAgICAgICAgICAgIGNhbGxi YWNrKGNhY2hlLT5pZGVudGlmaWVyKCkpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9 Ci0KLSAgICAgICAgY2FjaGVzLm9wZW4oU3RyaW5nIHsgY2FjaGVOYW1lIH0sIFtjYWxsYmFjayA9 IFdURk1vdmUoY2FsbGJhY2spXShjb25zdCBDYWNoZUlkZW50aWZpZXJPckVycm9yJiByZXN1bHQp IG11dGFibGUgewotICAgICAgICAgICAgY2FsbGJhY2socmVzdWx0KTsKLSAgICAgICAgfSk7Cisg ICAgICAgIGNhY2hlc09yRXJyb3IudmFsdWUoKS5nZXQoKS5vcGVuKGNhY2hlTmFtZSwgV1RGTW92 ZShjYWxsYmFjaykpOwogICAgIH0pOwogfQogCkBAIC0xMTgsMTMgKzEwOSw3IEBAIHZvaWQgRW5n aW5lOjpyZW1vdmUodWludDY0X3QgY2FjaGVJZGVudGlmaWVyLCBDYWNoZUlkZW50aWZpZXJDYWxs YmFjayYmIGNhbGxiYWNrCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBjYWNoZXNUb01v ZGlmeS0+cmVtb3ZlKGNhY2hlSWRlbnRpZmllciwgW2NhY2hlSWRlbnRpZmllciwgY2FsbGJhY2sg PSBXVEZNb3ZlKGNhbGxiYWNrKV0oc3RkOjpvcHRpb25hbDxFcnJvcj4mJiBlcnJvcikgewotICAg ICAgICBpZiAoZXJyb3IpIHsKLSAgICAgICAgICAgIGNhbGxiYWNrKG1ha2VVbmV4cGVjdGVkKGVy cm9yLnZhbHVlKCkpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBj YWxsYmFjayhjYWNoZUlkZW50aWZpZXIpOwotICAgIH0pOworICAgIGNhY2hlc1RvTW9kaWZ5LT5y ZW1vdmUoY2FjaGVJZGVudGlmaWVyLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiB9CiAKIHZvaWQgRW5n aW5lOjpyZXRyaWV2ZUNhY2hlcyhjb25zdCBTdHJpbmcmIG9yaWdpbiwgdWludDY0X3QgdXBkYXRl Q291bnRlciwgQ2FjaGVJbmZvc0NhbGxiYWNrJiYgY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5j cHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2lu ZUNhY2hlcy5jcHAKaW5kZXggNWIzZjdmNDRmZTU2MjZkNzRjMTNkYWQwZmUxNTJkNjczNGYwZGY3 Zi4uZmUxY2ZmZGQyNmY1N2M0MzEzMTM5MzU0YWUzOWM4N2VlMjFjMjFlNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNo ZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9y YWdlRW5naW5lQ2FjaGVzLmNwcApAQCAtMTE3LDI0ICsxMTcsMjUgQEAgQ2FjaGUqIENhY2hlczo6 ZmluZCh1aW50NjRfdCBpZGVudGlmaWVyKQogICAgIHJldHVybiAocG9zaXRpb24gIT0gbm90Rm91 bmQpID8gJm1fcmVtb3ZlZENhY2hlc1twb3NpdGlvbl0gOiBudWxscHRyOwogfQogCi12b2lkIENh Y2hlczo6b3BlbihTdHJpbmcmJiBuYW1lLCBDYWNoZUlkZW50aWZpZXJDYWxsYmFjayYmIGNhbGxi YWNrKQordm9pZCBDYWNoZXM6Om9wZW4oY29uc3QgU3RyaW5nJiBuYW1lLCBDYWNoZUlkZW50aWZp ZXJDYWxsYmFjayYmIGNhbGxiYWNrKQogewogICAgIEFTU0VSVChtX2VuZ2luZSk7CiAKKyAgICBp ZiAoYXV0byogY2FjaGUgPSBmaW5kKG5hbWUpKSB7CisgICAgICAgIGNhbGxiYWNrKENhY2hlSWRl bnRpZmllck9wZXJhdGlvblJlc3VsdCB7IGNhY2hlLT5pZGVudGlmaWVyKCksIGZhbHNlIH0pOwor ICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgbWFrZURpcnR5KCk7CiAKICAgICB1aW50NjRf dCBjYWNoZUlkZW50aWZpZXIgPSBtX2VuZ2luZS0+bmV4dENhY2hlSWRlbnRpZmllcigpOwotICAg IG1fY2FjaGVzLmFwcGVuZChDYWNoZSB7IGNhY2hlSWRlbnRpZmllciwgV1RGTW92ZShuYW1lKSB9 KTsKKyAgICBtX2NhY2hlcy5hcHBlbmQoQ2FjaGUgeyBjYWNoZUlkZW50aWZpZXIsIFN0cmluZyB7 IG5hbWUgfSB9KTsKICAgICB3cml0ZUNhY2hlc1RvRGlzayhbY2FsbGJhY2sgPSBXVEZNb3ZlKGNh bGxiYWNrKSwgY2FjaGVJZGVudGlmaWVyXShzdGQ6Om9wdGlvbmFsPEVycm9yPiYmIGVycm9yKSBt dXRhYmxlIHsKLSAgICAgICAgaWYgKGVycm9yKSB7Ci0gICAgICAgICAgICBjYWxsYmFjayhtYWtl VW5leHBlY3RlZChlcnJvci52YWx1ZSgpKSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IH0KLSAgICAgICAgY2FsbGJhY2soY2FjaGVJZGVudGlmaWVyKTsKKyAgICAgICAgY2FsbGJhY2so Q2FjaGVJZGVudGlmaWVyT3BlcmF0aW9uUmVzdWx0IHsgY2FjaGVJZGVudGlmaWVyLCAhIWVycm9y IH0pOwogICAgIH0pOwogfQogCi12b2lkIENhY2hlczo6cmVtb3ZlKHVpbnQ2NF90IGlkZW50aWZp ZXIsIENvbXBsZXRpb25DYWxsYmFjayYmIGNhbGxiYWNrKQordm9pZCBDYWNoZXM6OnJlbW92ZSh1 aW50NjRfdCBpZGVudGlmaWVyLCBDYWNoZUlkZW50aWZpZXJDYWxsYmFjayYmIGNhbGxiYWNrKQog ewogICAgIEFTU0VSVChtX2VuZ2luZSk7CiAKQEAgLTE0Miw3ICsxNDMsNyBAQCB2b2lkIENhY2hl czo6cmVtb3ZlKHVpbnQ2NF90IGlkZW50aWZpZXIsIENvbXBsZXRpb25DYWxsYmFjayYmIGNhbGxi YWNrKQogCiAgICAgaWYgKHBvc2l0aW9uID09IG5vdEZvdW5kKSB7CiAgICAgICAgIEFTU0VSVCht X3JlbW92ZWRDYWNoZXMuZmluZE1hdGNoaW5nKFsmXShjb25zdCBhdXRvJiBpdGVtKSB7IHJldHVy biBpdGVtLmlkZW50aWZpZXIoKSA9PSBpZGVudGlmaWVyOyB9KSAhPSBub3RGb3VuZCk7Ci0gICAg ICAgIGNhbGxiYWNrKHN0ZDo6bnVsbG9wdCk7CisgICAgICAgIGNhbGxiYWNrKENhY2hlSWRlbnRp Zmllck9wZXJhdGlvblJlc3VsdCB7IGlkZW50aWZpZXIsIGZhbHNlIH0pOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCkBAIC0xNTEsOSArMTUyLDEwIEBAIHZvaWQgQ2FjaGVzOjpyZW1vdmUodWlu dDY0X3QgaWRlbnRpZmllciwgQ29tcGxldGlvbkNhbGxiYWNrJiYgY2FsbGJhY2spCiAgICAgYXV0 byBjYWNoZSA9IFdURk1vdmUobV9jYWNoZXNbcG9zaXRpb25dKTsKICAgICBtX2NhY2hlcy5yZW1v dmUocG9zaXRpb24pOwogICAgIG1fcmVtb3ZlZENhY2hlcy5hcHBlbmQoV1RGTW92ZShjYWNoZSkp OwotICAgICsrbV91cGRhdGVDb3VudGVyOwogCi0gICAgd3JpdGVDYWNoZXNUb0Rpc2soV1RGTW92 ZShjYWxsYmFjaykpOworICAgIHdyaXRlQ2FjaGVzVG9EaXNrKFtjYWxsYmFjayA9IFdURk1vdmUo Y2FsbGJhY2spLCBpZGVudGlmaWVyXShzdGQ6Om9wdGlvbmFsPEVycm9yPiYmIGVycm9yKSBtdXRh YmxlIHsKKyAgICAgICAgY2FsbGJhY2soQ2FjaGVJZGVudGlmaWVyT3BlcmF0aW9uUmVzdWx0IHsg aWRlbnRpZmllciwgISFlcnJvciB9KTsKKyAgICB9KTsKIH0KIAogc3RhdGljIGlubGluZSBEYXRh IGVuY29kZUNhY2hlTmFtZXMoY29uc3QgVmVjdG9yPENhY2hlPiYgY2FjaGVzKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVD YWNoZXMuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdl RW5naW5lQ2FjaGVzLmgKaW5kZXggMzYzMGQ2YThkOGU2Y2NkYjM1OWNiZGNmODI2NjgyNDMwNjg1 Y2U4NS4uMTMzMzNlMDliNWUyNzAwNTJhNmFhNDcwYzE3M2IzNThhODg4YTlmNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVD YWNoZXMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3Rv cmFnZUVuZ2luZUNhY2hlcy5oCkBAIC0zOSw4ICszOSw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMg UmVmPENhY2hlcz4gY3JlYXRlKEVuZ2luZSYgZW5naW5lLCBjb25zdCBTdHJpbmcmIG9yaWdpbikg eyByZXR1cm4gYWRvcHRSZWYoKm5ldyBDYWNoZXMgeyBlbmdpbmUsIG9yaWdpbiB9KTsgfQogCiAg ICAgdm9pZCBpbml0aWFsaXplKFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpDb21wbGV0aW9uQ2Fs bGJhY2smJik7Ci0gICAgdm9pZCBvcGVuKFN0cmluZyYmIG5hbWUsIFdlYkNvcmU6OkRPTUNhY2hl RW5naW5lOjpDYWNoZUlkZW50aWZpZXJDYWxsYmFjayYmKTsKLSAgICB2b2lkIHJlbW92ZSh1aW50 NjRfdCBpZGVudGlmaWVyLCBXZWJDb3JlOjpET01DYWNoZUVuZ2luZTo6Q29tcGxldGlvbkNhbGxi YWNrJiYpOworICAgIHZvaWQgb3Blbihjb25zdCBTdHJpbmcmIG5hbWUsIFdlYkNvcmU6OkRPTUNh Y2hlRW5naW5lOjpDYWNoZUlkZW50aWZpZXJDYWxsYmFjayYmKTsKKyAgICB2b2lkIHJlbW92ZSh1 aW50NjRfdCBpZGVudGlmaWVyLCBXZWJDb3JlOjpET01DYWNoZUVuZ2luZTo6Q2FjaGVJZGVudGlm aWVyQ2FsbGJhY2smJik7CiAgICAgdm9pZCBjbGVhck1lbW9yeVJlcHJlc2VudGF0aW9uKCk7CiAK ICAgICB2b2lkIGRldGFjaCgpOwo= 319659 2017-09-01 15:58:45 -0700 2017-09-01 16:28:13 -0700 Patch for landing bug-176241-20170901155845.patch text/plain 12898 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxNTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmNiODFmOGU4YjRlZTBh ZjAyMDBmY2RlYmVmYWIxNWQwZDQ4Y2Y4Mi4uNGIyOWZjZjRlZTUzMjRmYTE3NjM2ZmRkYjUxNzUw NGU0YWU2NzFkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA5LTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBEbyBub3QgUmVqZWN0IENh Y2hlU3RvcmFnZSBwcm9taXNlcyB3aGVuIHVwZGF0aW5nIHRoZSBwZXJzaXN0ZW50IGZpbGVzeXN0 ZW0gZGF0YSBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc2MjQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKwor ICAgICAgICBPcGVuL1JlbW92ZSBjYWNoZXMgbWF5IHN1Y2NlZWQgaW4gdXBkYXRpbmcgdGhlIG1l bW9yeSByZXByZXNlbnRhdGlvbiBidXQgdGhlIHdyaXRlLXRvLWRpc2sgb3BlcmF0aW9uIG1heSBm YWlsLgorICAgICAgICBJbiB0aGF0IGNhc2UsIHRoZSBjb3JyZXNwb25kaW5nIHByb21pc2UgaXMg bm93IHJlc29sdmVkIHNpbmNlIHRoZSB3ZWIgcGFnZSBjYW4gc3RpbGwgcHJvY2VlZWQuCisKKyAg ICAgICAgVGhlcmUgaXMgbm8gd2F5IHRvIHRlc3QgdGhhdCBjdXJyZW50bHkgYXMgdGhpcyB3b3Vs ZCByZXF1aXJlIGEgd3JpdGUgZGlzayBmYWlsdXJlIHRvIGJlIHRyaWdnZXJlZC4KKworICAgICAg ICAqIE1vZHVsZXMvY2FjaGUvQ2FjaGVTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omxv Z0NvbnNvbGVQZXJzaXN0ZW5jeUVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlU3RvcmFn ZTo6b3Blbik6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZVN0b3JhZ2U6OnJlbW92ZSk6CisgICAg ICAgICogTW9kdWxlcy9jYWNoZS9ET01DYWNoZUVuZ2luZS5oOgorICAgICAgICAoV2ViQ29yZTo6 RE9NQ2FjaGVFbmdpbmU6OkNhY2hlSWRlbnRpZmllck9wZXJhdGlvblJlc3VsdDo6ZW5jb2RlIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpDYWNoZUlkZW50aWZpZXJP cGVyYXRpb25SZXN1bHQ6OmRlY29kZSk6CisKIDIwMTctMDktMDEgIEVtaWxpbyBDb2JvcyDDgWx2 YXJleiAgPGVtaWxpb0BjcmlzYWwuaW8+CiAKICAgICAgICAgV3JvbmcgZ2V0Q29tcHV0ZWRTdHls ZSBiZWhhdmlvciBmb3IgcHNldWRvLWVsZW1lbnRzIGZvciBsYXlvdXQtZGVwZW5kZW50IHByb3Bl cnRpZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCmluZGV4IGIyMjY2N2YzODg4Y2ZmNTRkNWYxNWE4ZmQzMmNmODcwNmJmMDYy YWMuLmFkOWNhZTVhNGUwZThlMzkwNjI1MmI5ZTVkZTA5OTc2NjhmMWVmMmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTctMDktMDEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUu Y29tPgorCisgICAgICAgIERvIG5vdCBSZWplY3QgQ2FjaGVTdG9yYWdlIHByb21pc2VzIHdoZW4g dXBkYXRpbmcgdGhlIHBlcnNpc3RlbnQgZmlsZXN5c3RlbSBkYXRhIGZhaWxzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzYyNDEKKworICAgICAgICBS ZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIE9wZW4vUmVtb3ZlIGNhY2hl cyBtYXkgc3VjY2VlZCBpbiB0aGUgbWVtb3J5IHJlcHJlc2VudGF0aW9uIGJ1dCB0aGUgd3JpdGUt dG8tZGlzayBvcGVyYXRpb24gbWF5IGZhaWwuCisgICAgICAgIEluIHRoYXQgY2FzZSwgdGhlIGNh bGxiYWNrIGRvZXMgbm90IHJldHVybiBhbiBlcnJvciBidXQgYSB2YWx1ZSBjb250YWluaW5nIHRo ZSBjYWNoZSBpZGVudGlmaWVyLgorICAgICAgICBUaGUgdmFsdWUgd2lsbCBhbHNvIGNvbnRhaW4g YSBib29sZWFuIGZsYWcgc2V0IHRvIHRydWUgdG8gbm90aWZ5IHRoZSBjbGllbnQgdGhhdCBwZXJz aXN0ZW50IHN0b3JhZ2UgZmFpbGVkIHRoaXMgdGltZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNhY2hl U3RvcmFnZTo6RW5naW5lOjpvcGVuKToKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpF bmdpbmU6OnJlbW92ZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9y YWdlRW5naW5lQ2FjaGVzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpDYWNo ZXM6Om9wZW4pOgorICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkNhY2hlczo6cmVtb3Zl KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNo ZXMuaDoKKwogMjAxNy0wOS0wMSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJr aXQub3JnPgogCiAgICAgICAgIE1ha2UgUGFnZUNsaWVudEltcGxDb2NvYSBhIHByb3BlciBzdXBl cmNsYXNzIG9mIFBhZ2VDbGllbnRJbXBscyBmb3IgTWFjIGFuZCBpT1MKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUvQ2FjaGVTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvY2FjaGUvQ2FjaGVTdG9yYWdlLmNwcAppbmRleCAwY2I3NjJlN2YwNzkxOWY0 YzY1YzRkMjY0OTdlZDE5ZTFjODdlZDJlLi40MTUzNTE4YzcyZThhNDZmZDgyNjcxZjgxMmU5ZTdj YTgwNTYyMTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NhY2hlL0NhY2hl U3RvcmFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9DYWNoZVN0b3Jh Z2UuY3BwCkBAIC0xNjUsNiArMTY1LDE0IEBAIHZvaWQgQ2FjaGVTdG9yYWdlOjpyZXRyaWV2ZUNh Y2hlcyhXVEY6OkZ1bmN0aW9uPHZvaWQoc3RkOjpvcHRpb25hbDxFeGNlcHRpb24+JiYpCiAgICAg fSk7CiB9CiAKK3N0YXRpYyB2b2lkIGxvZ0NvbnNvbGVQZXJzaXN0ZW5jeUVycm9yKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFN0cmluZyYgY2FjaGVOYW1lKQoreworICAg IGlmICghY29udGV4dCkKKyAgICAgICAgcmV0dXJuOworCisgICAgY29udGV4dC0+YWRkQ29uc29s ZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6SlMsIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIG1ha2VTdHJp bmcoIlRoZXJlIHdhcyBhbiBlcnJvciBtYWtpbmcgIiwgY2FjaGVOYW1lLCAiIHBlcnNpc3RlbnQg b24gdGhlIGZpbGVzeXN0ZW0iKSk7Cit9CisKIHZvaWQgQ2FjaGVTdG9yYWdlOjpvcGVuKGNvbnN0 IFN0cmluZyYgbmFtZSwgRE9NUHJvbWlzZURlZmVycmVkPElETEludGVyZmFjZTxET01DYWNoZT4+ JiYgcHJvbWlzZSkKIHsKICAgICByZXRyaWV2ZUNhY2hlcyhbdGhpcywgbmFtZSwgcHJvbWlzZSA9 IFdURk1vdmUocHJvbWlzZSldKHN0ZDo6b3B0aW9uYWw8RXhjZXB0aW9uPiYmIGV4Y2VwdGlvbikg bXV0YWJsZSB7CkBAIC0xODksNyArMTk3LDEwIEBAIHZvaWQgQ2FjaGVTdG9yYWdlOjpvcGVuKGNv bnN0IFN0cmluZyYgbmFtZSwgRE9NUHJvbWlzZURlZmVycmVkPElETEludGVyZmFjZTxET01DCiAg ICAgICAgICAgICAgICAgaWYgKCFyZXN1bHQuaGFzVmFsdWUoKSkKICAgICAgICAgICAgICAgICAg ICAgcHJvbWlzZS5yZWplY3QoRE9NQ2FjaGVFbmdpbmU6OmVycm9yVG9FeGNlcHRpb24ocmVzdWx0 LmVycm9yKCkpKTsKICAgICAgICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAg YXV0byBjYWNoZSA9IERPTUNhY2hlOjpjcmVhdGUoKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwg U3RyaW5nIHsgbmFtZSB9LCByZXN1bHQudmFsdWUoKSwgbV9jb25uZWN0aW9uLmNvcHlSZWYoKSk7 CisgICAgICAgICAgICAgICAgICAgIGlmIChyZXN1bHQudmFsdWUoKS5oYWRTdG9yYWdlRXJyb3Ip CisgICAgICAgICAgICAgICAgICAgICAgICBsb2dDb25zb2xlUGVyc2lzdGVuY3lFcnJvcihzY3Jp cHRFeGVjdXRpb25Db250ZXh0KCksIG5hbWUpOworCisgICAgICAgICAgICAgICAgICAgIGF1dG8g Y2FjaGUgPSBET01DYWNoZTo6Y3JlYXRlKCpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIFN0cmlu ZyB7IG5hbWUgfSwgcmVzdWx0LnZhbHVlKCkuaWRlbnRpZmllciwgbV9jb25uZWN0aW9uLmNvcHlS ZWYoKSk7CiAgICAgICAgICAgICAgICAgICAgIHByb21pc2UucmVzb2x2ZShjYWNoZSk7CiAgICAg ICAgICAgICAgICAgICAgIG1fY2FjaGVzLmFwcGVuZChXVEZNb3ZlKGNhY2hlKSk7CiAgICAgICAg ICAgICAgICAgfQpAQCAtMjIxLDggKzIzMiwxMSBAQCB2b2lkIENhY2hlU3RvcmFnZTo6cmVtb3Zl KGNvbnN0IFN0cmluZyYgbmFtZSwgRE9NUHJvbWlzZURlZmVycmVkPElETEJvb2xlYW4+JiYgcAog ICAgICAgICAgICAgaWYgKCFtX2lzU3RvcHBlZCkgewogICAgICAgICAgICAgICAgIGlmICghcmVz dWx0Lmhhc1ZhbHVlKCkpCiAgICAgICAgICAgICAgICAgICAgIHByb21pc2UucmVqZWN0KERPTUNh Y2hlRW5naW5lOjplcnJvclRvRXhjZXB0aW9uKHJlc3VsdC5lcnJvcigpKSk7Ci0gICAgICAgICAg ICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICBp ZiAocmVzdWx0LnZhbHVlKCkuaGFkU3RvcmFnZUVycm9yKQorICAgICAgICAgICAgICAgICAgICAg ICAgbG9nQ29uc29sZVBlcnNpc3RlbmN5RXJyb3Ioc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBu YW1lKTsKICAgICAgICAgICAgICAgICAgICAgcHJvbWlzZS5yZXNvbHZlKHRydWUpOworICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHVuc2V0UGVuZGluZ0FjdGl2 aXR5KHRoaXMpOwogICAgICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvY2FjaGUvRE9NQ2FjaGVFbmdpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUv RE9NQ2FjaGVFbmdpbmUuaAppbmRleCA0OTdlOTdkY2RjMDc2NTlhMWQ1MTlhMzRkMWZkYjFlOTEy OTc3MzE3Li44Zjc0YzMxNTI0ZDM0ODA4Y2U4NzYyZDNjNThlZjc3Y2EyYWUwODhiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NhY2hlL0RPTUNhY2hlRW5naW5lLmgKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9ET01DYWNoZUVuZ2luZS5oCkBAIC04Myw3ICs4 MywxNiBAQCBzdHJ1Y3QgQ2FjaGVJbmZvcyB7CiAgICAgdWludDY0X3QgdXBkYXRlQ291bnRlcjsK IH07CiAKLXVzaW5nIENhY2hlSWRlbnRpZmllck9yRXJyb3IgPSBFeHBlY3RlZDx1aW50NjRfdCwg RXJyb3I+Oworc3RydWN0IENhY2hlSWRlbnRpZmllck9wZXJhdGlvblJlc3VsdCB7CisgICAgdGVt cGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBlbmNvZGUoRW5jb2RlciYpIGNvbnN0OworICAgIHRl bXBsYXRlPGNsYXNzIERlY29kZXI+IHN0YXRpYyBib29sIGRlY29kZShEZWNvZGVyJiwgQ2FjaGVJ ZGVudGlmaWVyT3BlcmF0aW9uUmVzdWx0Jik7CisKKyAgICB1aW50NjRfdCBpZGVudGlmaWVyIHsg MCB9OworICAgIC8vIFRydWUgaW4gY2FzZSBzdG9yaW5nIGNhY2hlIGxpc3Qgb24gdGhlIGZpbGVz eXN0ZW0gZmFpbGVkLgorICAgIGJvb2wgaGFkU3RvcmFnZUVycm9yIHsgZmFsc2UgfTsKK307CisK K3VzaW5nIENhY2hlSWRlbnRpZmllck9yRXJyb3IgPSBFeHBlY3RlZDxDYWNoZUlkZW50aWZpZXJP cGVyYXRpb25SZXN1bHQsIEVycm9yPjsKIHVzaW5nIENhY2hlSWRlbnRpZmllckNhbGxiYWNrID0g V1RGOjpGdW5jdGlvbjx2b2lkKGNvbnN0IENhY2hlSWRlbnRpZmllck9yRXJyb3ImKT47CiAKIHVz aW5nIFJlY29yZElkZW50aWZpZXJzT3JFcnJvciA9IEV4cGVjdGVkPFZlY3Rvcjx1aW50NjRfdD4s IEVycm9yPjsKQEAgLTExMSw2ICsxMjAsMjAgQEAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gaW5s aW5lIGJvb2wgQ2FjaGVJbmZvczo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIENhY2hlSW4KICAg ICByZXR1cm4gZGVjb2Rlci5kZWNvZGUoY2FjaGVJbmZvcy51cGRhdGVDb3VudGVyKTsKIH0KIAor dGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gaW5saW5lIHZvaWQgQ2FjaGVJZGVudGlmaWVyT3BlcmF0 aW9uUmVzdWx0OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKK3sKKyAgICBlbmNvZGVy IDw8IGlkZW50aWZpZXI7CisgICAgZW5jb2RlciA8PCBoYWRTdG9yYWdlRXJyb3I7Cit9CisKK3Rl bXBsYXRlPGNsYXNzIERlY29kZXI+IGlubGluZSBib29sIENhY2hlSWRlbnRpZmllck9wZXJhdGlv blJlc3VsdDo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIENhY2hlSWRlbnRpZmllck9wZXJhdGlv blJlc3VsdCYgcmVzdWx0KQoreworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmlkZW50 aWZpZXIpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gZGVjb2Rlci5kZWNv ZGUocmVzdWx0LmhhZFN0b3JhZ2VFcnJvcik7Cit9CisKIH0gLy8gbmFtZXNwYWNlIERPTUNhY2hl RW5naW5lCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvY2FjaGUvV29ya2VyQ2FjaGVTdG9yYWdlQ29ubmVjdGlvbi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2NhY2hlL1dvcmtlckNhY2hlU3RvcmFnZUNvbm5lY3Rpb24uY3Bw CmluZGV4IGVkMDQ5MDlmZTU4ZGZiN2ZiMWU0ZWMxOTNmNzAxNGIwMDcwOTI3MGQuLjQ3MDBiMWM4 ZDBmYWNiYjU2NDlkZDc0MGUyMTE5ZDU3YTI2MDFkOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvY2FjaGUvV29ya2VyQ2FjaGVTdG9yYWdlQ29ubmVjdGlvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9Xb3JrZXJDYWNoZVN0b3JhZ2VDb25uZWN0aW9u LmNwcApAQCAtMTMzLDcgKzEzMyw3IEBAIHZvaWQgV29ya2VyQ2FjaGVTdG9yYWdlQ29ubmVjdGlv bjo6ZG9SZW1vdmUodWludDY0X3QgcmVxdWVzdElkZW50aWZpZXIsIHVpbnQ2NF90CiAgICAgICAg IEFTU0VSVChtX21haW5UaHJlYWRDb25uZWN0aW9uKTsKIAogICAgICAgICBtX21haW5UaHJlYWRD b25uZWN0aW9uLT5yZW1vdmUoY2FjaGVJZGVudGlmaWVyLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9 IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIHJlcXVlc3RJZGVudGlmaWVyLCBjYWNoZUlkZW50aWZp ZXJdKGNvbnN0IENhY2hlSWRlbnRpZmllck9yRXJyb3ImIHJlc3VsdCkgbXV0YWJsZSB7Ci0gICAg ICAgICAgICBBU1NFUlQoIXJlc3VsdC5oYXNWYWx1ZSgpIHx8IHJlc3VsdC52YWx1ZSgpID09IGNh Y2hlSWRlbnRpZmllcik7CisgICAgICAgICAgICBBU1NFUlQoIXJlc3VsdC5oYXNWYWx1ZSgpIHx8 IHJlc3VsdC52YWx1ZSgpLmlkZW50aWZpZXIgPT0gY2FjaGVJZGVudGlmaWVyKTsKICAgICAgICAg ICAgIG1fcHJveHkucG9zdFRhc2tGb3JNb2RlVG9Xb3JrZXJHbG9iYWxTY29wZShbdGhpcywgcHJv dGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIHJlcXVlc3RJZGVudGlmaWVyLCBy ZXN1bHRdKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQpIG11dGFibGUgewogICAgICAg ICAgICAgICAgIEFTU0VSVF9VTlVTRUQoY29udGV4dCwgY29udGV4dC5pc1dvcmtlckdsb2JhbFNj b3BlKCkpOwogICAgICAgICAgICAgICAgIHJlbW92ZUNvbXBsZXRlZChyZXF1ZXN0SWRlbnRpZmll ciwgcmVzdWx0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2Fj aGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcAppbmRleCBjYmJjYWZiZTk4MWU4ZmNhNmQxZDYx OWZkZDBlM2M5MWI4YWVmYTQwLi4xNGYyOTY3Yzk0ODk1YzBiYmVmNzM2MThiYTA2NmZkNWYxZmQ3 ZjBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hl U3RvcmFnZUVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwCkBAIC05MCwxNiArOTAsNyBAQCB2b2lkIEVuZ2luZTo6 b3Blbihjb25zdCBTdHJpbmcmIG9yaWdpbiwgY29uc3QgU3RyaW5nJiBjYWNoZU5hbWUsIENhY2hl SWRlbnRpZmllcgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgQ2Fj aGVzJiBjYWNoZXMgPSBjYWNoZXNPckVycm9yLnZhbHVlKCk7Ci0KLSAgICAgICAgaWYgKGF1dG8q IGNhY2hlID0gY2FjaGVzLmZpbmQoY2FjaGVOYW1lKSkgewotICAgICAgICAgICAgY2FsbGJhY2so Y2FjaGUtPmlkZW50aWZpZXIoKSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQot ICAgICAgICBjYWNoZXMub3BlbihTdHJpbmcgeyBjYWNoZU5hbWUgfSwgW2NhbGxiYWNrID0gV1RG TW92ZShjYWxsYmFjayldKGNvbnN0IENhY2hlSWRlbnRpZmllck9yRXJyb3ImIHJlc3VsdCkgbXV0 YWJsZSB7Ci0gICAgICAgICAgICBjYWxsYmFjayhyZXN1bHQpOwotICAgICAgICB9KTsKKyAgICAg ICAgY2FjaGVzT3JFcnJvci52YWx1ZSgpLmdldCgpLm9wZW4oY2FjaGVOYW1lLCBXVEZNb3ZlKGNh bGxiYWNrKSk7CiAgICAgfSk7CiB9CiAKQEAgLTExOCwxMyArMTA5LDcgQEAgdm9pZCBFbmdpbmU6 OnJlbW92ZSh1aW50NjRfdCBjYWNoZUlkZW50aWZpZXIsIENhY2hlSWRlbnRpZmllckNhbGxiYWNr JiYgY2FsbGJhY2sKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGNhY2hlc1RvTW9kaWZ5 LT5yZW1vdmUoY2FjaGVJZGVudGlmaWVyLCBbY2FjaGVJZGVudGlmaWVyLCBjYWxsYmFjayA9IFdU Rk1vdmUoY2FsbGJhY2spXShzdGQ6Om9wdGlvbmFsPEVycm9yPiYmIGVycm9yKSB7Ci0gICAgICAg IGlmIChlcnJvcikgewotICAgICAgICAgICAgY2FsbGJhY2sobWFrZVVuZXhwZWN0ZWQoZXJyb3Iu dmFsdWUoKSkpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIGNhbGxi YWNrKGNhY2hlSWRlbnRpZmllcik7Ci0gICAgfSk7CisgICAgY2FjaGVzVG9Nb2RpZnktPnJlbW92 ZShjYWNoZUlkZW50aWZpZXIsIFdURk1vdmUoY2FsbGJhY2spKTsKIH0KIAogdm9pZCBFbmdpbmU6 OnJldHJpZXZlQ2FjaGVzKGNvbnN0IFN0cmluZyYgb3JpZ2luLCB1aW50NjRfdCB1cGRhdGVDb3Vu dGVyLCBDYWNoZUluZm9zQ2FsbGJhY2smJiBjYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2FjaGVzLmNwcCBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2Fj aGVzLmNwcAppbmRleCA1YjNmN2Y0NGZlNTYyNmQ3NGMxM2RhZDBmZTE1MmQ2NzM0ZjBkZjdmLi5m ZTFjZmZkZDI2ZjU3YzQzMTMxMzkzNTRhZTM5Yzg3ZWUyMWMyMWU0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5j cHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VF bmdpbmVDYWNoZXMuY3BwCkBAIC0xMTcsMjQgKzExNywyNSBAQCBDYWNoZSogQ2FjaGVzOjpmaW5k KHVpbnQ2NF90IGlkZW50aWZpZXIpCiAgICAgcmV0dXJuIChwb3NpdGlvbiAhPSBub3RGb3VuZCkg PyAmbV9yZW1vdmVkQ2FjaGVzW3Bvc2l0aW9uXSA6IG51bGxwdHI7CiB9CiAKLXZvaWQgQ2FjaGVz OjpvcGVuKFN0cmluZyYmIG5hbWUsIENhY2hlSWRlbnRpZmllckNhbGxiYWNrJiYgY2FsbGJhY2sp Cit2b2lkIENhY2hlczo6b3Blbihjb25zdCBTdHJpbmcmIG5hbWUsIENhY2hlSWRlbnRpZmllckNh bGxiYWNrJiYgY2FsbGJhY2spCiB7CiAgICAgQVNTRVJUKG1fZW5naW5lKTsKIAorICAgIGlmIChh dXRvKiBjYWNoZSA9IGZpbmQobmFtZSkpIHsKKyAgICAgICAgY2FsbGJhY2soQ2FjaGVJZGVudGlm aWVyT3BlcmF0aW9uUmVzdWx0IHsgY2FjaGUtPmlkZW50aWZpZXIoKSwgZmFsc2UgfSk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKICAgICBtYWtlRGlydHkoKTsKIAogICAgIHVpbnQ2NF90IGNh Y2hlSWRlbnRpZmllciA9IG1fZW5naW5lLT5uZXh0Q2FjaGVJZGVudGlmaWVyKCk7Ci0gICAgbV9j YWNoZXMuYXBwZW5kKENhY2hlIHsgY2FjaGVJZGVudGlmaWVyLCBXVEZNb3ZlKG5hbWUpIH0pOwor ICAgIG1fY2FjaGVzLmFwcGVuZChDYWNoZSB7IGNhY2hlSWRlbnRpZmllciwgU3RyaW5nIHsgbmFt ZSB9IH0pOwogICAgIHdyaXRlQ2FjaGVzVG9EaXNrKFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJh Y2spLCBjYWNoZUlkZW50aWZpZXJdKHN0ZDo6b3B0aW9uYWw8RXJyb3I+JiYgZXJyb3IpIG11dGFi bGUgewotICAgICAgICBpZiAoZXJyb3IpIHsKLSAgICAgICAgICAgIGNhbGxiYWNrKG1ha2VVbmV4 cGVjdGVkKGVycm9yLnZhbHVlKCkpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQot ICAgICAgICBjYWxsYmFjayhjYWNoZUlkZW50aWZpZXIpOworICAgICAgICBjYWxsYmFjayhDYWNo ZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQgeyBjYWNoZUlkZW50aWZpZXIsICEhZXJyb3IgfSk7 CiAgICAgfSk7CiB9CiAKLXZvaWQgQ2FjaGVzOjpyZW1vdmUodWludDY0X3QgaWRlbnRpZmllciwg Q29tcGxldGlvbkNhbGxiYWNrJiYgY2FsbGJhY2spCit2b2lkIENhY2hlczo6cmVtb3ZlKHVpbnQ2 NF90IGlkZW50aWZpZXIsIENhY2hlSWRlbnRpZmllckNhbGxiYWNrJiYgY2FsbGJhY2spCiB7CiAg ICAgQVNTRVJUKG1fZW5naW5lKTsKIApAQCAtMTQyLDcgKzE0Myw3IEBAIHZvaWQgQ2FjaGVzOjpy ZW1vdmUodWludDY0X3QgaWRlbnRpZmllciwgQ29tcGxldGlvbkNhbGxiYWNrJiYgY2FsbGJhY2sp CiAKICAgICBpZiAocG9zaXRpb24gPT0gbm90Rm91bmQpIHsKICAgICAgICAgQVNTRVJUKG1fcmVt b3ZlZENhY2hlcy5maW5kTWF0Y2hpbmcoWyZdKGNvbnN0IGF1dG8mIGl0ZW0pIHsgcmV0dXJuIGl0 ZW0uaWRlbnRpZmllcigpID09IGlkZW50aWZpZXI7IH0pICE9IG5vdEZvdW5kKTsKLSAgICAgICAg Y2FsbGJhY2soc3RkOjpudWxsb3B0KTsKKyAgICAgICAgY2FsbGJhY2soQ2FjaGVJZGVudGlmaWVy T3BlcmF0aW9uUmVzdWx0IHsgaWRlbnRpZmllciwgZmFsc2UgfSk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKQEAgLTE1MSw5ICsxNTIsMTAgQEAgdm9pZCBDYWNoZXM6OnJlbW92ZSh1aW50NjRf dCBpZGVudGlmaWVyLCBDb21wbGV0aW9uQ2FsbGJhY2smJiBjYWxsYmFjaykKICAgICBhdXRvIGNh Y2hlID0gV1RGTW92ZShtX2NhY2hlc1twb3NpdGlvbl0pOwogICAgIG1fY2FjaGVzLnJlbW92ZShw b3NpdGlvbik7CiAgICAgbV9yZW1vdmVkQ2FjaGVzLmFwcGVuZChXVEZNb3ZlKGNhY2hlKSk7Ci0g ICAgKyttX3VwZGF0ZUNvdW50ZXI7CiAKLSAgICB3cml0ZUNhY2hlc1RvRGlzayhXVEZNb3ZlKGNh bGxiYWNrKSk7CisgICAgd3JpdGVDYWNoZXNUb0Rpc2soW2NhbGxiYWNrID0gV1RGTW92ZShjYWxs YmFjayksIGlkZW50aWZpZXJdKHN0ZDo6b3B0aW9uYWw8RXJyb3I+JiYgZXJyb3IpIG11dGFibGUg eworICAgICAgICBjYWxsYmFjayhDYWNoZUlkZW50aWZpZXJPcGVyYXRpb25SZXN1bHQgeyBpZGVu dGlmaWVyLCAhIWVycm9yIH0pOworICAgIH0pOwogfQogCiBzdGF0aWMgaW5saW5lIERhdGEgZW5j b2RlQ2FjaGVOYW1lcyhjb25zdCBWZWN0b3I8Q2FjaGU+JiBjYWNoZXMpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hl cy5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdp bmVDYWNoZXMuaAppbmRleCAzNjMwZDZhOGQ4ZTZjY2RiMzU5Y2JkY2Y4MjY2ODI0MzA2ODVjZTg1 Li4xMzMzM2UwOWI1ZTI3MDA1MmE2YWE0NzBjMTczYjM1OGE4ODhhOWY1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hl cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdl RW5naW5lQ2FjaGVzLmgKQEAgLTM5LDggKzM5LDggQEAgcHVibGljOgogICAgIHN0YXRpYyBSZWY8 Q2FjaGVzPiBjcmVhdGUoRW5naW5lJiBlbmdpbmUsIGNvbnN0IFN0cmluZyYgb3JpZ2luKSB7IHJl dHVybiBhZG9wdFJlZigqbmV3IENhY2hlcyB7IGVuZ2luZSwgb3JpZ2luIH0pOyB9CiAKICAgICB2 b2lkIGluaXRpYWxpemUoV2ViQ29yZTo6RE9NQ2FjaGVFbmdpbmU6OkNvbXBsZXRpb25DYWxsYmFj ayYmKTsKLSAgICB2b2lkIG9wZW4oU3RyaW5nJiYgbmFtZSwgV2ViQ29yZTo6RE9NQ2FjaGVFbmdp bmU6OkNhY2hlSWRlbnRpZmllckNhbGxiYWNrJiYpOwotICAgIHZvaWQgcmVtb3ZlKHVpbnQ2NF90 IGlkZW50aWZpZXIsIFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpDb21wbGV0aW9uQ2FsbGJhY2sm Jik7CisgICAgdm9pZCBvcGVuKGNvbnN0IFN0cmluZyYgbmFtZSwgV2ViQ29yZTo6RE9NQ2FjaGVF bmdpbmU6OkNhY2hlSWRlbnRpZmllckNhbGxiYWNrJiYpOworICAgIHZvaWQgcmVtb3ZlKHVpbnQ2 NF90IGlkZW50aWZpZXIsIFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpDYWNoZUlkZW50aWZpZXJD YWxsYmFjayYmKTsKICAgICB2b2lkIGNsZWFyTWVtb3J5UmVwcmVzZW50YXRpb24oKTsKIAogICAg IHZvaWQgZGV0YWNoKCk7Cg==