91831 2012-07-20 01:16:13 -0700 Web Inspector: Add deleteEntry command and deletionCompleted event to FileSystemAgent. 2012-08-22 00:50:21 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 91861 93933 68203 91709 93940 0 tzik tzik apavlov bweinstein dglazkov joepeck keishi loislo peter+ews pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 674306 0 tzik 2012-07-20 01:16:13 -0700 Inspector should allow user to delete files and directories on FileSystem. 694605 1 158245 tzik 2012-08-14 00:36:18 -0700 Created attachment 158245 Patch 696876 2 158245 vsevik 2012-08-16 01:10:26 -0700 Comment on attachment 158245 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=158245&action=review > Source/WebCore/inspector/InspectorFileSystemAgent.cpp:782 > + ASSERT(m_frontendProvider->frontend()); Nit: consider extracting the following code if (!m_enabled || !m_frontendProvider) { *error = "FileSystem agent is not enabled"; return; } ASSERT(m_frontendProvider->frontend()); So that each protocol command started with if (!assertFrontend(error)) return; This way it should be shorter. 697977 3 159027 tzik 2012-08-17 00:33:31 -0700 Created attachment 159027 Patch 697978 4 158245 tzik 2012-08-17 00:34:50 -0700 Comment on attachment 158245 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=158245&action=review >> Source/WebCore/inspector/InspectorFileSystemAgent.cpp:782 >> + ASSERT(m_frontendProvider->frontend()); > > Nit: consider extracting the following code > > if (!m_enabled || !m_frontendProvider) { > *error = "FileSystem agent is not enabled"; > return; > } > ASSERT(m_frontendProvider->frontend()); > > So that each protocol command started with > > if (!assertFrontend(error)) > return; > > This way it should be shorter. Looks nice. Done. 698003 5 159027 webkit.review.bot 2012-08-17 01:03:46 -0700 Comment on attachment 159027 Patch Attachment 159027 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13514708 698010 6 159027 peter+ews 2012-08-17 01:09:12 -0700 Comment on attachment 159027 Patch Attachment 159027 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/13521286 699329 7 159027 vsevik 2012-08-20 01:58:50 -0700 Comment on attachment 159027 Patch Please fix "ReportErrorTask" building error. 699330 8 159027 vsevik 2012-08-20 01:59:39 -0700 Comment on attachment 159027 Patch Oh, I see you are adding it in another patch. 701647 9 159027 webkit.review.bot 2012-08-22 00:50:16 -0700 Comment on attachment 159027 Patch Clearing flags on attachment: 159027 Committed r126273: <http://trac.webkit.org/changeset/126273> 701648 10 webkit.review.bot 2012-08-22 00:50:21 -0700 All reviewed patches have been landed. Closing bug. 158245 2012-08-14 00:36:18 -0700 2012-08-17 00:34:50 -0700 Patch bug-91831-20120814163546.patch text/plain 13119 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzg0NTlhYTE0NjUxNGNm ZGY3NTFiYjhlODk2ODJhOTVlNjQ1NDE5Mi4uOWUzMmM0YmM5YTkwN2NmMGUwNjg1NzRkOGNhNjdh NTA4MjA0OGFiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTE0ICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgZGVsZXRlRW50cnkgY29tbWFuZCBhbmQgZGVsZXRpb25Db21wbGV0ZWQgZXZlbnQgdG8gRmls ZVN5c3RlbUFnZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MTgzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRlc3Qgc2hvdWxkIGJlIGFkZGVkIGFmdGVyIEpTIHNpZGUgaW1wbGVtZW50YXRpb24gbGFu ZGVkLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OmRlbGV0ZUVudHJ5 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50Lmg6CisgICAg ICAgIChJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQpOiBBZGQgZGVsZXRlRW50cnkKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Nb2RlbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5GaWxlU3lzdGVtRGlzcGF0Y2hlci5wcm90b3R5cGUuZGVsZXRpb25Db21wbGV0ZWQp OiBBZGQgZW1wdHkgaGFuZGxlcgorCiAyMDEyLTA4LTEzICBUYWlqdSBUc3Vpa2kgIDx0emlrQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb21wbGV0aW9uIGV2ZW50cyBv ZiBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQgc2hvdWxkIGJlIGZpcmVkIGFzeW5jaHJvbm91c2x5 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDRlNjQ0ZGM1NjEy ZDAwMGYwOGRjM2IxZDc3MTcyZDAxZmRlMDQ0M2YuLjQyYjk3M2IyOGU1NjZiOTJkOWRjNGM2M2Y0 ZmI1Zjc4MjBlZGEzOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K QEAgLTE1NDksNiArMTU0OSwxNiBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJl cXVlc3RJZCIsICIkcmVmIjogIlJlcXVlc3RJZCIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGlk ZW50aWZpZXIuIENvcnJlc3BvbmRpbmcgZmlsZUNvbnRlbnRSZWNlaXZlZCBldmVudCBzaG91bGQg aGF2ZSBzYW1lIHJlcXVlc3RJZCB3aXRoIHRoaXMuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAg ICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiUmV0dXJucyBjb250ZW50IG9mIHRoZSBmaWxl IGFzIGZpbGVDb250ZW50UmVjZWl2ZWQgZXZlbnQuIFJlc3VsdCBzaG91bGQgYmUgc2xpY2VkIGlu dG8gW3N0YXJ0LCBlbmQpLiIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgIm5hbWUiOiAiZGVsZXRlRW50cnkiLAorICAgICAgICAgICAgICAgICJwYXJhbWV0 ZXJzIjogWworICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0 cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhlIGVudHJ5IHRvIGRlbGV0ZS4iIH0KKyAg ICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICJyZXR1cm5zIjogWworICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInJlcXVlc3RJZCIsICIkcmVmIjogIlJlcXVlc3RJZCIsICJk ZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGlkZW50aWZpZXIuIENvcnJlc3BvbmRpbmcgZGVsZXRpb25D b21wbGV0ZWQgZXZlbnQgc2hvdWxkIGhhdmUgc2FtZSByZXF1ZXN0SWQgd2l0aCB0aGlzLiIgfQor ICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRlbGV0 ZXMgc3BlY2lmaWVkIGVudHJ5LiBJZiB0aGUgZW50cnkgaXMgYSBkaXJlY3RvcnksIHRoZSBhZ2Vu dCBkZWxldGVzIGNoaWxkcmVuIHJlY3Vyc2l2ZWx5LiIKICAgICAgICAgICAgIH0KICAgICAgICAg XSwKICAgICAgICAgImV2ZW50cyI6IFsKQEAgLTE1NTcsNyArMTU2Nyw3IEBACiAgICAgICAgICAg ICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVx dWVzdElkIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IElkZW50 aWZpZXIgdGhhdCB3YXMgcmV0dXJuZWQgYnkgY29ycmVzcG9uZGluZyByZXF1ZXN0RmlsZVN5c3Rl bVJvb3QgY29tbWFuZC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZXJyb3JD b2RlIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICIwLCBpZiBubyBlcnJvci4g T3RoZXJ3aXNlLCBlcnJvckNvZGUgaXMgc2V0IHRvIEZpbGVFcnJvcjo6RXJyb3JDb2RlIHZhbHVl LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyb290IiwgIiRyZWYiOiAiRmls ZVN5c3RlbS5FbnRyeSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJDb250YWlu cyByb290IG9mIHRoZSByZXF1ZXN0ZWQgRmlsZVN5c3RlbSBpZiB0aGUgY29tbWFuZCBjb21wbGV0 ZWQgc3VjY2Vzc2Z1bGx5LiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJvb3Qi LCAiJHJlZiI6ICJFbnRyeSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJDb250 YWlucyByb290IG9mIHRoZSByZXF1ZXN0ZWQgRmlsZVN5c3RlbSBpZiB0aGUgY29tbWFuZCBjb21w bGV0ZWQgc3VjY2Vzc2Z1bGx5LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAg ICAgImRlc2NyaXB0aW9uIjogIkNvbXBsZXRpb24gZXZlbnQgb2YgcmVxdWVzdEZpbGVTeXN0ZW1S b290IGNvbW1hbmQuIgogICAgICAgICAgICAgfSwKQEAgLTE1NjYsNyArMTU3Niw3IEBACiAgICAg ICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAicmVxdWVzdElkIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0 IElkZW50aWZpZXIgdGhhdCB3YXMgcmV0dXJuZWQgYnkgY29ycmVzcG9uZGluZyByZXF1ZXN0RGly ZWN0b3J5Q29udGVudCBjb21tYW5kLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJlcnJvckNvZGUiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIjAsIGlmIG5v IGVycm9yLiBPdGhlcndpc2UsIGVycm9yQ29kZSBpcyBzZXQgdG8gRmlsZUVycm9yOjpFcnJvckNv ZGUgdmFsdWUuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImVudHJpZXMiLCAi dHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiRmlsZVN5c3RlbS5FbnRyeSIgfSwg Im9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkNvbnRhaW5zIGFsbCBlbnRyaWVzIG9u IGRpcmVjdG9yeSBpZiB0aGUgY29tbWFuZCBjb21wbGV0ZWQgc3VjY2Vzc2Z1bGx5LiIgfQorICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImVudHJpZXMiLCAidHlwZSI6ICJhcnJheSIsICJp dGVtcyI6IHsgIiRyZWYiOiAiRW50cnkiIH0sICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlv biI6ICJDb250YWlucyBhbGwgZW50cmllcyBvbiBkaXJlY3RvcnkgaWYgdGhlIGNvbW1hbmQgY29t cGxldGVkIHN1Y2Nlc3NmdWxseS4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJDb21wbGV0aW9uIGV2ZW50IG9mIHJlcXVlc3REaXJlY3RvcnlD b250ZW50IGNvbW1hbmQuIgogICAgICAgICAgICAgfSwKQEAgLTE1NzUsNyArMTU4NSw3IEBACiAg ICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAicmVxdWVzdElkIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJSZXF1 ZXN0IElkZW50aWZpZXIgdGhhdCB3YXMgcmV0dXJuZWQgaW4gcmVzcG9uc2UgdG8gdGhlIGNvcnJl c3BvbmRpbmcgcmVxdWVzdE1ldGFkYXRhIGNvbW1hbmQuIiB9LAogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImVycm9yQ29kZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24i OiAiMCwgaWYgbm8gZXJyb3IuIE90aGVyd2lzZSwgZXJyb3JDb2RlIGlzIHNldCB0byBGaWxlRXJy b3I6OkVycm9yQ29kZSB2YWx1ZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi bWV0YWRhdGEiLCAiJHJlZiI6ICJGaWxlU3lzdGVtLk1ldGFkYXRhIiwgIm9wdGlvbmFsIjogdHJ1 ZSwgImRlc2NyaXB0aW9uIjogIkNvbnRhaW5zIG1ldGFkYXRhIG9mIHRoZSBlbnRyeSBpZiB0aGUg Y29tbWFuZCBjb21wbGV0ZWQgc3VjY2Vzc2Z1bGx5LiIgfQorICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogIm1ldGFkYXRhIiwgIiRyZWYiOiAiTWV0YWRhdGEiLCAib3B0aW9uYWwiOiB0cnVl LCAiZGVzY3JpcHRpb24iOiAiQ29udGFpbnMgbWV0YWRhdGEgb2YgdGhlIGVudHJ5IGlmIHRoZSBj b21tYW5kIGNvbXBsZXRlZCBzdWNjZXNzZnVsbHkuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAg ICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQ29tcGxldGlvbiBldmVudCBvZiByZXF1ZXN0 TWV0YWRhdGEgY29tbWFuZC4iCiAgICAgICAgICAgICB9LApAQCAtMTU4OCw2ICsxNTk4LDE0IEBA CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY2hhcnNldCIsICJ0eXBlIjogInN0cmlu ZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJDaGFyc2V0IG9mIHRoZSBjb250 ZW50IGlmIGl0IGlzIHNlcnZlZCBhcyB0ZXh0LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAg ICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNvbXBsZXRpb24gZXZlbnQgb2YgcmVxdWVzdEZp bGVDb250ZW50IGNvbW1hbmQuIgorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICAibmFtZSI6ICJkZWxldGlvbkNvbXBsZXRlZCIsCisgICAgICAgICAgICAgICAg InBhcmFtZXRlcnMiOiBbCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVzdElk IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IElkZW50aWZpZXIg dGhhdCB3YXMgcmV0dXJuZWQgaW4gcmVzcG9uc2UgdG8gdGhlIGNvcnJlc3BvbmRpbmcgZGVsZXRl RW50cnkgY29tbWFuZC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZXJyb3JD b2RlIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICIwLCBpZiBubyBlcnJvci4g T3RoZXJ3aXNlIGVycm9yQ29kZSBpcyBzZXQgdG8gRmlsZUVycm9yOjpFcnJvckNvZGUgdmFsdWUu IiB9CisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAi Q29tcGxldGlvbiBldmVudCBvZiBkZWxldGVFbnRyeSBjb21tYW5kLiIKICAgICAgICAgICAgIH0K ICAgICAgICAgXQogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCmluZGV4IGZmOTEyYTcwYmMzZjBlNzc5MWVlMWQ3 NTIwOTIxZTQ0OWVkN2RiNDcuLmYzOTUyZmQzMTk4ZTgzMTRhNDVjNjBlYmEzMTA2YjFlMzUzY2Ey ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxl U3lzdGVtQWdlbnQuY3BwCkBAIC02Myw2ICs2Myw3IEBACiAjaW5jbHVkZSAiU2VjdXJpdHlPcmln aW4uaCIKICNpbmNsdWRlICJUZXh0RW5jb2RpbmcuaCIKICNpbmNsdWRlICJUZXh0UmVzb3VyY2VE ZWNvZGVyLmgiCisjaW5jbHVkZSAiVm9pZENhbGxiYWNrLmgiCiAjaW5jbHVkZSA8d3RmL3RleHQv QmFzZTY0Lmg+CiAKIHVzaW5nIFdlYkNvcmU6OlR5cGVCdWlsZGVyOjpBcnJheTsKQEAgLTE3Myw3 ICsxNzQsMTIgQEAgcHVibGljOgogICAgIHZvaWQgc3RhcnQoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCopOwogCiBwcml2YXRlOgotICAgIGJvb2wgZGlkSGl0RXJyb3IoRmlsZUVycm9yKik7CisgICAg Ym9vbCBkaWRIaXRFcnJvcihGaWxlRXJyb3IqIGVycm9yKQorICAgIHsKKyAgICAgICAgcmVwb3J0 UmVzdWx0KGVycm9yLT5jb2RlKCkpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICAg ICBib29sIGRpZEdldEVudHJ5KEVudHJ5Kik7CiAKICAgICB2b2lkIHJlcG9ydFJlc3VsdChGaWxl RXJyb3I6OkVycm9yQ29kZSBlcnJvckNvZGUsIFBhc3NSZWZQdHI8VHlwZUJ1aWxkZXI6OkZpbGVT eXN0ZW06OkVudHJ5PiBlbnRyeSA9IDApCkBAIC0xOTQsMTIgKzIwMCw2IEBAIHByaXZhdGU6CiAg ICAgU3RyaW5nIG1fdHlwZTsKIH07CiAKLWJvb2wgRmlsZVN5c3RlbVJvb3RSZXF1ZXN0OjpkaWRI aXRFcnJvcihGaWxlRXJyb3IqIGVycm9yKQotewotICAgIHJlcG9ydFJlc3VsdChlcnJvci0+Y29k ZSgpKTsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQogdm9pZCBGaWxlU3lzdGVtUm9vdFJlcXVlc3Q6 OnN0YXJ0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpCiB7 CiAgICAgQVNTRVJUKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpOwpAQCAtNTg3LDYgKzU4Nyw5NCBA QCB2b2lkIEZpbGVDb250ZW50UmVxdWVzdDo6ZGlkUmVhZCgpCiAgICAgcmVwb3J0UmVzdWx0KHN0 YXRpY19jYXN0PEZpbGVFcnJvcjo6RXJyb3JDb2RlPigwKSwgJnJlc3VsdCwgJm1fY2hhcnNldCk7 CiB9CiAKK2NsYXNzIERlbGV0ZUVudHJ5UmVxdWVzdCA6IHB1YmxpYyBWb2lkQ2FsbGJhY2sgewor cHVibGljOgorICAgIHN0YXRpYyBQYXNzUmVmUHRyPERlbGV0ZUVudHJ5UmVxdWVzdD4gY3JlYXRl KFBhc3NSZWZQdHI8RnJvbnRlbmRQcm92aWRlcj4gZnJvbnRlbmRQcm92aWRlciwgaW50IHJlcXVl c3RJZCwgY29uc3QgS1VSTCYgdXJsKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBEZWxldGVFbnRyeVJlcXVlc3QoZnJvbnRlbmRQcm92aWRlciwgcmVxdWVzdElkLCB1cmwpKTsK KyAgICB9CisKKyAgICB2aXJ0dWFsIH5EZWxldGVFbnRyeVJlcXVlc3QoKQorICAgIHsKKyAgICAg ICAgcmVwb3J0UmVzdWx0KEZpbGVFcnJvcjo6QUJPUlRfRVJSKTsKKyAgICB9CisKKyAgICB2aXJ0 dWFsIHZvaWQgaGFuZGxlRXZlbnQoKSBPVkVSUklERQorICAgIHsKKyAgICAgICAgZGlkRGVsZXRl RW50cnkoKTsKKyAgICB9CisKKyAgICB2b2lkIHN0YXJ0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQq KTsKKworcHJpdmF0ZToKKyAgICBib29sIGRpZEhpdEVycm9yKEZpbGVFcnJvciogZXJyb3IpCisg ICAgeworICAgICAgICByZXBvcnRSZXN1bHQoZXJyb3ItPmNvZGUoKSk7CisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0KKworICAgIGJvb2wgZGlkR2V0RW50cnkoRW50cnkqKTsKKyAgICBib29s IGRpZERlbGV0ZUVudHJ5KCk7CisKKyAgICB2b2lkIHJlcG9ydFJlc3VsdChGaWxlRXJyb3I6OkVy cm9yQ29kZSBlcnJvckNvZGUpCisgICAgeworICAgICAgICBpZiAoIW1fZnJvbnRlbmRQcm92aWRl ciB8fCAhbV9mcm9udGVuZFByb3ZpZGVyLT5mcm9udGVuZCgpKQorICAgICAgICAgICAgcmV0dXJu OworICAgICAgICBtX2Zyb250ZW5kUHJvdmlkZXItPmZyb250ZW5kKCktPmRlbGV0aW9uQ29tcGxl dGVkKG1fcmVxdWVzdElkLCBzdGF0aWNfY2FzdDxpbnQ+KGVycm9yQ29kZSkpOworICAgICAgICBt X2Zyb250ZW5kUHJvdmlkZXIgPSAwOworICAgIH0KKworICAgIERlbGV0ZUVudHJ5UmVxdWVzdChQ YXNzUmVmUHRyPEZyb250ZW5kUHJvdmlkZXI+IGZyb250ZW5kUHJvdmlkZXIsIGludCByZXF1ZXN0 SWQsIGNvbnN0IEtVUkwmIHVybCkKKyAgICAgICAgOiBtX2Zyb250ZW5kUHJvdmlkZXIoZnJvbnRl bmRQcm92aWRlcikKKyAgICAgICAgLCBtX3JlcXVlc3RJZChyZXF1ZXN0SWQpCisgICAgICAgICwg bV91cmwodXJsKSB7IH0KKworICAgIFJlZlB0cjxGcm9udGVuZFByb3ZpZGVyPiBtX2Zyb250ZW5k UHJvdmlkZXI7CisgICAgaW50IG1fcmVxdWVzdElkOworICAgIEZpbGVTeXN0ZW1UeXBlIG1fdHlw ZTsKKyAgICBLVVJMIG1fdXJsOworfTsKKwordm9pZCBEZWxldGVFbnRyeVJlcXVlc3Q6OnN0YXJ0 KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpCit7CisgICAg QVNTRVJUKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpOworCisgICAgUmVmUHRyPEVycm9yQ2FsbGJh Y2s+IGVycm9yQ2FsbGJhY2sgPSBDYWxsYmFja0Rpc3BhdGNoZXJGYWN0b3J5PEVycm9yQ2FsbGJh Y2s+OjpjcmVhdGUodGhpcywgJkRlbGV0ZUVudHJ5UmVxdWVzdDo6ZGlkSGl0RXJyb3IpOworCisg ICAgRmlsZVN5c3RlbVR5cGUgdHlwZTsKKyAgICBTdHJpbmcgcGF0aDsKKyAgICBpZiAoIURPTUZp bGVTeXN0ZW1CYXNlOjpjcmFja0ZpbGVTeXN0ZW1VUkwobV91cmwsIHR5cGUsIHBhdGgpKSB7Cisg ICAgICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPnBvc3RUYXNrKFJlcG9ydEVycm9yVGFzazo6 Y3JlYXRlKGVycm9yQ2FsbGJhY2ssIEZpbGVFcnJvcjo6U1lOVEFYX0VSUikpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgaWYgKHBhdGggPT0gIi8iKSB7CisgICAgICAgIE93blB0cjxB c3luY0ZpbGVTeXN0ZW1DYWxsYmFja3M+IGZpbGVTeXN0ZW1DYWxsYmFja3MgPSBWb2lkQ2FsbGJh Y2tzOjpjcmVhdGUodGhpcywgZXJyb3JDYWxsYmFjayk7CisgICAgICAgIExvY2FsRmlsZVN5c3Rl bTo6bG9jYWxGaWxlU3lzdGVtKCkuZGVsZXRlRmlsZVN5c3RlbShzY3JpcHRFeGVjdXRpb25Db250 ZXh0LCB0eXBlLCBmaWxlU3lzdGVtQ2FsbGJhY2tzLnJlbGVhc2UoKSk7CisgICAgfSBlbHNlIHsK KyAgICAgICAgUmVmUHRyPEVudHJ5Q2FsbGJhY2s+IHN1Y2Nlc3NDYWxsYmFjayA9IENhbGxiYWNr RGlzcGF0Y2hlckZhY3Rvcnk8RW50cnlDYWxsYmFjaz46OmNyZWF0ZSh0aGlzLCAmRGVsZXRlRW50 cnlSZXF1ZXN0OjpkaWRHZXRFbnRyeSk7CisgICAgICAgIE93blB0cjxSZXNvbHZlVVJJQ2FsbGJh Y2tzPiBmaWxlU3lzdGVtQ2FsbGJhY2tzID0gUmVzb2x2ZVVSSUNhbGxiYWNrczo6Y3JlYXRlKHN1 Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjaywgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgdHlw ZSwgcGF0aCk7CisgICAgICAgIExvY2FsRmlsZVN5c3RlbTo6bG9jYWxGaWxlU3lzdGVtKCkucmVh ZEZpbGVTeXN0ZW0oc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgdHlwZSwgZmlsZVN5c3RlbUNhbGxi YWNrcy5yZWxlYXNlKCkpOworICAgIH0KK30KKworYm9vbCBEZWxldGVFbnRyeVJlcXVlc3Q6OmRp ZEdldEVudHJ5KEVudHJ5KiBlbnRyeSkKK3sKKyAgICBSZWZQdHI8RXJyb3JDYWxsYmFjaz4gZXJy b3JDYWxsYmFjayA9IENhbGxiYWNrRGlzcGF0Y2hlckZhY3Rvcnk8RXJyb3JDYWxsYmFjaz46OmNy ZWF0ZSh0aGlzLCAmRGVsZXRlRW50cnlSZXF1ZXN0OjpkaWRIaXRFcnJvcik7CisgICAgaWYgKGVu dHJ5LT5pc0RpcmVjdG9yeSgpKSB7CisgICAgICAgIERpcmVjdG9yeUVudHJ5KiBkaXJlY3RvcnlF bnRyeSA9IHN0YXRpY19jYXN0PERpcmVjdG9yeUVudHJ5Kj4oZW50cnkpOworICAgICAgICBkaXJl Y3RvcnlFbnRyeS0+cmVtb3ZlUmVjdXJzaXZlbHkodGhpcywgZXJyb3JDYWxsYmFjayk7CisgICAg fSBlbHNlCisgICAgICAgIGVudHJ5LT5yZW1vdmUodGhpcywgZXJyb3JDYWxsYmFjayk7CisgICAg cmV0dXJuIHRydWU7Cit9CisKK2Jvb2wgRGVsZXRlRW50cnlSZXF1ZXN0OjpkaWREZWxldGVFbnRy eSgpCit7CisgICAgcmVwb3J0UmVzdWx0KHN0YXRpY19jYXN0PEZpbGVFcnJvcjo6RXJyb3JDb2Rl PigwKSk7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIH0gLy8gYW5vbnltb3VzIG5hbWVzcGFjZQog CiAvLyBzdGF0aWMKQEAgLTY4NSw2ICs3NzMsMjQgQEAgdm9pZCBJbnNwZWN0b3JGaWxlU3lzdGVt QWdlbnQ6OnJlcXVlc3RGaWxlQ29udGVudChFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmkK ICAgICBGaWxlQ29udGVudFJlcXVlc3Q6OmNyZWF0ZShtX2Zyb250ZW5kUHJvdmlkZXIsICpyZXF1 ZXN0SWQsIHVybCwgcmVhZEFzVGV4dCwgc3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRpb24sIGNoYXJz ZXQgPyAqY2hhcnNldCA6ICIiKS0+c3RhcnQoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7CiB9CiAK K3ZvaWQgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpkZWxldGVFbnRyeShFcnJvclN0cmluZyog ZXJyb3IsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBpbnQqIHJlcXVlc3RJZCkKK3sKKyAgICBp ZiAoIW1fZW5hYmxlZCB8fCAhbV9mcm9udGVuZFByb3ZpZGVyKSB7CisgICAgICAgICplcnJvciA9 ICJGaWxlU3lzdGVtIGFnZW50IGlzIG5vdCBlbmFibGVkIjsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKyAgICBBU1NFUlQobV9mcm9udGVuZFByb3ZpZGVyLT5mcm9udGVuZCgpKTsKKworICAgIEtV UkwgdXJsKFBhcnNlZFVSTFN0cmluZywgdXJsU3RyaW5nKTsKKworICAgIFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQgPSBhc3NlcnRTY3JpcHRFeGVjdXRpb25D b250ZXh0Rm9yT3JpZ2luKGVycm9yLCBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHVybCkuZ2V0KCkp OworICAgIGlmICghc2NyaXB0RXhlY3V0aW9uQ29udGV4dCkKKyAgICAgICAgcmV0dXJuOworCisg ICAgKnJlcXVlc3RJZCA9IG1fbmV4dFJlcXVlc3RJZCsrOworICAgIERlbGV0ZUVudHJ5UmVxdWVz dDo6Y3JlYXRlKG1fZnJvbnRlbmRQcm92aWRlciwgKnJlcXVlc3RJZCwgdXJsKS0+c3RhcnQoc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCk7Cit9CisKIHZvaWQgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50 OjpzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCiB7CiAgICAgQVNTRVJU KGZyb250ZW5kKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JGaWxlU3lzdGVtQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JG aWxlU3lzdGVtQWdlbnQuaAppbmRleCBmNzM1MGQ0MTYzNWJiYjZmOTRmYmMyYzMyOGJhZDRiNTcz MWViOTZlLi5kM2M0MjJiOGE4YzEwMWJjNzAyNTY2NTdlMzJjY2E4ZDJiNjE1MTZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5o CkBAIC01OSw2ICs1OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdERpcmVj dG9yeUNvbnRlbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHVybCwgaW50KiByZXF1ZXN0 SWQpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0TWV0YWRhdGEoRXJyb3JTdHJp bmcqLCBjb25zdCBTdHJpbmcmIHVybCwgaW50KiByZXF1ZXN0SWQpIE9WRVJSSURFOwogICAgIHZp cnR1YWwgdm9pZCByZXF1ZXN0RmlsZUNvbnRlbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcm IHVybCwgYm9vbCByZWFkQXNUZXh0LCBjb25zdCBpbnQqIHN0YXJ0LCBjb25zdCBpbnQqIGVuZCwg Y29uc3QgU3RyaW5nKiBjaGFyc2V0LCBpbnQqIHJlcXVlc3RJZCkgT1ZFUlJJREU7CisgICAgdmly dHVhbCB2b2lkIGRlbGV0ZUVudHJ5KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1cmwsIGlu dCogcmVxdWVzdElkKSBPVkVSUklERTsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRGcm9udGVuZChJ bnNwZWN0b3JGcm9udGVuZCopIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBjbGVhckZyb250 ZW5kKCkgT1ZFUlJJREU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0ZpbGVTeXN0ZW1Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRmlsZVN5c3RlbU1vZGVsLmpzCmluZGV4IDk2NDAyYmQ5YjhjOWZhZWQzM2QzY2ZjZDZk ZmRlZmRhNTAzNGVmMmMuLjMwZWRkODRlOGVhZjc3MzlkZWM5NGQxZGJmNmZmYzFlMTc2YmI4MTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3Rl bU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5 c3RlbU1vZGVsLmpzCkBAIC02NDUsNSArNjQ1LDE0IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVt RGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgZmlsZUNvbnRlbnRSZWNlaXZlZDogZnVuY3Rp b24ocmVxdWVzdElkLCBlcnJvckNvZGUsIGNvbnRlbnQsIGNoYXJzZXQpCiAgICAgewogICAgICAg ICB0aGlzLl9hZ2VudFdyYXBwZXIuX2ZpbGVDb250ZW50UmVjZWl2ZWQocmVxdWVzdElkLCBlcnJv ckNvZGUsIGNvbnRlbnQsIGNoYXJzZXQpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFy YW0ge251bWJlcn0gcmVxdWVzdElkCisgICAgICogQHBhcmFtIHtudW1iZXJ9IGVycm9yQ29kZQor ICAgICAqLworICAgIGRlbGV0aW9uQ29tcGxldGVkOiBmdW5jdGlvbihyZXF1ZXN0SWQsIGVycm9y Q29kZSkKKyAgICB7CisgICAgICAgIGNvbnNvbGUuZXJyb3IoIk5vdCBpbXBsZW1lbnRlZCIpOwog ICAgIH0KIH0K 159027 2012-08-17 00:33:31 -0700 2012-08-22 00:50:15 -0700 Patch bug-91831-20120817163256.patch text/plain 16901 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1ODQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTIxMzM0YzBlZWNlNGEx YTE5YjgxNWVkZjUzZGJmZjk5YTU0ZWFmZC4uM2IxYjQ3MGY5OGM5YWZlNzEyNWY3ZWRiNjc3YjQ5 YTdiY2Y3YTUyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA4LTE3ICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgZGVsZXRlRW50cnkgY29tbWFuZCBhbmQgZGVsZXRpb25Db21wbGV0ZWQgZXZlbnQgdG8gRmls ZVN5c3RlbUFnZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MTgzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEluc3BlY3RvckFnZW50LXNpZGUgaW1wbGVtZW50YXRpb24gb2YgZGVsZXRlRW50cnkgY29t bWFuZC4KKworICAgICAgICBUZXN0IHdpbGwgYmUgYWRkZWQgYWZ0ZXIgSlMtc2lkZSBpbXBsZW1l bnRhdGlvbiBsYW5kZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246Cisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6 cmVxdWVzdEZpbGVTeXN0ZW1Sb290KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZpbGVT eXN0ZW1BZ2VudDo6cmVxdWVzdERpcmVjdG9yeUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpyZXF1ZXN0TWV0YWRhdGEpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpyZXF1ZXN0RmlsZUNvbnRlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpkZWxldGVFbnRyeSk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OmFzc2VydEZyb250ZW5k KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50Lmg6CisgICAg ICAgIChJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvRmlsZVN5c3RlbU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0 ZW1EaXNwYXRjaGVyLnByb3RvdHlwZS5maWxlQ29udGVudFJlY2VpdmVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5GaWxlU3lzdGVtRGlzcGF0Y2hlci5wcm90b3R5cGUuZGVsZXRpb25Db21wbGV0 ZWQpOgorCiAyMDEyLTA4LTE2ICBNaWNoZWxhbmdlbG8gRGUgU2ltb25lICA8bWljaGVsYW5nZWxv QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1BhcnQgM10gUGFyc2UgdGhlIGN1c3RvbSgpIGZ1bmN0 aW9uIGluIC13ZWJraXQtZmlsdGVyOiBwYXJzZSB0aGUgM2QtdHJhbnNmb3JtcyBwYXJhbWV0ZXJz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggNGU2NDRkYzU2MTJk MDAwZjA4ZGMzYjFkNzcxNzJkMDFmZGUwNDQzZi4uNDJiOTczYjI4ZTU2NmI5MmQ5ZGM0YzYzZjRm YjVmNzgyMGVkYTM5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpA QCAtMTU0OSw2ICsxNTQ5LDE2IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVx dWVzdElkIiwgIiRyZWYiOiAiUmVxdWVzdElkIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRl bnRpZmllci4gQ29ycmVzcG9uZGluZyBmaWxlQ29udGVudFJlY2VpdmVkIGV2ZW50IHNob3VsZCBo YXZlIHNhbWUgcmVxdWVzdElkIHdpdGggdGhpcy4iIH0KICAgICAgICAgICAgICAgICBdLAogICAg ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZXR1cm5zIGNvbnRlbnQgb2YgdGhlIGZpbGUg YXMgZmlsZUNvbnRlbnRSZWNlaXZlZCBldmVudC4gUmVzdWx0IHNob3VsZCBiZSBzbGljZWQgaW50 byBbc3RhcnQsIGVuZCkuIgorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAgICAgICAg ICAgICAgICAibmFtZSI6ICJkZWxldGVFbnRyeSIsCisgICAgICAgICAgICAgICAgInBhcmFtZXRl cnMiOiBbCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidXJsIiwgInR5cGUiOiAic3Ry aW5nIiwgImRlc2NyaXB0aW9uIjogIlVSTCBvZiB0aGUgZW50cnkgdG8gZGVsZXRlLiIgfQorICAg ICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVzdElkIiwgIiRyZWYiOiAiUmVxdWVzdElkIiwgImRl c2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4gQ29ycmVzcG9uZGluZyBkZWxldGlvbkNv bXBsZXRlZCBldmVudCBzaG91bGQgaGF2ZSBzYW1lIHJlcXVlc3RJZCB3aXRoIHRoaXMuIiB9Cisg ICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRGVsZXRl cyBzcGVjaWZpZWQgZW50cnkuIElmIHRoZSBlbnRyeSBpcyBhIGRpcmVjdG9yeSwgdGhlIGFnZW50 IGRlbGV0ZXMgY2hpbGRyZW4gcmVjdXJzaXZlbHkuIgogICAgICAgICAgICAgfQogICAgICAgICBd LAogICAgICAgICAiZXZlbnRzIjogWwpAQCAtMTU1Nyw3ICsxNTY3LDcgQEAKICAgICAgICAgICAg ICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1 ZXN0SWQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgSWRlbnRp ZmllciB0aGF0IHdhcyByZXR1cm5lZCBieSBjb3JyZXNwb25kaW5nIHJlcXVlc3RGaWxlU3lzdGVt Um9vdCBjb21tYW5kLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJlcnJvckNv ZGUiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIjAsIGlmIG5vIGVycm9yLiBP dGhlcndpc2UsIGVycm9yQ29kZSBpcyBzZXQgdG8gRmlsZUVycm9yOjpFcnJvckNvZGUgdmFsdWUu IiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJvb3QiLCAiJHJlZiI6ICJGaWxl U3lzdGVtLkVudHJ5IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkNvbnRhaW5z IHJvb3Qgb2YgdGhlIHJlcXVlc3RlZCBGaWxlU3lzdGVtIGlmIHRoZSBjb21tYW5kIGNvbXBsZXRl ZCBzdWNjZXNzZnVsbHkuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicm9vdCIs ICIkcmVmIjogIkVudHJ5IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkNvbnRh aW5zIHJvb3Qgb2YgdGhlIHJlcXVlc3RlZCBGaWxlU3lzdGVtIGlmIHRoZSBjb21tYW5kIGNvbXBs ZXRlZCBzdWNjZXNzZnVsbHkuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAg ICAiZGVzY3JpcHRpb24iOiAiQ29tcGxldGlvbiBldmVudCBvZiByZXF1ZXN0RmlsZVN5c3RlbVJv b3QgY29tbWFuZC4iCiAgICAgICAgICAgICB9LApAQCAtMTU2Niw3ICsxNTc2LDcgQEAKICAgICAg ICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJyZXF1ZXN0SWQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3Qg SWRlbnRpZmllciB0aGF0IHdhcyByZXR1cm5lZCBieSBjb3JyZXNwb25kaW5nIHJlcXVlc3REaXJl Y3RvcnlDb250ZW50IGNvbW1hbmQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImVycm9yQ29kZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiMCwgaWYgbm8g ZXJyb3IuIE90aGVyd2lzZSwgZXJyb3JDb2RlIGlzIHNldCB0byBGaWxlRXJyb3I6OkVycm9yQ29k ZSB2YWx1ZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZW50cmllcyIsICJ0 eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJGaWxlU3lzdGVtLkVudHJ5IiB9LCAi b3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiQ29udGFpbnMgYWxsIGVudHJpZXMgb24g ZGlyZWN0b3J5IGlmIHRoZSBjb21tYW5kIGNvbXBsZXRlZCBzdWNjZXNzZnVsbHkuIiB9CisgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZW50cmllcyIsICJ0eXBlIjogImFycmF5IiwgIml0 ZW1zIjogeyAiJHJlZiI6ICJFbnRyeSIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9u IjogIkNvbnRhaW5zIGFsbCBlbnRyaWVzIG9uIGRpcmVjdG9yeSBpZiB0aGUgY29tbWFuZCBjb21w bGV0ZWQgc3VjY2Vzc2Z1bGx5LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAg ICAgImRlc2NyaXB0aW9uIjogIkNvbXBsZXRpb24gZXZlbnQgb2YgcmVxdWVzdERpcmVjdG9yeUNv bnRlbnQgY29tbWFuZC4iCiAgICAgICAgICAgICB9LApAQCAtMTU3NSw3ICsxNTg1LDcgQEAKICAg ICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJyZXF1ZXN0SWQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlJlcXVl c3QgSWRlbnRpZmllciB0aGF0IHdhcyByZXR1cm5lZCBpbiByZXNwb25zZSB0byB0aGUgY29ycmVz cG9uZGluZyByZXF1ZXN0TWV0YWRhdGEgY29tbWFuZC4iIH0sCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAiZXJyb3JDb2RlIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6 ICIwLCBpZiBubyBlcnJvci4gT3RoZXJ3aXNlLCBlcnJvckNvZGUgaXMgc2V0IHRvIEZpbGVFcnJv cjo6RXJyb3JDb2RlIHZhbHVlLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJt ZXRhZGF0YSIsICIkcmVmIjogIkZpbGVTeXN0ZW0uTWV0YWRhdGEiLCAib3B0aW9uYWwiOiB0cnVl LCAiZGVzY3JpcHRpb24iOiAiQ29udGFpbnMgbWV0YWRhdGEgb2YgdGhlIGVudHJ5IGlmIHRoZSBj b21tYW5kIGNvbXBsZXRlZCBzdWNjZXNzZnVsbHkuIiB9CisgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAibWV0YWRhdGEiLCAiJHJlZiI6ICJNZXRhZGF0YSIsICJvcHRpb25hbCI6IHRydWUs ICJkZXNjcmlwdGlvbiI6ICJDb250YWlucyBtZXRhZGF0YSBvZiB0aGUgZW50cnkgaWYgdGhlIGNv bW1hbmQgY29tcGxldGVkIHN1Y2Nlc3NmdWxseS4iIH0KICAgICAgICAgICAgICAgICBdLAogICAg ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJDb21wbGV0aW9uIGV2ZW50IG9mIHJlcXVlc3RN ZXRhZGF0YSBjb21tYW5kLiIKICAgICAgICAgICAgIH0sCkBAIC0xNTg4LDYgKzE1OTgsMTQgQEAK ICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjaGFyc2V0IiwgInR5cGUiOiAic3RyaW5n IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkNoYXJzZXQgb2YgdGhlIGNvbnRl bnQgaWYgaXQgaXMgc2VydmVkIGFzIHRleHQuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAg ICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQ29tcGxldGlvbiBldmVudCBvZiByZXF1ZXN0Rmls ZUNvbnRlbnQgY29tbWFuZC4iCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgeworICAgICAg ICAgICAgICAgICJuYW1lIjogImRlbGV0aW9uQ29tcGxldGVkIiwKKyAgICAgICAgICAgICAgICAi cGFyYW1ldGVycyI6IFsKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0SWQi LCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgSWRlbnRpZmllciB0 aGF0IHdhcyByZXR1cm5lZCBpbiByZXNwb25zZSB0byB0aGUgY29ycmVzcG9uZGluZyBkZWxldGVF bnRyeSBjb21tYW5kLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJlcnJvckNv ZGUiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIjAsIGlmIG5vIGVycm9yLiBP dGhlcndpc2UgZXJyb3JDb2RlIGlzIHNldCB0byBGaWxlRXJyb3I6OkVycm9yQ29kZSB2YWx1ZS4i IH0KKyAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJD b21wbGV0aW9uIGV2ZW50IG9mIGRlbGV0ZUVudHJ5IGNvbW1hbmQuIgogICAgICAgICAgICAgfQog ICAgICAgICBdCiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5jcHAKaW5kZXggZmY5MTJhNzBiYzNmMGU3NzkxZWUxZDc1 MjA5MjFlNDQ5ZWQ3ZGI0Ny4uZTNhNWRkZWY0OTRlOTRlZDE2YTQ0OTk4OTYzMzcxMjJlZGIyZTAw YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0 ZW1BZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVT eXN0ZW1BZ2VudC5jcHAKQEAgLTYzLDYgKzYzLDcgQEAKICNpbmNsdWRlICJTZWN1cml0eU9yaWdp bi5oIgogI2luY2x1ZGUgIlRleHRFbmNvZGluZy5oIgogI2luY2x1ZGUgIlRleHRSZXNvdXJjZURl Y29kZXIuaCIKKyNpbmNsdWRlICJWb2lkQ2FsbGJhY2suaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9C YXNlNjQuaD4KIAogdXNpbmcgV2ViQ29yZTo6VHlwZUJ1aWxkZXI6OkFycmF5OwpAQCAtMTczLDcg KzE3NCwxMiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGFydChTY3JpcHRFeGVjdXRpb25Db250ZXh0 Kik7CiAKIHByaXZhdGU6Ci0gICAgYm9vbCBkaWRIaXRFcnJvcihGaWxlRXJyb3IqKTsKKyAgICBi b29sIGRpZEhpdEVycm9yKEZpbGVFcnJvciogZXJyb3IpCisgICAgeworICAgICAgICByZXBvcnRS ZXN1bHQoZXJyb3ItPmNvZGUoKSk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKwogICAg IGJvb2wgZGlkR2V0RW50cnkoRW50cnkqKTsKIAogICAgIHZvaWQgcmVwb3J0UmVzdWx0KEZpbGVF cnJvcjo6RXJyb3JDb2RlIGVycm9yQ29kZSwgUGFzc1JlZlB0cjxUeXBlQnVpbGRlcjo6RmlsZVN5 c3RlbTo6RW50cnk+IGVudHJ5ID0gMCkKQEAgLTE5NCwxMiArMjAwLDYgQEAgcHJpdmF0ZToKICAg ICBTdHJpbmcgbV90eXBlOwogfTsKIAotYm9vbCBGaWxlU3lzdGVtUm9vdFJlcXVlc3Q6OmRpZEhp dEVycm9yKEZpbGVFcnJvciogZXJyb3IpCi17Ci0gICAgcmVwb3J0UmVzdWx0KGVycm9yLT5jb2Rl KCkpOwotICAgIHJldHVybiB0cnVlOwotfQotCiB2b2lkIEZpbGVTeXN0ZW1Sb290UmVxdWVzdDo6 c3RhcnQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCkKIHsK ICAgICBBU1NFUlQoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7CkBAIC01ODcsNiArNTg3LDk0IEBA IHZvaWQgRmlsZUNvbnRlbnRSZXF1ZXN0OjpkaWRSZWFkKCkKICAgICByZXBvcnRSZXN1bHQoc3Rh dGljX2Nhc3Q8RmlsZUVycm9yOjpFcnJvckNvZGU+KDApLCAmcmVzdWx0LCAmbV9jaGFyc2V0KTsK IH0KIAorY2xhc3MgRGVsZXRlRW50cnlSZXF1ZXN0IDogcHVibGljIFZvaWRDYWxsYmFjayB7Citw dWJsaWM6CisgICAgc3RhdGljIFBhc3NSZWZQdHI8RGVsZXRlRW50cnlSZXF1ZXN0PiBjcmVhdGUo UGFzc1JlZlB0cjxGcm9udGVuZFByb3ZpZGVyPiBmcm9udGVuZFByb3ZpZGVyLCBpbnQgcmVxdWVz dElkLCBjb25zdCBLVVJMJiB1cmwpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3 IERlbGV0ZUVudHJ5UmVxdWVzdChmcm9udGVuZFByb3ZpZGVyLCByZXF1ZXN0SWQsIHVybCkpOwor ICAgIH0KKworICAgIHZpcnR1YWwgfkRlbGV0ZUVudHJ5UmVxdWVzdCgpCisgICAgeworICAgICAg ICByZXBvcnRSZXN1bHQoRmlsZUVycm9yOjpBQk9SVF9FUlIpOworICAgIH0KKworICAgIHZpcnR1 YWwgYm9vbCBoYW5kbGVFdmVudCgpIE9WRVJSSURFCisgICAgeworICAgICAgICByZXR1cm4gZGlk RGVsZXRlRW50cnkoKTsKKyAgICB9CisKKyAgICB2b2lkIHN0YXJ0KFNjcmlwdEV4ZWN1dGlvbkNv bnRleHQqKTsKKworcHJpdmF0ZToKKyAgICBib29sIGRpZEhpdEVycm9yKEZpbGVFcnJvciogZXJy b3IpCisgICAgeworICAgICAgICByZXBvcnRSZXN1bHQoZXJyb3ItPmNvZGUoKSk7CisgICAgICAg IHJldHVybiB0cnVlOworICAgIH0KKworICAgIGJvb2wgZGlkR2V0RW50cnkoRW50cnkqKTsKKyAg ICBib29sIGRpZERlbGV0ZUVudHJ5KCk7CisKKyAgICB2b2lkIHJlcG9ydFJlc3VsdChGaWxlRXJy b3I6OkVycm9yQ29kZSBlcnJvckNvZGUpCisgICAgeworICAgICAgICBpZiAoIW1fZnJvbnRlbmRQ cm92aWRlciB8fCAhbV9mcm9udGVuZFByb3ZpZGVyLT5mcm9udGVuZCgpKQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICBtX2Zyb250ZW5kUHJvdmlkZXItPmZyb250ZW5kKCktPmRlbGV0aW9u Q29tcGxldGVkKG1fcmVxdWVzdElkLCBzdGF0aWNfY2FzdDxpbnQ+KGVycm9yQ29kZSkpOworICAg ICAgICBtX2Zyb250ZW5kUHJvdmlkZXIgPSAwOworICAgIH0KKworICAgIERlbGV0ZUVudHJ5UmVx dWVzdChQYXNzUmVmUHRyPEZyb250ZW5kUHJvdmlkZXI+IGZyb250ZW5kUHJvdmlkZXIsIGludCBy ZXF1ZXN0SWQsIGNvbnN0IEtVUkwmIHVybCkKKyAgICAgICAgOiBtX2Zyb250ZW5kUHJvdmlkZXIo ZnJvbnRlbmRQcm92aWRlcikKKyAgICAgICAgLCBtX3JlcXVlc3RJZChyZXF1ZXN0SWQpCisgICAg ICAgICwgbV91cmwodXJsKSB7IH0KKworICAgIFJlZlB0cjxGcm9udGVuZFByb3ZpZGVyPiBtX2Zy b250ZW5kUHJvdmlkZXI7CisgICAgaW50IG1fcmVxdWVzdElkOworICAgIEZpbGVTeXN0ZW1UeXBl IG1fdHlwZTsKKyAgICBLVVJMIG1fdXJsOworfTsKKwordm9pZCBEZWxldGVFbnRyeVJlcXVlc3Q6 OnN0YXJ0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpCit7 CisgICAgQVNTRVJUKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpOworCisgICAgUmVmUHRyPEVycm9y Q2FsbGJhY2s+IGVycm9yQ2FsbGJhY2sgPSBDYWxsYmFja0Rpc3BhdGNoZXJGYWN0b3J5PEVycm9y Q2FsbGJhY2s+OjpjcmVhdGUodGhpcywgJkRlbGV0ZUVudHJ5UmVxdWVzdDo6ZGlkSGl0RXJyb3Ip OworCisgICAgRmlsZVN5c3RlbVR5cGUgdHlwZTsKKyAgICBTdHJpbmcgcGF0aDsKKyAgICBpZiAo IURPTUZpbGVTeXN0ZW1CYXNlOjpjcmFja0ZpbGVTeXN0ZW1VUkwobV91cmwsIHR5cGUsIHBhdGgp KSB7CisgICAgICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPnBvc3RUYXNrKFJlcG9ydEVycm9y VGFzazo6Y3JlYXRlKGVycm9yQ2FsbGJhY2ssIEZpbGVFcnJvcjo6U1lOVEFYX0VSUikpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKHBhdGggPT0gIi8iKSB7CisgICAgICAgIE93 blB0cjxBc3luY0ZpbGVTeXN0ZW1DYWxsYmFja3M+IGZpbGVTeXN0ZW1DYWxsYmFja3MgPSBWb2lk Q2FsbGJhY2tzOjpjcmVhdGUodGhpcywgZXJyb3JDYWxsYmFjayk7CisgICAgICAgIExvY2FsRmls ZVN5c3RlbTo6bG9jYWxGaWxlU3lzdGVtKCkuZGVsZXRlRmlsZVN5c3RlbShzY3JpcHRFeGVjdXRp b25Db250ZXh0LCB0eXBlLCBmaWxlU3lzdGVtQ2FsbGJhY2tzLnJlbGVhc2UoKSk7CisgICAgfSBl bHNlIHsKKyAgICAgICAgUmVmUHRyPEVudHJ5Q2FsbGJhY2s+IHN1Y2Nlc3NDYWxsYmFjayA9IENh bGxiYWNrRGlzcGF0Y2hlckZhY3Rvcnk8RW50cnlDYWxsYmFjaz46OmNyZWF0ZSh0aGlzLCAmRGVs ZXRlRW50cnlSZXF1ZXN0OjpkaWRHZXRFbnRyeSk7CisgICAgICAgIE93blB0cjxSZXNvbHZlVVJJ Q2FsbGJhY2tzPiBmaWxlU3lzdGVtQ2FsbGJhY2tzID0gUmVzb2x2ZVVSSUNhbGxiYWNrczo6Y3Jl YXRlKHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjaywgc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCwgdHlwZSwgcGF0aCk7CisgICAgICAgIExvY2FsRmlsZVN5c3RlbTo6bG9jYWxGaWxlU3lzdGVt KCkucmVhZEZpbGVTeXN0ZW0oc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgdHlwZSwgZmlsZVN5c3Rl bUNhbGxiYWNrcy5yZWxlYXNlKCkpOworICAgIH0KK30KKworYm9vbCBEZWxldGVFbnRyeVJlcXVl c3Q6OmRpZEdldEVudHJ5KEVudHJ5KiBlbnRyeSkKK3sKKyAgICBSZWZQdHI8RXJyb3JDYWxsYmFj az4gZXJyb3JDYWxsYmFjayA9IENhbGxiYWNrRGlzcGF0Y2hlckZhY3Rvcnk8RXJyb3JDYWxsYmFj az46OmNyZWF0ZSh0aGlzLCAmRGVsZXRlRW50cnlSZXF1ZXN0OjpkaWRIaXRFcnJvcik7CisgICAg aWYgKGVudHJ5LT5pc0RpcmVjdG9yeSgpKSB7CisgICAgICAgIERpcmVjdG9yeUVudHJ5KiBkaXJl Y3RvcnlFbnRyeSA9IHN0YXRpY19jYXN0PERpcmVjdG9yeUVudHJ5Kj4oZW50cnkpOworICAgICAg ICBkaXJlY3RvcnlFbnRyeS0+cmVtb3ZlUmVjdXJzaXZlbHkodGhpcywgZXJyb3JDYWxsYmFjayk7 CisgICAgfSBlbHNlCisgICAgICAgIGVudHJ5LT5yZW1vdmUodGhpcywgZXJyb3JDYWxsYmFjayk7 CisgICAgcmV0dXJuIHRydWU7Cit9CisKK2Jvb2wgRGVsZXRlRW50cnlSZXF1ZXN0OjpkaWREZWxl dGVFbnRyeSgpCit7CisgICAgcmVwb3J0UmVzdWx0KHN0YXRpY19jYXN0PEZpbGVFcnJvcjo6RXJy b3JDb2RlPigwKSk7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIH0gLy8gYW5vbnltb3VzIG5hbWVz cGFjZQogCiAvLyBzdGF0aWMKQEAgLTYyMCwxMSArNzA4LDggQEAgdm9pZCBJbnNwZWN0b3JGaWxl U3lzdGVtQWdlbnQ6OmRpc2FibGUoRXJyb3JTdHJpbmcqKQogCiB2b2lkIEluc3BlY3RvckZpbGVT eXN0ZW1BZ2VudDo6cmVxdWVzdEZpbGVTeXN0ZW1Sb290KEVycm9yU3RyaW5nKiBlcnJvciwgY29u c3QgU3RyaW5nJiBvcmlnaW4sIGNvbnN0IFN0cmluZyYgdHlwZSwgaW50KiByZXF1ZXN0SWQpCiB7 Ci0gICAgaWYgKCFtX2VuYWJsZWQgfHwgIW1fZnJvbnRlbmRQcm92aWRlcikgewotICAgICAgICAq ZXJyb3IgPSAiRmlsZVN5c3RlbSBhZ2VudCBpcyBub3QgZW5hYmxlZCI7CisgICAgaWYgKCFhc3Nl cnRGcm9udGVuZChlcnJvcikpCiAgICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgQVNTRVJUKG1f ZnJvbnRlbmRQcm92aWRlci0+ZnJvbnRlbmQoKSk7CiAKICAgICBTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiBzY3JpcHRFeGVjdXRpb25Db250ZXh0ID0gYXNzZXJ0U2NyaXB0RXhlY3V0aW9uQ29udGV4 dEZvck9yaWdpbihlcnJvciwgU2VjdXJpdHlPcmlnaW46OmNyZWF0ZUZyb21TdHJpbmcob3JpZ2lu KS5nZXQoKSk7CiAgICAgaWYgKCFzY3JpcHRFeGVjdXRpb25Db250ZXh0KQpAQCAtNjM2LDExICs3 MjEsOCBAQCB2b2lkIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6cmVxdWVzdEZpbGVTeXN0ZW1S b290KEVycm9yU3RyaW5nKiBlcnJvciwgY29uc3QgUwogCiB2b2lkIEluc3BlY3RvckZpbGVTeXN0 ZW1BZ2VudDo6cmVxdWVzdERpcmVjdG9yeUNvbnRlbnQoRXJyb3JTdHJpbmcqIGVycm9yLCBjb25z dCBTdHJpbmcmIHVybCwgaW50KiByZXF1ZXN0SWQpCiB7Ci0gICAgaWYgKCFtX2VuYWJsZWQgfHwg IW1fZnJvbnRlbmRQcm92aWRlcikgewotICAgICAgICAqZXJyb3IgPSAiRmlsZVN5c3RlbSBhZ2Vu dCBpcyBub3QgZW5hYmxlZCI7CisgICAgaWYgKCFhc3NlcnRGcm9udGVuZChlcnJvcikpCiAgICAg ICAgIHJldHVybjsKLSAgICB9Ci0gICAgQVNTRVJUKG1fZnJvbnRlbmRQcm92aWRlci0+ZnJvbnRl bmQoKSk7CiAKICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBzY3JpcHRFeGVjdXRpb25Db250 ZXh0ID0gYXNzZXJ0U2NyaXB0RXhlY3V0aW9uQ29udGV4dEZvck9yaWdpbihlcnJvciwgU2VjdXJp dHlPcmlnaW46OmNyZWF0ZUZyb21TdHJpbmcodXJsKS5nZXQoKSk7CiAgICAgaWYgKCFzY3JpcHRF eGVjdXRpb25Db250ZXh0KQpAQCAtNjUyLDExICs3MzQsOCBAQCB2b2lkIEluc3BlY3RvckZpbGVT eXN0ZW1BZ2VudDo6cmVxdWVzdERpcmVjdG9yeUNvbnRlbnQoRXJyb3JTdHJpbmcqIGVycm9yLCBj b25zdAogCiB2b2lkIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6cmVxdWVzdE1ldGFkYXRhKEVy cm9yU3RyaW5nKiBlcnJvciwgY29uc3QgU3RyaW5nJiB1cmwsIGludCogcmVxdWVzdElkKQogewot ICAgIGlmICghbV9lbmFibGVkIHx8ICFtX2Zyb250ZW5kUHJvdmlkZXIpIHsKLSAgICAgICAgKmVy cm9yID0gIkZpbGVTeXN0ZW0gYWdlbnQgaXMgbm90IGVuYWJsZWQiOworICAgIGlmICghYXNzZXJ0 RnJvbnRlbmQoZXJyb3IpKQogICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIEFTU0VSVChtX2Zy b250ZW5kUHJvdmlkZXItPmZyb250ZW5kKCkpOwogCiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCA9IGFzc2VydFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRG b3JPcmlnaW4oZXJyb3IsIFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVGcm9tU3RyaW5nKHVybCkuZ2V0 KCkpOwogICAgIGlmICghc2NyaXB0RXhlY3V0aW9uQ29udGV4dCkKQEAgLTY2OCwxMSArNzQ3LDgg QEAgdm9pZCBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OnJlcXVlc3RNZXRhZGF0YShFcnJvclN0 cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYKIAogdm9pZCBJbnNwZWN0b3JGaWxlU3lzdGVtQWdl bnQ6OnJlcXVlc3RGaWxlQ29udGVudChFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYg dXJsLCBib29sIHJlYWRBc1RleHQsIGNvbnN0IGludCogc3RhcnQsIGNvbnN0IGludCogZW5kLCBj b25zdCBTdHJpbmcqIGNoYXJzZXQsIGludCogcmVxdWVzdElkKQogewotICAgIGlmICghbV9lbmFi bGVkIHx8ICFtX2Zyb250ZW5kUHJvdmlkZXIpIHsKLSAgICAgICAgKmVycm9yID0gIkZpbGVTeXN0 ZW0gYWdlbnQgaXMgbm90IGVuYWJsZWQiOworICAgIGlmICghYXNzZXJ0RnJvbnRlbmQoZXJyb3Ip KQogICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIEFTU0VSVChtX2Zyb250ZW5kUHJvdmlkZXIt PmZyb250ZW5kKCkpOwogCiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCA9IGFzc2VydFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRGb3JPcmlnaW4oZXJyb3Is IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVGcm9tU3RyaW5nKHVybCkuZ2V0KCkpOwogICAgIGlmICgh c2NyaXB0RXhlY3V0aW9uQ29udGV4dCkKQEAgLTY4NSw2ICs3NjEsMjEgQEAgdm9pZCBJbnNwZWN0 b3JGaWxlU3lzdGVtQWdlbnQ6OnJlcXVlc3RGaWxlQ29udGVudChFcnJvclN0cmluZyogZXJyb3Is IGNvbnN0IFN0cmkKICAgICBGaWxlQ29udGVudFJlcXVlc3Q6OmNyZWF0ZShtX2Zyb250ZW5kUHJv dmlkZXIsICpyZXF1ZXN0SWQsIHVybCwgcmVhZEFzVGV4dCwgc3RhcnRQb3NpdGlvbiwgZW5kUG9z aXRpb24sIGNoYXJzZXQgPyAqY2hhcnNldCA6ICIiKS0+c3RhcnQoc2NyaXB0RXhlY3V0aW9uQ29u dGV4dCk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpkZWxldGVFbnRyeShF cnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBpbnQqIHJlcXVlc3RJ ZCkKK3sKKyAgICBpZiAoIWFzc2VydEZyb250ZW5kKGVycm9yKSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgS1VSTCB1cmwoUGFyc2VkVVJMU3RyaW5nLCB1cmxTdHJpbmcpOworCisgICAgU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCA9IGFzc2VydFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHRGb3JPcmlnaW4oZXJyb3IsIFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUodXJs KS5nZXQoKSk7CisgICAgaWYgKCFzY3JpcHRFeGVjdXRpb25Db250ZXh0KQorICAgICAgICByZXR1 cm47CisKKyAgICAqcmVxdWVzdElkID0gbV9uZXh0UmVxdWVzdElkKys7CisgICAgRGVsZXRlRW50 cnlSZXF1ZXN0OjpjcmVhdGUobV9mcm9udGVuZFByb3ZpZGVyLCAqcmVxdWVzdElkLCB1cmwpLT5z dGFydChzY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKK30KKwogdm9pZCBJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQ6OnNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKIHsKICAg ICBBU1NFUlQoZnJvbnRlbmQpOwpAQCAtNzE4LDYgKzgwOSwxNiBAQCBJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQ6Okluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiBp bnN0cnVtZQogICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy0+c2V0SW5zcGVjdG9yRmlsZVN5c3Rl bUFnZW50KHRoaXMpOwogfQogCitib29sIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudDo6YXNzZXJ0 RnJvbnRlbmQoRXJyb3JTdHJpbmcqIGVycm9yKQoreworICAgIGlmICghbV9lbmFibGVkIHx8ICFt X2Zyb250ZW5kUHJvdmlkZXIpIHsKKyAgICAgICAgKmVycm9yID0gIkZpbGVTeXN0ZW0gYWdlbnQg aXMgbm90IGVuYWJsZWQuIjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBBU1NF UlQobV9mcm9udGVuZFByb3ZpZGVyLT5mcm9udGVuZCgpKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30K KwogU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50Ojphc3Nl cnRTY3JpcHRFeGVjdXRpb25Db250ZXh0Rm9yT3JpZ2luKEVycm9yU3RyaW5nKiBlcnJvciwgU2Vj dXJpdHlPcmlnaW4qIG9yaWdpbikKIHsKICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1fcGFnZUFn ZW50LT5tYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJhdmVyc2VO ZXh0KCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JG aWxlU3lzdGVtQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxl U3lzdGVtQWdlbnQuaAppbmRleCBmNzM1MGQ0MTYzNWJiYjZmOTRmYmMyYzMyOGJhZDRiNTczMWVi OTZlLi5mMGZjYTNjYWVkODdlNTdhMWZlZGExY2ZmMjBjNGJjOTYzNTYxNjU0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5oCkBA IC01OSw2ICs1OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdERpcmVjdG9y eUNvbnRlbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHVybCwgaW50KiByZXF1ZXN0SWQp IE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0TWV0YWRhdGEoRXJyb3JTdHJpbmcq LCBjb25zdCBTdHJpbmcmIHVybCwgaW50KiByZXF1ZXN0SWQpIE9WRVJSSURFOwogICAgIHZpcnR1 YWwgdm9pZCByZXF1ZXN0RmlsZUNvbnRlbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHVy bCwgYm9vbCByZWFkQXNUZXh0LCBjb25zdCBpbnQqIHN0YXJ0LCBjb25zdCBpbnQqIGVuZCwgY29u c3QgU3RyaW5nKiBjaGFyc2V0LCBpbnQqIHJlcXVlc3RJZCkgT1ZFUlJJREU7CisgICAgdmlydHVh bCB2b2lkIGRlbGV0ZUVudHJ5KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1cmwsIGludCog cmVxdWVzdElkKSBPVkVSUklERTsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRGcm9udGVuZChJbnNw ZWN0b3JGcm9udGVuZCopIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBjbGVhckZyb250ZW5k KCkgT1ZFUlJJREU7CkBAIC02Niw2ICs2Nyw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBJ bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvclBh Z2VBZ2VudCosIEluc3BlY3RvclN0YXRlKik7CisgICAgYm9vbCBhc3NlcnRGcm9udGVuZChFcnJv clN0cmluZyopOwogICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGFzc2VydFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHRGb3JPcmlnaW4oRXJyb3JTdHJpbmcqLCBTZWN1cml0eU9yaWdpbiopOwogCiAg ICAgSW5zcGVjdG9yUGFnZUFnZW50KiBtX3BhZ2VBZ2VudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbU1vZGVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtTW9kZWwuanMKaW5kZXggOTY0MDJi ZDliOGM5ZmFlZDMzZDNjZmNkNmRmZGVmZGE1MDM0ZWYyYy4uMzBlZGQ4NGU4ZWFmNzczOWRlYzk0 ZDFkYmY2ZmZjMWUxNzZiYjgxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9GaWxlU3lzdGVtTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtTW9kZWwuanMKQEAgLTY0NSw1ICs2NDUsMTQgQEAgV2Vi SW5zcGVjdG9yLkZpbGVTeXN0ZW1EaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKICAgICBmaWxlQ29u dGVudFJlY2VpdmVkOiBmdW5jdGlvbihyZXF1ZXN0SWQsIGVycm9yQ29kZSwgY29udGVudCwgY2hh cnNldCkKICAgICB7CiAgICAgICAgIHRoaXMuX2FnZW50V3JhcHBlci5fZmlsZUNvbnRlbnRSZWNl aXZlZChyZXF1ZXN0SWQsIGVycm9yQ29kZSwgY29udGVudCwgY2hhcnNldCk7CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7bnVtYmVyfSByZXF1ZXN0SWQKKyAgICAgKiBAcGFyYW0g e251bWJlcn0gZXJyb3JDb2RlCisgICAgICovCisgICAgZGVsZXRpb25Db21wbGV0ZWQ6IGZ1bmN0 aW9uKHJlcXVlc3RJZCwgZXJyb3JDb2RlKQorICAgIHsKKyAgICAgICAgY29uc29sZS5lcnJvcigi Tm90IGltcGxlbWVudGVkIik7CiAgICAgfQogfQo=