57928 2011-04-06 01:37:58 -0700 Web Inspector: migrate debugger domain to the unified breakpoint location notion. 2011-04-07 05:50:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 380209 0 pfeldman 2011-04-06 01:37:58 -0700 Simple refactoring, patch to follow. 380212 1 88383 pfeldman 2011-04-06 01:46:17 -0700 Created attachment 88383 Patch 381249 2 88383 yurys 2011-04-07 05:36:28 -0700 Comment on attachment 88383 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88383&action=review > Source/WebCore/inspector/InspectorDebuggerAgent.cpp:190 > + if (location) Should be if (*location), r- for this. 381252 3 88612 pfeldman 2011-04-07 05:43:01 -0700 Created attachment 88612 Patch 381256 4 pfeldman 2011-04-07 05:50:29 -0700 Committed r83164: <http://trac.webkit.org/changeset/83164> 88383 2011-04-06 01:46:17 -0700 2011-04-07 05:42:52 -0700 Patch bug-57928-20110406124615.patch text/plain 16225 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODMwMzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MmZlN2MzZTRlZDZmMDQ0 MDgwZjljYWY3NDQzNTNlMWE2NjhkMGMwLi4yNDVmYzk4MzBjMWEzNmU0ZTg5MDRiMmIwZjNlM2Q5 ZTlmZjUzODI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDQtMDYgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1pZ3JhdGUgZGVidWdnZXIg ZG9tYWluIHRvIHRoZSB1bmlmaWVkIGJyZWFrcG9pbnQgbG9jYXRpb24gbm90aW9uLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc5MjgKKworICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpidWlsZE9iamVjdEZvckJy ZWFrcG9pbnRDb29raWUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6c2V0QnJlYWtwb2ludEJ5VXJsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVn Z2VyQWdlbnQ6OnNldEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVi dWdnZXJBZ2VudDo6cmVzb2x2ZUJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JEZWJ1Z2dlckFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9C cmVha3BvaW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5zZXRCcmVha3BvaW50QnlTb3VyY2VJZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUuX2JyZWFrcG9p bnRSZXNvbHZlZCk6CisKIDIwMTEtMDQtMDYgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCA3OGI1ZThjNTY1NTM2YmU4Y2I0ZDUw YjQ5OWYzZjY2N2VlOWJjM2ZkLi44N2YxYjU0YWJmMjRiMjM1MzcwYzM3YjEzZWVmNmRmY2YxMzg0 YzIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xMjc4LDcg KzEyNzgsNyBAQAogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMi OiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYnJlYWtwb2ludElkIiwgInR5cGUi OiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklkIG9mIHRoZSBjcmVhdGVkIGJyZWFrcG9pbnQg Zm9yIGZ1cnRoZXIgbWFuaXB1bGF0aW9ucy4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAibG9jYXRpb25zIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIiA6ICJM b2NhdGlvbiJ9LCAiZGVzY3JpcHRpb24iOiAiTGlzdCBvZiB0aGUgbG9jYXRpb25zIHRoaXMgYnJl YWtwb2ludCByZXNvbHZlZCBpbnRvLiIgIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJsb2NhdGlvbnMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiIDogIkxvY2F0 aW9uIn0sICJkZXNjcmlwdGlvbiI6ICJMaXN0IG9mIHRoZSBsb2NhdGlvbnMgdGhpcyBicmVha3Bv aW50IHJlc29sdmVkIGludG8uIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAg ICAiZGVzY3JpcHRpb24iOiAiU2V0cyBKYXZhU2NyaXB0IGJyZWFrcG9pbnQgYXQgYSBnaXZlbiBs b2NhdGlvbiBzcGVjaWZpZWQgYnkgVVJMLiBUaGlzIGJyZWFrcG9pbnQgd2lsbCBzdXJ2aXZlIHBh Z2UgcmVsb2FkLiIKICAgICAgICAgICAgIH0sCkBAIC0xMjkzLDggKzEyOTMsNyBAQAogICAgICAg ICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiYnJlYWtwb2ludElkIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2Ny aXB0aW9uIjogIklkIG9mIHRoZSBjcmVhdGVkIGJyZWFrcG9pbnQgZm9yIGZ1cnRoZXIgbWFuaXB1 bGF0aW9ucy4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYWN0dWFsTGluZU51 bWJlciIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTGluZSBudW1iZXIgaW4g dGhlIHNjcmlwdC4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYWN0dWFsQ29s dW1uTnVtYmVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJDb2x1bW4gbnVt YmVyIGluIHRoZSBzY3JpcHQuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9j YXRpb24iLCAiJHJlZiIgOiAiTG9jYXRpb24iLCAiZGVzY3JpcHRpb24iOiAiTG9jYXRpb24gdGhp cyBicmVha3BvaW50IHJlc29sdmVkIGludG8uIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAg ICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiU2V0cyBKYXZhU2NyaXB0IGJyZWFrcG9pbnQgYXQg YSBnaXZlbiBsb2NhdGlvbi4iCiAgICAgICAgICAgICB9LApAQCAtMTQxMiw5ICsxNDExLDcgQEAK ICAgICAgICAgICAgICAgICAibmFtZSI6ICJicmVha3BvaW50UmVzb2x2ZWQiLAogICAgICAgICAg ICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImJy ZWFrcG9pbnRJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJCcmVha3BvaW50 IHVuaXF1ZSBpZGVudGlmaWVyLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJz b3VyY2VJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9m IHRoZSBzY3JpcHQgYnJlYWtwb2ludCBpcyBzZXQgaW4uIiB9LAotICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImxpbmVOdW1iZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9u IjogIkxpbmUgbnVtYmVyIG9mIHRoZSBzdGF0ZW1lbnQgYnJlYWtwb2ludCBpcyBzZXQgb24uIiB9 LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNvbHVtbk51bWJlciIsICJ0eXBlIjog ImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiQ29sdW1uIG9mZnNldCBvZiB0aGUgc3RhdGVtZW50 IGJyZWFrcG9pbnQgaXMgc2V0IG9uLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImxvY2F0aW9uIiwgIiRyZWYiOiAiTG9jYXRpb24iLCAiZGVzY3JpcHRpb24iOiAiQWN0dWFsIGJy ZWFrcG9pbnQgbG9jYXRpb24uIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAg ICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiBicmVha3BvaW50IGlzIHJlc29sdmVkIHRvIGFu IGFjdHVhbCBzY3JpcHQgYW5kIGxvY2F0aW9uLiIKICAgICAgICAgICAgIH0sCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKaW5kZXgg Y2FjNjU0NmEzNWEwNWM2N2MwNDg4MDRlMzQwNTI2MTAyOGFlZDBlNC4uMjc2NjAyZTljY2QzYzI4 YTgxZjg2MDcwMWE0M2I4ZmJiMDk0NTM1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcApAQCAtMTQxLDYgKzE0MSwxNyBAQCB2 b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6Omluc3BlY3RlZFVSTENoYW5nZWQoY29uc3QgU3Ry aW5nJikKICAgICBtX2JyZWFrcG9pbnRJZFRvRGVidWdTZXJ2ZXJCcmVha3BvaW50SWRzLmNsZWFy KCk7CiB9CiAKK3N0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RG b3JCcmVha3BvaW50Q29va2llKGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgbGluZU51bWJlciwgaW50 IGNvbHVtbk51bWJlciwgY29uc3QgU3RyaW5nJiBjb25kaXRpb24sIGJvb2wgZW5hYmxlZCkKK3sK KyAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBicmVha3BvaW50T2JqZWN0ID0gSW5zcGVjdG9y T2JqZWN0OjpjcmVhdGUoKTsKKyAgICBicmVha3BvaW50T2JqZWN0LT5zZXRTdHJpbmcoInVybCIs IHVybCk7CisgICAgYnJlYWtwb2ludE9iamVjdC0+c2V0TnVtYmVyKCJsaW5lTnVtYmVyIiwgbGlu ZU51bWJlcik7CisgICAgYnJlYWtwb2ludE9iamVjdC0+c2V0TnVtYmVyKCJjb2x1bW5OdW1iZXIi LCBjb2x1bW5OdW1iZXIpOworICAgIGJyZWFrcG9pbnRPYmplY3QtPnNldFN0cmluZygiY29uZGl0 aW9uIiwgY29uZGl0aW9uKTsKKyAgICBicmVha3BvaW50T2JqZWN0LT5zZXRCb29sZWFuKCJlbmFi bGVkIiwgZW5hYmxlZCk7CisgICAgcmV0dXJuIGJyZWFrcG9pbnRPYmplY3Q7Cit9CisKIHZvaWQg SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0QnJlYWtwb2ludEJ5VXJsKEVycm9yU3RyaW5nKiwg Y29uc3QgU3RyaW5nJiB1cmwsIGludCBsaW5lTnVtYmVyLCBjb25zdCBpbnQqIGNvbnN0IG9wdGlv bmFsQ29sdW1uTnVtYmVyLCBjb25zdCBTdHJpbmcqIGNvbnN0IG9wdGlvbmFsQ29uZGl0aW9uLCBj b25zdCBib29sKiBjb25zdCBvcHRpb25hbEVuYWJsZWQsIFN0cmluZyogb3V0QnJlYWtwb2ludElk LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBsb2NhdGlvbnMpCiB7CiAgICAgaW50IGNvbHVtbk51 bWJlciA9IG9wdGlvbmFsQ29sdW1uTnVtYmVyID8gKm9wdGlvbmFsQ29sdW1uTnVtYmVyIDogMDsK QEAgLTE1MSwzMiArMTYyLDIxIEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0QnJl YWtwb2ludEJ5VXJsKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1cmwsCiAgICAgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gYnJlYWtwb2ludHNDb29raWUgPSBtX2luc3BlY3RvclN0YXRlLT5n ZXRPYmplY3QoRGVidWdnZXJBZ2VudFN0YXRlOjpqYXZhU2NyaXB0QnJlYWtwb2ludHMpOwogICAg IGlmIChicmVha3BvaW50c0Nvb2tpZS0+ZmluZChicmVha3BvaW50SWQpICE9IGJyZWFrcG9pbnRz Q29va2llLT5lbmQoKSkKICAgICAgICAgcmV0dXJuOwotICAgIFJlZlB0cjxJbnNwZWN0b3JPYmpl Y3Q+IGJyZWFrcG9pbnRPYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgIGJy ZWFrcG9pbnRPYmplY3QtPnNldFN0cmluZygidXJsIiwgdXJsKTsKLSAgICBicmVha3BvaW50T2Jq ZWN0LT5zZXROdW1iZXIoImxpbmVOdW1iZXIiLCBsaW5lTnVtYmVyKTsKLSAgICBicmVha3BvaW50 T2JqZWN0LT5zZXROdW1iZXIoImNvbHVtbk51bWJlciIsIGNvbHVtbk51bWJlcik7Ci0gICAgYnJl YWtwb2ludE9iamVjdC0+c2V0U3RyaW5nKCJjb25kaXRpb24iLCBjb25kaXRpb24pOwotICAgIGJy ZWFrcG9pbnRPYmplY3QtPnNldEJvb2xlYW4oImVuYWJsZWQiLCBlbmFibGVkKTsKLSAgICBicmVh a3BvaW50c0Nvb2tpZS0+c2V0T2JqZWN0KGJyZWFrcG9pbnRJZCwgYnJlYWtwb2ludE9iamVjdCk7 CisgICAgYnJlYWtwb2ludHNDb29raWUtPnNldE9iamVjdChicmVha3BvaW50SWQsIGJ1aWxkT2Jq ZWN0Rm9yQnJlYWtwb2ludENvb2tpZSh1cmwsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgY29u ZGl0aW9uLCBlbmFibGVkKSk7CiAgICAgbV9pbnNwZWN0b3JTdGF0ZS0+c2V0T2JqZWN0KERlYnVn Z2VyQWdlbnRTdGF0ZTo6amF2YVNjcmlwdEJyZWFrcG9pbnRzLCBicmVha3BvaW50c0Nvb2tpZSk7 CiAKICAgICBTY3JpcHRCcmVha3BvaW50IGJyZWFrcG9pbnQobGluZU51bWJlciwgY29sdW1uTnVt YmVyLCBjb25kaXRpb24sIGVuYWJsZWQpOwogICAgIGZvciAoU2NyaXB0c01hcDo6aXRlcmF0b3Ig aXQgPSBtX3NjcmlwdHMuYmVnaW4oKTsgaXQgIT0gbV9zY3JpcHRzLmVuZCgpOyArK2l0KSB7CiAg ICAgICAgIGlmIChpdC0+c2Vjb25kLnVybCAhPSB1cmwpCiAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgaW50IGFjdHVhbExpbmVOdW1iZXIgPSAwLCBhY3R1YWxDb2x1bW5OdW1iZXIgPSAw OwotICAgICAgICBpZiAoIXJlc29sdmVCcmVha3BvaW50KGJyZWFrcG9pbnRJZCwgaXQtPmZpcnN0 LCBicmVha3BvaW50LCAmYWN0dWFsTGluZU51bWJlciwgJmFjdHVhbENvbHVtbk51bWJlcikpCi0g ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbG9j YXRpb24gPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgICAgICBsb2NhdGlvbi0+c2V0 U3RyaW5nKCJzb3VyY2VJRCIsIGl0LT5maXJzdCk7Ci0gICAgICAgIGxvY2F0aW9uLT5zZXROdW1i ZXIoImxpbmVOdW1iZXIiLCBhY3R1YWxMaW5lTnVtYmVyKTsKLSAgICAgICAgbG9jYXRpb24tPnNl dE51bWJlcigiY29sdW1uTnVtYmVyIiwgYWN0dWFsQ29sdW1uTnVtYmVyKTsKLSAgICAgICAgbG9j YXRpb25zLT5nZXQoKS0+cHVzaE9iamVjdChsb2NhdGlvbik7CisgICAgICAgIFJlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IGxvY2F0aW9uID0gcmVzb2x2ZUJyZWFrcG9pbnQoYnJlYWtwb2ludElkLCBp dC0+Zmlyc3QsIGJyZWFrcG9pbnQpOworICAgICAgICBpZiAobG9jYXRpb24pCisgICAgICAgICAg ICAoKmxvY2F0aW9ucyktPnB1c2hPYmplY3QobG9jYXRpb24pOwogICAgIH0KICAgICAqb3V0QnJl YWtwb2ludElkID0gYnJlYWtwb2ludElkOwogfQogCi12b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdl bnQ6OnNldEJyZWFrcG9pbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlkLCBp bnQgbGluZU51bWJlciwgY29uc3QgaW50KiBjb25zdCBvcHRpb25hbENvbHVtbk51bWJlciwgY29u c3QgU3RyaW5nKiBjb25zdCBvcHRpb25hbENvbmRpdGlvbiwgY29uc3QgYm9vbCogY29uc3Qgb3B0 aW9uYWxFbmFibGVkLCBTdHJpbmcqIG91dEJyZWFrcG9pbnRJZCwgaW50KiBhY3R1YWxMaW5lTnVt YmVyLCBpbnQqIGFjdHVhbENvbHVtbk51bWJlcikKK3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6c2V0QnJlYWtwb2ludChFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYg c291cmNlSWQsIGludCBsaW5lTnVtYmVyLCBjb25zdCBpbnQqIGNvbnN0IG9wdGlvbmFsQ29sdW1u TnVtYmVyLCBjb25zdCBTdHJpbmcqIGNvbnN0IG9wdGlvbmFsQ29uZGl0aW9uLCBjb25zdCBib29s KiBjb25zdCBvcHRpb25hbEVuYWJsZWQsIFN0cmluZyogb3V0QnJlYWtwb2ludElkLCBSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiogbG9jYXRpb24pCiB7CiAgICAgaW50IGNvbHVtbk51bWJlciA9IG9w dGlvbmFsQ29sdW1uTnVtYmVyID8gKm9wdGlvbmFsQ29sdW1uTnVtYmVyIDogMDsKICAgICBTdHJp bmcgY29uZGl0aW9uID0gb3B0aW9uYWxDb25kaXRpb24gPyAqb3B0aW9uYWxDb25kaXRpb24gOiAi IjsKQEAgLTE4Niw5ICsxODYsMTEgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRC cmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwKICAgICBpZiAo bV9icmVha3BvaW50SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElkcy5maW5kKGJyZWFrcG9pbnRJ ZCkgIT0gbV9icmVha3BvaW50SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElkcy5lbmQoKSkKICAg ICAgICAgcmV0dXJuOwogICAgIFNjcmlwdEJyZWFrcG9pbnQgYnJlYWtwb2ludChsaW5lTnVtYmVy LCBjb2x1bW5OdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCk7Ci0gICAgaWYgKCFyZXNvbHZlQnJl YWtwb2ludChicmVha3BvaW50SWQsIHNvdXJjZUlkLCBicmVha3BvaW50LCBhY3R1YWxMaW5lTnVt YmVyLCBhY3R1YWxDb2x1bW5OdW1iZXIpKQotICAgICAgICByZXR1cm47Ci0gICAgKm91dEJyZWFr cG9pbnRJZCA9IGJyZWFrcG9pbnRJZDsKKyAgICAqbG9jYXRpb24gPSByZXNvbHZlQnJlYWtwb2lu dChicmVha3BvaW50SWQsIHNvdXJjZUlkLCBicmVha3BvaW50KTsKKyAgICBpZiAobG9jYXRpb24p CisgICAgICAgICpvdXRCcmVha3BvaW50SWQgPSBicmVha3BvaW50SWQ7CisgICAgZWxzZQorICAg ICAgICAqZXJyb3JTdHJpbmcgPSAiQ291bGQgbm90IHJlc29sdmUgYnJlYWtwb2ludCI7CiB9CiAK IHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6cmVtb3ZlQnJlYWtwb2ludChFcnJvclN0cmlu ZyosIGNvbnN0IFN0cmluZyYgYnJlYWtwb2ludElkKQpAQCAtMjE2LDE0ICsyMTgsMTQgQEAgdm9p ZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50Ojpjb250aW51ZVRvTG9jYXRpb24oRXJyb3JTdHJpbmcq IGVycm9yLCBjb25zdCBTdHJpbmcKICAgICByZXN1bWUoZXJyb3IpOwogfQogCi1ib29sIEluc3Bl Y3RvckRlYnVnZ2VyQWdlbnQ6OnJlc29sdmVCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgYnJlYWtw b2ludElkLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlkLCBjb25zdCBTY3JpcHRCcmVha3BvaW50JiBi cmVha3BvaW50LCBpbnQqIGFjdHVhbExpbmVOdW1iZXIsIGludCogYWN0dWFsQ29sdW1uTnVtYmVy KQorUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnJl c29sdmVCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgYnJlYWtwb2ludElkLCBjb25zdCBTdHJpbmcm IHNvdXJjZUlkLCBjb25zdCBTY3JpcHRCcmVha3BvaW50JiBicmVha3BvaW50KQogewogICAgIFNj cmlwdHNNYXA6Oml0ZXJhdG9yIHNjcmlwdEl0ZXJhdG9yID0gbV9zY3JpcHRzLmZpbmQoc291cmNl SWQpOwogICAgIGlmIChzY3JpcHRJdGVyYXRvciA9PSBtX3NjcmlwdHMuZW5kKCkpCi0gICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIDA7CiAgICAgU2NyaXB0JiBzY3JpcHQgPSBz Y3JpcHRJdGVyYXRvci0+c2Vjb25kOwogICAgIGlmIChicmVha3BvaW50LmxpbmVOdW1iZXIgPCBz Y3JpcHQubGluZU9mZnNldCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4g MDsKICAgICBpZiAoIXNjcmlwdC5saW5lc0NvdW50KSB7CiAgICAgICAgIHNjcmlwdC5saW5lc0Nv dW50ID0gMTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzY3JpcHQuZGF0YS5sZW5n dGgoKTsgKytpKSB7CkBAIC0yMzIsMTggKzIzNCwyNCBAQCBib29sIEluc3BlY3RvckRlYnVnZ2Vy QWdlbnQ6OnJlc29sdmVCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgYnJlYWtwb2ludElkLCBjb25z dAogICAgICAgICB9CiAgICAgfQogICAgIGlmIChicmVha3BvaW50LmxpbmVOdW1iZXIgPj0gc2Ny aXB0LmxpbmVPZmZzZXQgKyBzY3JpcHQubGluZXNDb3VudCkKLSAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICByZXR1cm4gMDsKIAotICAgIFN0cmluZyBkZWJ1Z1NlcnZlckJyZWFrcG9pbnRJ ZCA9IHNjcmlwdERlYnVnU2VydmVyKCkuc2V0QnJlYWtwb2ludChzb3VyY2VJZCwgYnJlYWtwb2lu dCwgYWN0dWFsTGluZU51bWJlciwgYWN0dWFsQ29sdW1uTnVtYmVyKTsKKyAgICBpbnQgYWN0dWFs TGluZU51bWJlcjsKKyAgICBpbnQgYWN0dWFsQ29sdW1uTnVtYmVyOworICAgIFN0cmluZyBkZWJ1 Z1NlcnZlckJyZWFrcG9pbnRJZCA9IHNjcmlwdERlYnVnU2VydmVyKCkuc2V0QnJlYWtwb2ludChz b3VyY2VJZCwgYnJlYWtwb2ludCwgJmFjdHVhbExpbmVOdW1iZXIsICZhY3R1YWxDb2x1bW5OdW1i ZXIpOwogICAgIGlmIChkZWJ1Z1NlcnZlckJyZWFrcG9pbnRJZC5pc0VtcHR5KCkpCi0gICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIDA7CiAKICAgICBCcmVha3BvaW50SWRUb0Rl YnVnU2VydmVyQnJlYWtwb2ludElkc01hcDo6aXRlcmF0b3IgZGVidWdTZXJ2ZXJCcmVha3BvaW50 SWRzSXRlcmF0b3IgPSBtX2JyZWFrcG9pbnRJZFRvRGVidWdTZXJ2ZXJCcmVha3BvaW50SWRzLmZp bmQoYnJlYWtwb2ludElkKTsKICAgICBpZiAoZGVidWdTZXJ2ZXJCcmVha3BvaW50SWRzSXRlcmF0 b3IgPT0gbV9icmVha3BvaW50SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElkcy5lbmQoKSkKICAg ICAgICAgZGVidWdTZXJ2ZXJCcmVha3BvaW50SWRzSXRlcmF0b3IgPSBtX2JyZWFrcG9pbnRJZFRv RGVidWdTZXJ2ZXJCcmVha3BvaW50SWRzLnNldChicmVha3BvaW50SWQsIFZlY3RvcjxTdHJpbmc+ KCkpLmZpcnN0OwogICAgIGRlYnVnU2VydmVyQnJlYWtwb2ludElkc0l0ZXJhdG9yLT5zZWNvbmQu YXBwZW5kKGRlYnVnU2VydmVyQnJlYWtwb2ludElkKTsKIAotICAgIHJldHVybiB0cnVlOworICAg IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGxvY2F0aW9uID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVh dGUoKTsKKyAgICBsb2NhdGlvbi0+c2V0U3RyaW5nKCJzb3VyY2VJRCIsIHNvdXJjZUlkKTsKKyAg ICBsb2NhdGlvbi0+c2V0TnVtYmVyKCJsaW5lTnVtYmVyIiwgYWN0dWFsTGluZU51bWJlcik7Cisg ICAgbG9jYXRpb24tPnNldE51bWJlcigiY29sdW1uTnVtYmVyIiwgYWN0dWFsQ29sdW1uTnVtYmVy KTsKKyAgICByZXR1cm4gbG9jYXRpb247CiB9CiAKIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6ZWRpdFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYgc291 cmNlSUQsIGNvbnN0IFN0cmluZyYgbmV3Q29udGVudCwgUmVmUHRyPEluc3BlY3RvckFycmF5Piog bmV3Q2FsbEZyYW1lcykKQEAgLTM2NCw5ICszNzIsOSBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2Vy QWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmlu ZwogICAgICAgICBicmVha3BvaW50T2JqZWN0LT5nZXROdW1iZXIoImNvbHVtbk51bWJlciIsICZi cmVha3BvaW50LmNvbHVtbk51bWJlcik7CiAgICAgICAgIGJyZWFrcG9pbnRPYmplY3QtPmdldFN0 cmluZygiY29uZGl0aW9uIiwgJmJyZWFrcG9pbnQuY29uZGl0aW9uKTsKICAgICAgICAgYnJlYWtw b2ludE9iamVjdC0+Z2V0Qm9vbGVhbigiZW5hYmxlZCIsICZicmVha3BvaW50LmVuYWJsZWQpOwot ICAgICAgICBpbnQgYWN0dWFsTGluZU51bWJlciA9IDAsIGFjdHVhbENvbHVtbk51bWJlciA9IDA7 Ci0gICAgICAgIGlmIChyZXNvbHZlQnJlYWtwb2ludChpdC0+Zmlyc3QsIHNvdXJjZUlELCBicmVh a3BvaW50LCAmYWN0dWFsTGluZU51bWJlciwgJmFjdHVhbENvbHVtbk51bWJlcikpCi0gICAgICAg ICAgICBtX2Zyb250ZW5kLT5icmVha3BvaW50UmVzb2x2ZWQoaXQtPmZpcnN0LCBzb3VyY2VJRCwg YWN0dWFsTGluZU51bWJlciwgYWN0dWFsQ29sdW1uTnVtYmVyKTsKKyAgICAgICAgUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gbG9jYXRpb24gPSByZXNvbHZlQnJlYWtwb2ludChpdC0+Zmlyc3QsIHNv dXJjZUlELCBicmVha3BvaW50KTsKKyAgICAgICAgaWYgKGxvY2F0aW9uKQorICAgICAgICAgICAg bV9mcm9udGVuZC0+YnJlYWtwb2ludFJlc29sdmVkKGl0LT5maXJzdCwgbG9jYXRpb24pOwogICAg IH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRl YnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dl ckFnZW50LmgKaW5kZXggNTFkNjM3NmQxYTcyMzJmNTZhYzBiYzQ5ZGZhZWRkMjY0YjRhODY3My4u NDhlYmEwOTBhZmY3YzdkNTQ3MzQ4YjZmNmE5NmE0MDk2Yzc0NTRlZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCkBAIC0zOSw2ICsz OSw3IEBACiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5o PgogI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CisjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIu aD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nSGFz aC5oPgogCkBAIC04MCw3ICs4MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEJyZWFrcG9pbnRz QWN0aXZlKEVycm9yU3RyaW5nKiwgYm9vbCBhY3RpdmUpOwogCiAgICAgdm9pZCBzZXRCcmVha3Bv aW50QnlVcmwoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IGxpbmVOdW1iZXIs IGNvbnN0IGludCogY29uc3Qgb3B0aW9uYWxDb2x1bW5OdW1iZXIsIGNvbnN0IFN0cmluZyogY29u c3Qgb3B0aW9uYWxDb25kaXRpb24sIGNvbnN0IGJvb2wqIGNvbnN0IG9wdGlvbmFsRW5hYmxlZCwg U3RyaW5nKiBicmVha3BvaW50SWQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIGxvY2F0aW9ucyk7 Ci0gICAgdm9pZCBzZXRCcmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzb3Vy Y2VJZCwgaW50IGxpbmVOdW1iZXIsIGNvbnN0IGludCogY29uc3Qgb3B0aW9uYWxDb2x1bW5OdW1i ZXIsIGNvbnN0IFN0cmluZyogY29uc3Qgb3B0aW9uYWxDb25kaXRpb24sIGNvbnN0IGJvb2wqIGNv bnN0IG9wdGlvbmFsRW5hYmxlZCwgU3RyaW5nKiBicmVha3BvaW50SWQsIGludCogYWN0dWFsTGlu ZU51bWJlciwgaW50KiBhY3R1YWxDb2x1bW5OdW1iZXIpOworICAgIHZvaWQgc2V0QnJlYWtwb2lu dChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc291cmNlSWQsIGludCBsaW5lTnVtYmVyLCBj b25zdCBpbnQqIGNvbnN0IG9wdGlvbmFsQ29sdW1uTnVtYmVyLCBjb25zdCBTdHJpbmcqIGNvbnN0 IG9wdGlvbmFsQ29uZGl0aW9uLCBjb25zdCBib29sKiBjb25zdCBvcHRpb25hbEVuYWJsZWQsIFN0 cmluZyogYnJlYWtwb2ludElkLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogbG9jYXRpb24pOwog ICAgIHZvaWQgcmVtb3ZlQnJlYWtwb2ludChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgYnJl YWtwb2ludElkKTsKICAgICB2b2lkIGNvbnRpbnVlVG9Mb2NhdGlvbihFcnJvclN0cmluZyosIGNv bnN0IFN0cmluZyYgc291cmNlSWQsIGludCBsaW5lTnVtYmVyLCBpbnQgY29sdW1uTnVtYmVyKTsK IApAQCAtMTIzLDcgKzEyNCw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZFBhdXNl KFNjcmlwdFN0YXRlKik7CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbnRpbnVlKCk7CiAKLSAgICBi b29sIHJlc29sdmVCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgYnJlYWtwb2ludElkLCBjb25zdCBT dHJpbmcmIHNvdXJjZUlkLCBjb25zdCBTY3JpcHRCcmVha3BvaW50JiwgaW50KiBhY3R1YWxMaW5l TnVtYmVyLCBpbnQqIGFjdHVhbENvbHVtbk51bWJlcik7CisgICAgUGFzc1JlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+IHJlc29sdmVCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgYnJlYWtwb2ludElkLCBj b25zdCBTdHJpbmcmIHNvdXJjZUlkLCBjb25zdCBTY3JpcHRCcmVha3BvaW50Jik7CiAgICAgdm9p ZCBjbGVhcigpOwogCiAgICAgY2xhc3MgU2NyaXB0IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludC5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludC5qcwppbmRleCBlYmM2MDI5NzYzNDVlODQ4NWNm YTAwN2M5NjA4NmFjMjA4ZDc4MGY1Li5kNjAyZDgxZWIzM2QxOGM3YzViMTUyODI0ZjMxOWY2M2Y5 YzY5M2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Jy ZWFrcG9pbnQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVh a3BvaW50LmpzCkBAIC00MCwxMCArNDAsMyBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludCA9IGZ1 bmN0aW9uKGlkLCB1cmwsIHNvdXJjZUlELCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIsCiAgICAg dGhpcy5lbmFibGVkID0gZW5hYmxlZDsKICAgICB0aGlzLmxvY2F0aW9ucyA9IFtdOwogfQotCi1X ZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5wcm90b3R5cGUgPSB7Ci0gICAgYWRkTG9jYXRpb246IGZ1 bmN0aW9uKHNvdXJjZUlELCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpCi0gICAgewotICAgICAg ICB0aGlzLmxvY2F0aW9ucy5wdXNoKHsgc291cmNlSUQ6IHNvdXJjZUlELCBsaW5lTnVtYmVyOiBs aW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IGNvbHVtbk51bWJlciB9KTsKLSAgICB9Ci19CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMK aW5kZXggYmYzYzg0ZTAyNmE1NzAxN2NiZDRhNDI0NTRiYTI4NmNkNTJlOTk1NS4uMjM4ZGJkMzk1 ZDFlZmJmMDc2ZDk0MDU4ZDYxMDA5ZGI0ODNmZjdjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwpAQCAtMTAyLDEyICsxMDIs MTIgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogCiAgICAgc2V0 QnJlYWtwb2ludEJ5U291cmNlSWQ6IGZ1bmN0aW9uKHNvdXJjZUlELCBsaW5lTnVtYmVyLCBjb2x1 bW5OdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCwgY2FsbGJhY2spCiAgICAgewotICAgICAgICBm dW5jdGlvbiBkaWRTZXRCcmVha3BvaW50KGVycm9yLCBicmVha3BvaW50SWQsIGFjdHVhbExpbmVO dW1iZXIsIGFjdHVhbENvbHVtbk51bWJlcikKKyAgICAgICAgZnVuY3Rpb24gZGlkU2V0QnJlYWtw b2ludChlcnJvciwgYnJlYWtwb2ludElkLCBsb2NhdGlvbikKICAgICAgICAgewogICAgICAgICAg ICAgdmFyIGJyZWFrcG9pbnQ7CiAgICAgICAgICAgICBpZiAoIWVycm9yICYmIGJyZWFrcG9pbnRJ ZCkgewogICAgICAgICAgICAgICAgIGJyZWFrcG9pbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFr cG9pbnQoYnJlYWtwb2ludElkLCAiIiwgc291cmNlSUQsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJl ciwgY29uZGl0aW9uLCBlbmFibGVkKTsKLSAgICAgICAgICAgICAgICBicmVha3BvaW50LmFkZExv Y2F0aW9uKHNvdXJjZUlELCBhY3R1YWxMaW5lTnVtYmVyLCBhY3R1YWxDb2x1bW5OdW1iZXIpOwor ICAgICAgICAgICAgICAgIGJyZWFrcG9pbnQubG9jYXRpb25zLnB1c2gobG9jYXRpb24pOwogICAg ICAgICAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRzW2JyZWFrcG9pbnRJZF0gPSBicmVha3BvaW50 OwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKGNhbGxiYWNrKQpAQCAtMTIyLDEwICsx MjIsMTAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogICAgICAg ICBkZWxldGUgdGhpcy5fYnJlYWtwb2ludHNbYnJlYWtwb2ludElkXTsKICAgICB9LAogCi0gICAg X2JyZWFrcG9pbnRSZXNvbHZlZDogZnVuY3Rpb24oYnJlYWtwb2ludElkLCBzb3VyY2VJRCwgbGlu ZU51bWJlciwgY29sdW1uTnVtYmVyKQorICAgIF9icmVha3BvaW50UmVzb2x2ZWQ6IGZ1bmN0aW9u KGJyZWFrcG9pbnRJZCwgbG9jYXRpb24pCiAgICAgewogICAgICAgICB2YXIgYnJlYWtwb2ludCA9 IHRoaXMuX2JyZWFrcG9pbnRzW2JyZWFrcG9pbnRJZF07Ci0gICAgICAgIGJyZWFrcG9pbnQuYWRk TG9jYXRpb24oc291cmNlSUQsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcik7CisgICAgICAgIGJy ZWFrcG9pbnQubG9jYXRpb25zLnB1c2gobG9jYXRpb24pOwogICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuQnJlYWtw b2ludFJlc29sdmVkLCBicmVha3BvaW50KTsKICAgICB9LAogCg== 88612 2011-04-07 05:43:01 -0700 2011-04-07 05:44:31 -0700 Patch bug-57928-20110407164259.patch text/plain 16226 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODMwMzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MmZlN2MzZTRlZDZmMDQ0 MDgwZjljYWY3NDQzNTNlMWE2NjhkMGMwLi4yNDVmYzk4MzBjMWEzNmU0ZTg5MDRiMmIwZjNlM2Q5 ZTlmZjUzODI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDQtMDYgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1pZ3JhdGUgZGVidWdnZXIg ZG9tYWluIHRvIHRoZSB1bmlmaWVkIGJyZWFrcG9pbnQgbG9jYXRpb24gbm90aW9uLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc5MjgKKworICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpidWlsZE9iamVjdEZvckJy ZWFrcG9pbnRDb29raWUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6c2V0QnJlYWtwb2ludEJ5VXJsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVn Z2VyQWdlbnQ6OnNldEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVi dWdnZXJBZ2VudDo6cmVzb2x2ZUJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JEZWJ1Z2dlckFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9C cmVha3BvaW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5zZXRCcmVha3BvaW50QnlTb3VyY2VJZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUuX2JyZWFrcG9p bnRSZXNvbHZlZCk6CisKIDIwMTEtMDQtMDYgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCA3OGI1ZThjNTY1NTM2YmU4Y2I0ZDUw YjQ5OWYzZjY2N2VlOWJjM2ZkLi44N2YxYjU0YWJmMjRiMjM1MzcwYzM3YjEzZWVmNmRmY2YxMzg0 YzIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xMjc4LDcg KzEyNzgsNyBAQAogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMi OiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYnJlYWtwb2ludElkIiwgInR5cGUi OiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklkIG9mIHRoZSBjcmVhdGVkIGJyZWFrcG9pbnQg Zm9yIGZ1cnRoZXIgbWFuaXB1bGF0aW9ucy4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAibG9jYXRpb25zIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIiA6ICJM b2NhdGlvbiJ9LCAiZGVzY3JpcHRpb24iOiAiTGlzdCBvZiB0aGUgbG9jYXRpb25zIHRoaXMgYnJl YWtwb2ludCByZXNvbHZlZCBpbnRvLiIgIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJsb2NhdGlvbnMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiIDogIkxvY2F0 aW9uIn0sICJkZXNjcmlwdGlvbiI6ICJMaXN0IG9mIHRoZSBsb2NhdGlvbnMgdGhpcyBicmVha3Bv aW50IHJlc29sdmVkIGludG8uIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAg ICAiZGVzY3JpcHRpb24iOiAiU2V0cyBKYXZhU2NyaXB0IGJyZWFrcG9pbnQgYXQgYSBnaXZlbiBs b2NhdGlvbiBzcGVjaWZpZWQgYnkgVVJMLiBUaGlzIGJyZWFrcG9pbnQgd2lsbCBzdXJ2aXZlIHBh Z2UgcmVsb2FkLiIKICAgICAgICAgICAgIH0sCkBAIC0xMjkzLDggKzEyOTMsNyBAQAogICAgICAg ICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiYnJlYWtwb2ludElkIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2Ny aXB0aW9uIjogIklkIG9mIHRoZSBjcmVhdGVkIGJyZWFrcG9pbnQgZm9yIGZ1cnRoZXIgbWFuaXB1 bGF0aW9ucy4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYWN0dWFsTGluZU51 bWJlciIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTGluZSBudW1iZXIgaW4g dGhlIHNjcmlwdC4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYWN0dWFsQ29s dW1uTnVtYmVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJDb2x1bW4gbnVt YmVyIGluIHRoZSBzY3JpcHQuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9j YXRpb24iLCAiJHJlZiIgOiAiTG9jYXRpb24iLCAiZGVzY3JpcHRpb24iOiAiTG9jYXRpb24gdGhp cyBicmVha3BvaW50IHJlc29sdmVkIGludG8uIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAg ICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiU2V0cyBKYXZhU2NyaXB0IGJyZWFrcG9pbnQgYXQg YSBnaXZlbiBsb2NhdGlvbi4iCiAgICAgICAgICAgICB9LApAQCAtMTQxMiw5ICsxNDExLDcgQEAK ICAgICAgICAgICAgICAgICAibmFtZSI6ICJicmVha3BvaW50UmVzb2x2ZWQiLAogICAgICAgICAg ICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImJy ZWFrcG9pbnRJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJCcmVha3BvaW50 IHVuaXF1ZSBpZGVudGlmaWVyLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJz b3VyY2VJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9m IHRoZSBzY3JpcHQgYnJlYWtwb2ludCBpcyBzZXQgaW4uIiB9LAotICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImxpbmVOdW1iZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9u IjogIkxpbmUgbnVtYmVyIG9mIHRoZSBzdGF0ZW1lbnQgYnJlYWtwb2ludCBpcyBzZXQgb24uIiB9 LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNvbHVtbk51bWJlciIsICJ0eXBlIjog ImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiQ29sdW1uIG9mZnNldCBvZiB0aGUgc3RhdGVtZW50 IGJyZWFrcG9pbnQgaXMgc2V0IG9uLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImxvY2F0aW9uIiwgIiRyZWYiOiAiTG9jYXRpb24iLCAiZGVzY3JpcHRpb24iOiAiQWN0dWFsIGJy ZWFrcG9pbnQgbG9jYXRpb24uIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAg ICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiBicmVha3BvaW50IGlzIHJlc29sdmVkIHRvIGFu IGFjdHVhbCBzY3JpcHQgYW5kIGxvY2F0aW9uLiIKICAgICAgICAgICAgIH0sCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKaW5kZXgg Y2FjNjU0NmEzNWEwNWM2N2MwNDg4MDRlMzQwNTI2MTAyOGFlZDBlNC4uOWYyODg1MTJjMjdjOTI2 MDVmNGEwZWQ3OGUzNzA3YmQ4NjRkNTA4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcApAQCAtMTQxLDYgKzE0MSwxNyBAQCB2 b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6Omluc3BlY3RlZFVSTENoYW5nZWQoY29uc3QgU3Ry aW5nJikKICAgICBtX2JyZWFrcG9pbnRJZFRvRGVidWdTZXJ2ZXJCcmVha3BvaW50SWRzLmNsZWFy KCk7CiB9CiAKK3N0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RG b3JCcmVha3BvaW50Q29va2llKGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgbGluZU51bWJlciwgaW50 IGNvbHVtbk51bWJlciwgY29uc3QgU3RyaW5nJiBjb25kaXRpb24sIGJvb2wgZW5hYmxlZCkKK3sK KyAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBicmVha3BvaW50T2JqZWN0ID0gSW5zcGVjdG9y T2JqZWN0OjpjcmVhdGUoKTsKKyAgICBicmVha3BvaW50T2JqZWN0LT5zZXRTdHJpbmcoInVybCIs IHVybCk7CisgICAgYnJlYWtwb2ludE9iamVjdC0+c2V0TnVtYmVyKCJsaW5lTnVtYmVyIiwgbGlu ZU51bWJlcik7CisgICAgYnJlYWtwb2ludE9iamVjdC0+c2V0TnVtYmVyKCJjb2x1bW5OdW1iZXIi LCBjb2x1bW5OdW1iZXIpOworICAgIGJyZWFrcG9pbnRPYmplY3QtPnNldFN0cmluZygiY29uZGl0 aW9uIiwgY29uZGl0aW9uKTsKKyAgICBicmVha3BvaW50T2JqZWN0LT5zZXRCb29sZWFuKCJlbmFi bGVkIiwgZW5hYmxlZCk7CisgICAgcmV0dXJuIGJyZWFrcG9pbnRPYmplY3Q7Cit9CisKIHZvaWQg SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0QnJlYWtwb2ludEJ5VXJsKEVycm9yU3RyaW5nKiwg Y29uc3QgU3RyaW5nJiB1cmwsIGludCBsaW5lTnVtYmVyLCBjb25zdCBpbnQqIGNvbnN0IG9wdGlv bmFsQ29sdW1uTnVtYmVyLCBjb25zdCBTdHJpbmcqIGNvbnN0IG9wdGlvbmFsQ29uZGl0aW9uLCBj b25zdCBib29sKiBjb25zdCBvcHRpb25hbEVuYWJsZWQsIFN0cmluZyogb3V0QnJlYWtwb2ludElk LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBsb2NhdGlvbnMpCiB7CiAgICAgaW50IGNvbHVtbk51 bWJlciA9IG9wdGlvbmFsQ29sdW1uTnVtYmVyID8gKm9wdGlvbmFsQ29sdW1uTnVtYmVyIDogMDsK QEAgLTE1MSwzMiArMTYyLDIxIEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0QnJl YWtwb2ludEJ5VXJsKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1cmwsCiAgICAgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gYnJlYWtwb2ludHNDb29raWUgPSBtX2luc3BlY3RvclN0YXRlLT5n ZXRPYmplY3QoRGVidWdnZXJBZ2VudFN0YXRlOjpqYXZhU2NyaXB0QnJlYWtwb2ludHMpOwogICAg IGlmIChicmVha3BvaW50c0Nvb2tpZS0+ZmluZChicmVha3BvaW50SWQpICE9IGJyZWFrcG9pbnRz Q29va2llLT5lbmQoKSkKICAgICAgICAgcmV0dXJuOwotICAgIFJlZlB0cjxJbnNwZWN0b3JPYmpl Y3Q+IGJyZWFrcG9pbnRPYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgIGJy ZWFrcG9pbnRPYmplY3QtPnNldFN0cmluZygidXJsIiwgdXJsKTsKLSAgICBicmVha3BvaW50T2Jq ZWN0LT5zZXROdW1iZXIoImxpbmVOdW1iZXIiLCBsaW5lTnVtYmVyKTsKLSAgICBicmVha3BvaW50 T2JqZWN0LT5zZXROdW1iZXIoImNvbHVtbk51bWJlciIsIGNvbHVtbk51bWJlcik7Ci0gICAgYnJl YWtwb2ludE9iamVjdC0+c2V0U3RyaW5nKCJjb25kaXRpb24iLCBjb25kaXRpb24pOwotICAgIGJy ZWFrcG9pbnRPYmplY3QtPnNldEJvb2xlYW4oImVuYWJsZWQiLCBlbmFibGVkKTsKLSAgICBicmVh a3BvaW50c0Nvb2tpZS0+c2V0T2JqZWN0KGJyZWFrcG9pbnRJZCwgYnJlYWtwb2ludE9iamVjdCk7 CisgICAgYnJlYWtwb2ludHNDb29raWUtPnNldE9iamVjdChicmVha3BvaW50SWQsIGJ1aWxkT2Jq ZWN0Rm9yQnJlYWtwb2ludENvb2tpZSh1cmwsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgY29u ZGl0aW9uLCBlbmFibGVkKSk7CiAgICAgbV9pbnNwZWN0b3JTdGF0ZS0+c2V0T2JqZWN0KERlYnVn Z2VyQWdlbnRTdGF0ZTo6amF2YVNjcmlwdEJyZWFrcG9pbnRzLCBicmVha3BvaW50c0Nvb2tpZSk7 CiAKICAgICBTY3JpcHRCcmVha3BvaW50IGJyZWFrcG9pbnQobGluZU51bWJlciwgY29sdW1uTnVt YmVyLCBjb25kaXRpb24sIGVuYWJsZWQpOwogICAgIGZvciAoU2NyaXB0c01hcDo6aXRlcmF0b3Ig aXQgPSBtX3NjcmlwdHMuYmVnaW4oKTsgaXQgIT0gbV9zY3JpcHRzLmVuZCgpOyArK2l0KSB7CiAg ICAgICAgIGlmIChpdC0+c2Vjb25kLnVybCAhPSB1cmwpCiAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgaW50IGFjdHVhbExpbmVOdW1iZXIgPSAwLCBhY3R1YWxDb2x1bW5OdW1iZXIgPSAw OwotICAgICAgICBpZiAoIXJlc29sdmVCcmVha3BvaW50KGJyZWFrcG9pbnRJZCwgaXQtPmZpcnN0 LCBicmVha3BvaW50LCAmYWN0dWFsTGluZU51bWJlciwgJmFjdHVhbENvbHVtbk51bWJlcikpCi0g ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbG9j YXRpb24gPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgICAgICBsb2NhdGlvbi0+c2V0 U3RyaW5nKCJzb3VyY2VJRCIsIGl0LT5maXJzdCk7Ci0gICAgICAgIGxvY2F0aW9uLT5zZXROdW1i ZXIoImxpbmVOdW1iZXIiLCBhY3R1YWxMaW5lTnVtYmVyKTsKLSAgICAgICAgbG9jYXRpb24tPnNl dE51bWJlcigiY29sdW1uTnVtYmVyIiwgYWN0dWFsQ29sdW1uTnVtYmVyKTsKLSAgICAgICAgbG9j YXRpb25zLT5nZXQoKS0+cHVzaE9iamVjdChsb2NhdGlvbik7CisgICAgICAgIFJlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IGxvY2F0aW9uID0gcmVzb2x2ZUJyZWFrcG9pbnQoYnJlYWtwb2ludElkLCBp dC0+Zmlyc3QsIGJyZWFrcG9pbnQpOworICAgICAgICBpZiAobG9jYXRpb24pCisgICAgICAgICAg ICAoKmxvY2F0aW9ucyktPnB1c2hPYmplY3QobG9jYXRpb24pOwogICAgIH0KICAgICAqb3V0QnJl YWtwb2ludElkID0gYnJlYWtwb2ludElkOwogfQogCi12b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdl bnQ6OnNldEJyZWFrcG9pbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlkLCBp bnQgbGluZU51bWJlciwgY29uc3QgaW50KiBjb25zdCBvcHRpb25hbENvbHVtbk51bWJlciwgY29u c3QgU3RyaW5nKiBjb25zdCBvcHRpb25hbENvbmRpdGlvbiwgY29uc3QgYm9vbCogY29uc3Qgb3B0 aW9uYWxFbmFibGVkLCBTdHJpbmcqIG91dEJyZWFrcG9pbnRJZCwgaW50KiBhY3R1YWxMaW5lTnVt YmVyLCBpbnQqIGFjdHVhbENvbHVtbk51bWJlcikKK3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6c2V0QnJlYWtwb2ludChFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYg c291cmNlSWQsIGludCBsaW5lTnVtYmVyLCBjb25zdCBpbnQqIGNvbnN0IG9wdGlvbmFsQ29sdW1u TnVtYmVyLCBjb25zdCBTdHJpbmcqIGNvbnN0IG9wdGlvbmFsQ29uZGl0aW9uLCBjb25zdCBib29s KiBjb25zdCBvcHRpb25hbEVuYWJsZWQsIFN0cmluZyogb3V0QnJlYWtwb2ludElkLCBSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiogbG9jYXRpb24pCiB7CiAgICAgaW50IGNvbHVtbk51bWJlciA9IG9w dGlvbmFsQ29sdW1uTnVtYmVyID8gKm9wdGlvbmFsQ29sdW1uTnVtYmVyIDogMDsKICAgICBTdHJp bmcgY29uZGl0aW9uID0gb3B0aW9uYWxDb25kaXRpb24gPyAqb3B0aW9uYWxDb25kaXRpb24gOiAi IjsKQEAgLTE4Niw5ICsxODYsMTEgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRC cmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwKICAgICBpZiAo bV9icmVha3BvaW50SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElkcy5maW5kKGJyZWFrcG9pbnRJ ZCkgIT0gbV9icmVha3BvaW50SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElkcy5lbmQoKSkKICAg ICAgICAgcmV0dXJuOwogICAgIFNjcmlwdEJyZWFrcG9pbnQgYnJlYWtwb2ludChsaW5lTnVtYmVy LCBjb2x1bW5OdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCk7Ci0gICAgaWYgKCFyZXNvbHZlQnJl YWtwb2ludChicmVha3BvaW50SWQsIHNvdXJjZUlkLCBicmVha3BvaW50LCBhY3R1YWxMaW5lTnVt YmVyLCBhY3R1YWxDb2x1bW5OdW1iZXIpKQotICAgICAgICByZXR1cm47Ci0gICAgKm91dEJyZWFr cG9pbnRJZCA9IGJyZWFrcG9pbnRJZDsKKyAgICAqbG9jYXRpb24gPSByZXNvbHZlQnJlYWtwb2lu dChicmVha3BvaW50SWQsIHNvdXJjZUlkLCBicmVha3BvaW50KTsKKyAgICBpZiAoKmxvY2F0aW9u KQorICAgICAgICAqb3V0QnJlYWtwb2ludElkID0gYnJlYWtwb2ludElkOworICAgIGVsc2UKKyAg ICAgICAgKmVycm9yU3RyaW5nID0gIkNvdWxkIG5vdCByZXNvbHZlIGJyZWFrcG9pbnQiOwogfQog CiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnJlbW92ZUJyZWFrcG9pbnQoRXJyb3JTdHJp bmcqLCBjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZCkKQEAgLTIxNiwxNCArMjE4LDE0IEBAIHZv aWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Y29udGludWVUb0xvY2F0aW9uKEVycm9yU3RyaW5n KiBlcnJvciwgY29uc3QgU3RyaW5nCiAgICAgcmVzdW1lKGVycm9yKTsKIH0KIAotYm9vbCBJbnNw ZWN0b3JEZWJ1Z2dlckFnZW50OjpyZXNvbHZlQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIGJyZWFr cG9pbnRJZCwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwgY29uc3QgU2NyaXB0QnJlYWtwb2ludCYg YnJlYWtwb2ludCwgaW50KiBhY3R1YWxMaW5lTnVtYmVyLCBpbnQqIGFjdHVhbENvbHVtbk51bWJl cikKK1Bhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50Ojpy ZXNvbHZlQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZCwgY29uc3QgU3RyaW5n JiBzb3VyY2VJZCwgY29uc3QgU2NyaXB0QnJlYWtwb2ludCYgYnJlYWtwb2ludCkKIHsKICAgICBT Y3JpcHRzTWFwOjppdGVyYXRvciBzY3JpcHRJdGVyYXRvciA9IG1fc2NyaXB0cy5maW5kKHNvdXJj ZUlkKTsKICAgICBpZiAoc2NyaXB0SXRlcmF0b3IgPT0gbV9zY3JpcHRzLmVuZCgpKQotICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiAwOwogICAgIFNjcmlwdCYgc2NyaXB0ID0g c2NyaXB0SXRlcmF0b3ItPnNlY29uZDsKICAgICBpZiAoYnJlYWtwb2ludC5saW5lTnVtYmVyIDwg c2NyaXB0LmxpbmVPZmZzZXQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJu IDA7CiAgICAgaWYgKCFzY3JpcHQubGluZXNDb3VudCkgewogICAgICAgICBzY3JpcHQubGluZXND b3VudCA9IDE7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2NyaXB0LmRhdGEubGVu Z3RoKCk7ICsraSkgewpAQCAtMjMyLDE4ICsyMzQsMjQgQEAgYm9vbCBJbnNwZWN0b3JEZWJ1Z2dl ckFnZW50OjpyZXNvbHZlQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZCwgY29u c3QKICAgICAgICAgfQogICAgIH0KICAgICBpZiAoYnJlYWtwb2ludC5saW5lTnVtYmVyID49IHNj cmlwdC5saW5lT2Zmc2V0ICsgc2NyaXB0LmxpbmVzQ291bnQpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBTdHJpbmcgZGVidWdTZXJ2ZXJCcmVha3BvaW50 SWQgPSBzY3JpcHREZWJ1Z1NlcnZlcigpLnNldEJyZWFrcG9pbnQoc291cmNlSWQsIGJyZWFrcG9p bnQsIGFjdHVhbExpbmVOdW1iZXIsIGFjdHVhbENvbHVtbk51bWJlcik7CisgICAgaW50IGFjdHVh bExpbmVOdW1iZXI7CisgICAgaW50IGFjdHVhbENvbHVtbk51bWJlcjsKKyAgICBTdHJpbmcgZGVi dWdTZXJ2ZXJCcmVha3BvaW50SWQgPSBzY3JpcHREZWJ1Z1NlcnZlcigpLnNldEJyZWFrcG9pbnQo c291cmNlSWQsIGJyZWFrcG9pbnQsICZhY3R1YWxMaW5lTnVtYmVyLCAmYWN0dWFsQ29sdW1uTnVt YmVyKTsKICAgICBpZiAoZGVidWdTZXJ2ZXJCcmVha3BvaW50SWQuaXNFbXB0eSgpKQotICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiAwOwogCiAgICAgQnJlYWtwb2ludElkVG9E ZWJ1Z1NlcnZlckJyZWFrcG9pbnRJZHNNYXA6Oml0ZXJhdG9yIGRlYnVnU2VydmVyQnJlYWtwb2lu dElkc0l0ZXJhdG9yID0gbV9icmVha3BvaW50SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElkcy5m aW5kKGJyZWFrcG9pbnRJZCk7CiAgICAgaWYgKGRlYnVnU2VydmVyQnJlYWtwb2ludElkc0l0ZXJh dG9yID09IG1fYnJlYWtwb2ludElkVG9EZWJ1Z1NlcnZlckJyZWFrcG9pbnRJZHMuZW5kKCkpCiAg ICAgICAgIGRlYnVnU2VydmVyQnJlYWtwb2ludElkc0l0ZXJhdG9yID0gbV9icmVha3BvaW50SWRU b0RlYnVnU2VydmVyQnJlYWtwb2ludElkcy5zZXQoYnJlYWtwb2ludElkLCBWZWN0b3I8U3RyaW5n PigpKS5maXJzdDsKICAgICBkZWJ1Z1NlcnZlckJyZWFrcG9pbnRJZHNJdGVyYXRvci0+c2Vjb25k LmFwcGVuZChkZWJ1Z1NlcnZlckJyZWFrcG9pbnRJZCk7CiAKLSAgICByZXR1cm4gdHJ1ZTsKKyAg ICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBsb2NhdGlvbiA9IEluc3BlY3Rvck9iamVjdDo6Y3Jl YXRlKCk7CisgICAgbG9jYXRpb24tPnNldFN0cmluZygic291cmNlSUQiLCBzb3VyY2VJZCk7Cisg ICAgbG9jYXRpb24tPnNldE51bWJlcigibGluZU51bWJlciIsIGFjdHVhbExpbmVOdW1iZXIpOwor ICAgIGxvY2F0aW9uLT5zZXROdW1iZXIoImNvbHVtbk51bWJlciIsIGFjdHVhbENvbHVtbk51bWJl cik7CisgICAgcmV0dXJuIGxvY2F0aW9uOwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdl bnQ6OmVkaXRTY3JpcHRTb3VyY2UoRXJyb3JTdHJpbmcqIGVycm9yLCBjb25zdCBTdHJpbmcmIHNv dXJjZUlELCBjb25zdCBTdHJpbmcmIG5ld0NvbnRlbnQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4q IG5ld0NhbGxGcmFtZXMpCkBAIC0zNjQsOSArMzcyLDkgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dl ckFnZW50OjpkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJp bmcKICAgICAgICAgYnJlYWtwb2ludE9iamVjdC0+Z2V0TnVtYmVyKCJjb2x1bW5OdW1iZXIiLCAm YnJlYWtwb2ludC5jb2x1bW5OdW1iZXIpOwogICAgICAgICBicmVha3BvaW50T2JqZWN0LT5nZXRT dHJpbmcoImNvbmRpdGlvbiIsICZicmVha3BvaW50LmNvbmRpdGlvbik7CiAgICAgICAgIGJyZWFr cG9pbnRPYmplY3QtPmdldEJvb2xlYW4oImVuYWJsZWQiLCAmYnJlYWtwb2ludC5lbmFibGVkKTsK LSAgICAgICAgaW50IGFjdHVhbExpbmVOdW1iZXIgPSAwLCBhY3R1YWxDb2x1bW5OdW1iZXIgPSAw OwotICAgICAgICBpZiAocmVzb2x2ZUJyZWFrcG9pbnQoaXQtPmZpcnN0LCBzb3VyY2VJRCwgYnJl YWtwb2ludCwgJmFjdHVhbExpbmVOdW1iZXIsICZhY3R1YWxDb2x1bW5OdW1iZXIpKQotICAgICAg ICAgICAgbV9mcm9udGVuZC0+YnJlYWtwb2ludFJlc29sdmVkKGl0LT5maXJzdCwgc291cmNlSUQs IGFjdHVhbExpbmVOdW1iZXIsIGFjdHVhbENvbHVtbk51bWJlcik7CisgICAgICAgIFJlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+IGxvY2F0aW9uID0gcmVzb2x2ZUJyZWFrcG9pbnQoaXQtPmZpcnN0LCBz b3VyY2VJRCwgYnJlYWtwb2ludCk7CisgICAgICAgIGlmIChsb2NhdGlvbikKKyAgICAgICAgICAg IG1fZnJvbnRlbmQtPmJyZWFrcG9pbnRSZXNvbHZlZChpdC0+Zmlyc3QsIGxvY2F0aW9uKTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE ZWJ1Z2dlckFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdn ZXJBZ2VudC5oCmluZGV4IDUxZDYzNzZkMWE3MjMyZjU2YWMwYmM0OWRmYWVkZDI2NGI0YTg2NzMu LjQ4ZWJhMDkwYWZmN2M3ZDU0NzM0OGI2ZjZhOTZhNDA5NmM3NDU0ZWYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaApAQCAtMzksNiAr MzksNyBAQAogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAu aD4KICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgorI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRy Lmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0hh c2guaD4KIApAQCAtODAsNyArODEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRCcmVha3BvaW50 c0FjdGl2ZShFcnJvclN0cmluZyosIGJvb2wgYWN0aXZlKTsKIAogICAgIHZvaWQgc2V0QnJlYWtw b2ludEJ5VXJsKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1cmwsIGludCBsaW5lTnVtYmVy LCBjb25zdCBpbnQqIGNvbnN0IG9wdGlvbmFsQ29sdW1uTnVtYmVyLCBjb25zdCBTdHJpbmcqIGNv bnN0IG9wdGlvbmFsQ29uZGl0aW9uLCBjb25zdCBib29sKiBjb25zdCBvcHRpb25hbEVuYWJsZWQs IFN0cmluZyogYnJlYWtwb2ludElkLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBsb2NhdGlvbnMp OwotICAgIHZvaWQgc2V0QnJlYWtwb2ludChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc291 cmNlSWQsIGludCBsaW5lTnVtYmVyLCBjb25zdCBpbnQqIGNvbnN0IG9wdGlvbmFsQ29sdW1uTnVt YmVyLCBjb25zdCBTdHJpbmcqIGNvbnN0IG9wdGlvbmFsQ29uZGl0aW9uLCBjb25zdCBib29sKiBj b25zdCBvcHRpb25hbEVuYWJsZWQsIFN0cmluZyogYnJlYWtwb2ludElkLCBpbnQqIGFjdHVhbExp bmVOdW1iZXIsIGludCogYWN0dWFsQ29sdW1uTnVtYmVyKTsKKyAgICB2b2lkIHNldEJyZWFrcG9p bnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlkLCBpbnQgbGluZU51bWJlciwg Y29uc3QgaW50KiBjb25zdCBvcHRpb25hbENvbHVtbk51bWJlciwgY29uc3QgU3RyaW5nKiBjb25z dCBvcHRpb25hbENvbmRpdGlvbiwgY29uc3QgYm9vbCogY29uc3Qgb3B0aW9uYWxFbmFibGVkLCBT dHJpbmcqIGJyZWFrcG9pbnRJZCwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIGxvY2F0aW9uKTsK ICAgICB2b2lkIHJlbW92ZUJyZWFrcG9pbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIGJy ZWFrcG9pbnRJZCk7CiAgICAgdm9pZCBjb250aW51ZVRvTG9jYXRpb24oRXJyb3JTdHJpbmcqLCBj b25zdCBTdHJpbmcmIHNvdXJjZUlkLCBpbnQgbGluZU51bWJlciwgaW50IGNvbHVtbk51bWJlcik7 CiAKQEAgLTEyMyw3ICsxMjQsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaWRQYXVz ZShTY3JpcHRTdGF0ZSopOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb250aW51ZSgpOwogCi0gICAg Ym9vbCByZXNvbHZlQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZCwgY29uc3Qg U3RyaW5nJiBzb3VyY2VJZCwgY29uc3QgU2NyaXB0QnJlYWtwb2ludCYsIGludCogYWN0dWFsTGlu ZU51bWJlciwgaW50KiBhY3R1YWxDb2x1bW5OdW1iZXIpOworICAgIFBhc3NSZWZQdHI8SW5zcGVj dG9yT2JqZWN0PiByZXNvbHZlQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZCwg Y29uc3QgU3RyaW5nJiBzb3VyY2VJZCwgY29uc3QgU2NyaXB0QnJlYWtwb2ludCYpOwogICAgIHZv aWQgY2xlYXIoKTsKIAogICAgIGNsYXNzIFNjcmlwdCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnQuanMKaW5kZXggZWJjNjAyOTc2MzQ1ZTg0ODVj ZmEwMDdjOTYwODZhYzIwOGQ3ODBmNS4uZDYwMmQ4MWViMzNkMThjN2M1YjE1MjgyNGYzMTlmNjNm OWM2OTNlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9C cmVha3BvaW50LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJl YWtwb2ludC5qcwpAQCAtNDAsMTAgKzQwLDMgQEAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQgPSBm dW5jdGlvbihpZCwgdXJsLCBzb3VyY2VJRCwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyLAogICAg IHRoaXMuZW5hYmxlZCA9IGVuYWJsZWQ7CiAgICAgdGhpcy5sb2NhdGlvbnMgPSBbXTsKIH0KLQot V2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQucHJvdG90eXBlID0gewotICAgIGFkZExvY2F0aW9uOiBm dW5jdGlvbihzb3VyY2VJRCwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyKQotICAgIHsKLSAgICAg ICAgdGhpcy5sb2NhdGlvbnMucHVzaCh7IHNvdXJjZUlEOiBzb3VyY2VJRCwgbGluZU51bWJlcjog bGluZU51bWJlciwgY29sdW1uTnVtYmVyOiBjb2x1bW5OdW1iZXIgfSk7Ci0gICAgfQotfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVs LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpz CmluZGV4IGJmM2M4NGUwMjZhNTcwMTdjYmQ0YTQyNDU0YmEyODZjZDUyZTk5NTUuLjIzOGRiZDM5 NWQxZWZiZjA3NmQ5NDA1OGQ2MTAwOWRiNDgzZmY3Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKQEAgLTEwMiwxMiArMTAy LDEyIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZSA9IHsKIAogICAgIHNl dEJyZWFrcG9pbnRCeVNvdXJjZUlkOiBmdW5jdGlvbihzb3VyY2VJRCwgbGluZU51bWJlciwgY29s dW1uTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAg ZnVuY3Rpb24gZGlkU2V0QnJlYWtwb2ludChlcnJvciwgYnJlYWtwb2ludElkLCBhY3R1YWxMaW5l TnVtYmVyLCBhY3R1YWxDb2x1bW5OdW1iZXIpCisgICAgICAgIGZ1bmN0aW9uIGRpZFNldEJyZWFr cG9pbnQoZXJyb3IsIGJyZWFrcG9pbnRJZCwgbG9jYXRpb24pCiAgICAgICAgIHsKICAgICAgICAg ICAgIHZhciBicmVha3BvaW50OwogICAgICAgICAgICAgaWYgKCFlcnJvciAmJiBicmVha3BvaW50 SWQpIHsKICAgICAgICAgICAgICAgICBicmVha3BvaW50ID0gbmV3IFdlYkluc3BlY3Rvci5CcmVh a3BvaW50KGJyZWFrcG9pbnRJZCwgIiIsIHNvdXJjZUlELCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1i ZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCk7Ci0gICAgICAgICAgICAgICAgYnJlYWtwb2ludC5hZGRM b2NhdGlvbihzb3VyY2VJRCwgYWN0dWFsTGluZU51bWJlciwgYWN0dWFsQ29sdW1uTnVtYmVyKTsK KyAgICAgICAgICAgICAgICBicmVha3BvaW50LmxvY2F0aW9ucy5wdXNoKGxvY2F0aW9uKTsKICAg ICAgICAgICAgICAgICB0aGlzLl9icmVha3BvaW50c1ticmVha3BvaW50SWRdID0gYnJlYWtwb2lu dDsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChjYWxsYmFjaykKQEAgLTEyMiwxMCAr MTIyLDEwIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgZGVsZXRlIHRoaXMuX2JyZWFrcG9pbnRzW2JyZWFrcG9pbnRJZF07CiAgICAgfSwKIAotICAg IF9icmVha3BvaW50UmVzb2x2ZWQ6IGZ1bmN0aW9uKGJyZWFrcG9pbnRJZCwgc291cmNlSUQsIGxp bmVOdW1iZXIsIGNvbHVtbk51bWJlcikKKyAgICBfYnJlYWtwb2ludFJlc29sdmVkOiBmdW5jdGlv bihicmVha3BvaW50SWQsIGxvY2F0aW9uKQogICAgIHsKICAgICAgICAgdmFyIGJyZWFrcG9pbnQg PSB0aGlzLl9icmVha3BvaW50c1ticmVha3BvaW50SWRdOwotICAgICAgICBicmVha3BvaW50LmFk ZExvY2F0aW9uKHNvdXJjZUlELCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOworICAgICAgICBi cmVha3BvaW50LmxvY2F0aW9ucy5wdXNoKGxvY2F0aW9uKTsKICAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkJyZWFr cG9pbnRSZXNvbHZlZCwgYnJlYWtwb2ludCk7CiAgICAgfSwKIAo=