63128 2011-06-22 04:06:38 -0700 REGRESSION(r89368): It made http/tests/inspector/extensions-resources-redirect.html crash (Requested by Ossy on #webkit). 2011-06-22 04:11:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63069 1 webkit.review.bot webkit.review.bot pfeldman oldest_to_newest 425130 0 webkit.review.bot 2011-06-22 04:06:38 -0700 http://trac.webkit.org/changeset/89368 broke the build: It made http/tests/inspector/extensions-resources-redirect.html crash (Requested by Ossy on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 425131 1 98152 webkit.review.bot 2011-06-22 04:07:00 -0700 Created attachment 98152 ROLLOUT of r89368 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 425135 2 98152 webkit.review.bot 2011-06-22 04:11:01 -0700 Comment on attachment 98152 ROLLOUT of r89368 Clearing flags on attachment: 98152 Committed r89419: <http://trac.webkit.org/changeset/89419> 425136 3 webkit.review.bot 2011-06-22 04:11:05 -0700 All reviewed patches have been landed. Closing bug. 98152 2011-06-22 04:07:00 -0700 2011-06-22 04:11:01 -0700 ROLLOUT of r89368 bug-63128-20110622110658.patch text/plain 16837 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogODk0MTgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzMDFjMDU1ZjAzMWM2NWRk YTU0OGNlYWMwYTc1OWFiZWVmMzllYWJkLi4wZjJlYTBlZmQzM2NhYWRhNThiZTBkYzYxY2IxOWNh YTBjMmU0OTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDYtMjIgIFNoZXJp ZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHI4OTM2OC4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9j aGFuZ2VzZXQvODkzNjgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTYzMTI4CisKKyAgICAgICAgSXQgbWFkZSBodHRwL3Rlc3RzL2luc3BlY3Rvci9leHRl bnNpb25zLXJlc291cmNlcy0KKyAgICAgICAgcmVkaXJlY3QuaHRtbCBjcmFzaCAoUmVxdWVzdGVk IGJ5IE9zc3kgb24gI3dlYmtpdCkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpz b246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OmNhY2hlZFJlc291cmNlQ29udGVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OnJlc291cmNlQ29udGVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OmdldFJlc291cmNlQ29udGVudCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OnNlYXJjaEluUmVzb3VyY2Vz KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50Lmg6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6Z2V0UmVzb3VyY2VDb250ZW50KToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JTdHlsZVNoZWV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclN0eWxl U2hlZXQ6OnJlc291cmNlU3R5bGVTaGVldFRleHQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya01h bmFnZXIucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3Rv dHlwZS5faW5uZXJSZXF1ZXN0Q29udGVudC5vblJlc291cmNlQ29udGVudCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLl9pbm5lclJlcXVlc3RDb250ZW50KToKKwog MjAxMS0wNi0xNyAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDAzODI0OTI2N2YzZjkxYWEwMTNjY2NmODRiNTgyYjRj YzM2YmI4OGEuLmY2YzJkZmJmOGE0ZTg1Yjg5NThjMDNiNDBlYjg1M2ZhYTM1ZTNlMmYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTE2MSwxMSArMTYxLDExIEBA CiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlJldHVybnMgY29udGVudCBvZiB0aGUg Z2l2ZW4gcmVzb3VyY2UuIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJmcmFtZUlkIiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIkZyYW1lIGlkIHRvIGdldCByZXNvdXJjZSBmb3IuIiB9LAotICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlv biI6ICJVUkwgb2YgdGhlIHJlc291cmNlIHRvIGdldCBjb250ZW50IGZvci4iIH0KKyAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRp b24iOiAiVVJMIG9mIHRoZSByZXNvdXJjZSB0byBnZXQgY29udGVudCBmb3IuIiB9LAorICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImJhc2U2NEVuY29kZSIsICJ0eXBlIjogImJvb2xlYW4i LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdHMgdGhhdCByZXNvdXJj ZSBjb250ZW50IGlzIHNlcnZlZCBhcyBiYXNlNjQuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAg ICAgICAgICAgICAgICAicmV0dXJucyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJjb250ZW50IiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlJlc291cmNlIGNv bnRlbnQuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImJhc2U2NEVuY29kZWQi LCAidHlwZSI6ICJib29sZWFuIiwgImRlc2NyaXB0aW9uIjogIlRydWUsIGlmIGNvbnRlbnQgd2Fz IHNlcnZlZCBhcyBiYXNlNjQuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29u dGVudCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSZXNvdXJjZSBjb250ZW50 LiIgfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CkBA IC00OTAsMTEgKzQ5MCwxMSBAQAogICAgICAgICAgICAgICAgICJuYW1lIjogImdldFJlc291cmNl Q29udGVudCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlJldHVybnMgY29udGVu dCBvZiB0aGUgZ2l2ZW4gcmVzb3VyY2UuIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6 IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAi aW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSByZXNvdXJjZSB0byBn ZXQgY29udGVudCBmb3IuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWRlbnRp ZmllciIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiSWRlbnRpZmllciBvZiB0 aGUgcmVzb3VyY2UgdG8gZ2V0IGNvbnRlbnQgZm9yLiIgfSwKKyAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJiYXNlNjRFbmNvZGUiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3RzIHRoYXQgcmVzb3VyY2UgY29udGVudCBpcyBz ZXJ2ZWQgYXMgYmFzZTY0LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAg InJldHVybnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29udGVudCIsICJ0 eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSZXNvdXJjZSBjb250ZW50LiIgfSwKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJiYXNlNjRFbmNvZGVkIiwgInR5cGUiOiAiYm9v bGVhbiIsICJkZXNjcmlwdGlvbiI6ICJUcnVlLCBpZiBjb250ZW50IHdhcyBzZXJ2ZWQgYXMgYmFz ZTY0LiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNvbnRlbnQiLCAidHlwZSI6 ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVzb3VyY2UgY29udGVudC4iIH0KICAgICAgICAg ICAgICAgICBdCiAgICAgICAgICAgICB9CiAgICAgICAgIF0sCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCmluZGV4IDYzZTYxZTIyNzI4ZTFmNjU2 NmJkYWNkNmVjMTUwMzZiOGZkZDI2ZjEuLmVhMmU5NWVkNjUwMWJmOTE1OGM2MzZhNjE3YTEwZmJl ZmMzMzc2MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQ YWdlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdl QWdlbnQuY3BwCkBAIC0xMTAsMTcgKzExMCwxNCBAQCBzdGF0aWMgYm9vbCBwcmVwYXJlQ2FjaGVk UmVzb3VyY2VCdWZmZXIoQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlLCBib29sKiBoYQog ICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEluc3BlY3RvclBhZ2VBZ2VudDo6Y2FjaGVkUmVz b3VyY2VDb250ZW50KENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJjZSwgU3RyaW5nKiByZXN1 bHQsIGJvb2wqIGJhc2U2NEVuY29kZWQpCitib29sIEluc3BlY3RvclBhZ2VBZ2VudDo6Y2FjaGVk UmVzb3VyY2VDb250ZW50KENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJjZSwgYm9vbCB3aXRo QmFzZTY0RW5jb2RlLCBTdHJpbmcqIHJlc3VsdCkKIHsKLSAgICBSZXNvdXJjZVR5cGUgdHlwZSA9 IGNhY2hlZFJlc291cmNlVHlwZSgqY2FjaGVkUmVzb3VyY2UpOwotICAgICpiYXNlNjRFbmNvZGVk ID0gdHlwZSAhPSBTdHlsZXNoZWV0UmVzb3VyY2UgJiYgdHlwZSAhPSBTY3JpcHRSZXNvdXJjZTsK LQogICAgIGJvb2wgaGFzWmVyb1NpemU7CiAgICAgYm9vbCBwcmVwYXJlZCA9IHByZXBhcmVDYWNo ZWRSZXNvdXJjZUJ1ZmZlcihjYWNoZWRSZXNvdXJjZSwgJmhhc1plcm9TaXplKTsKICAgICBpZiAo IXByZXBhcmVkKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoKmJhc2U2NEVuY29k ZWQpIHsKKyAgICBpZiAod2l0aEJhc2U2NEVuY29kZSkgewogICAgICAgICBSZWZQdHI8U2hhcmVk QnVmZmVyPiBidWZmZXIgPSBoYXNaZXJvU2l6ZSA/IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKCkgOiBj YWNoZWRSZXNvdXJjZS0+ZGF0YSgpOwogCiAgICAgICAgIGlmICghYnVmZmVyKQpAQCAtMTc2LDcg KzE3Myw3IEBAIFBhc3NPd25QdHI8SW5zcGVjdG9yUGFnZUFnZW50PiBJbnNwZWN0b3JQYWdlQWdl bnQ6OmNyZWF0ZShJbnN0cnVtZW50aW5nQWdlbnRzKiBpCiB9CiAKIC8vIHN0YXRpYwotdm9pZCBJ bnNwZWN0b3JQYWdlQWdlbnQ6OnJlc291cmNlQ29udGVudChFcnJvclN0cmluZyogZXJyb3JTdHJp bmcsIEZyYW1lKiBmcmFtZSwgY29uc3QgS1VSTCYgdXJsLCBTdHJpbmcqIHJlc3VsdCwgYm9vbCog YmFzZTY0RW5jb2RlZCkKK3ZvaWQgSW5zcGVjdG9yUGFnZUFnZW50OjpyZXNvdXJjZUNvbnRlbnQo RXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCwg Ym9vbCBiYXNlNjRFbmNvZGUsIFN0cmluZyogcmVzdWx0KQogewogICAgIGlmICghZnJhbWUpIHsK ICAgICAgICAgKmVycm9yU3RyaW5nID0gIk5vIGZyYW1lIHRvIGdldCByZXNvdXJjZSBjb250ZW50 IGZvciI7CkBAIC0xOTMsMTMgKzE5MCwxMCBAQCB2b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6cmVz b3VyY2VDb250ZW50KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgRnJhbWUqIGZyYW1lLAogCiAg ICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyOwogICAgIGJvb2wgc3VjY2VzcyA9IGZhbHNl OwotICAgIGlmIChlcXVhbElnbm9yaW5nRnJhZ21lbnRJZGVudGlmaWVyKHVybCwgbG9hZGVyLT51 cmwoKSkpIHsKLSAgICAgICAgKmJhc2U2NEVuY29kZWQgPSBmYWxzZTsKLSAgICAgICAgc3VjY2Vz cyA9IG1haW5SZXNvdXJjZUNvbnRlbnQoZnJhbWUsICpiYXNlNjRFbmNvZGVkLCByZXN1bHQpOwot ICAgIH0KLQorICAgIGlmIChlcXVhbElnbm9yaW5nRnJhZ21lbnRJZGVudGlmaWVyKHVybCwgbG9h ZGVyLT51cmwoKSkpCisgICAgICAgIHN1Y2Nlc3MgPSBtYWluUmVzb3VyY2VDb250ZW50KGZyYW1l LCBiYXNlNjRFbmNvZGUsIHJlc3VsdCk7CiAgICAgaWYgKCFzdWNjZXNzKQotICAgICAgICBzdWNj ZXNzID0gY2FjaGVkUmVzb3VyY2VDb250ZW50KGNhY2hlZFJlc291cmNlKGZyYW1lLCB1cmwpLCBy ZXN1bHQsIGJhc2U2NEVuY29kZWQpOworICAgICAgICBzdWNjZXNzID0gY2FjaGVkUmVzb3VyY2VD b250ZW50KGNhY2hlZFJlc291cmNlKGZyYW1lLCB1cmwpLCBiYXNlNjRFbmNvZGUsIHJlc3VsdCk7 CiAKICAgICBpZiAoIXN1Y2Nlc3MpCiAgICAgICAgICplcnJvclN0cmluZyA9ICJObyByZXNvdXJj ZSB3aXRoIGdpdmVuIFVSTCBmb3VuZCI7CkBAIC00MjAsMTQgKzQxNCwxNSBAQCB2b2lkIEluc3Bl Y3RvclBhZ2VBZ2VudDo6Z2V0UmVzb3VyY2VUcmVlKEVycm9yU3RyaW5nKiwgUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4qCiAgICAgKm9iamVjdCA9IGJ1aWxkT2JqZWN0Rm9yRnJhbWVUcmVlKG1fcGFn ZS0+bWFpbkZyYW1lKCkpOwogfQogCi12b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6Z2V0UmVzb3Vy Y2VDb250ZW50KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBmcmFtZUlk LCBjb25zdCBTdHJpbmcmIHVybCwgU3RyaW5nKiBjb250ZW50LCBib29sKiBiYXNlNjRFbmNvZGVk KQordm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmdldFJlc291cmNlQ29udGVudChFcnJvclN0cmlu ZyogZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYgZnJhbWVJZCwgY29uc3QgU3RyaW5nJiB1cmws IGNvbnN0IGJvb2wqIGNvbnN0IG9wdGlvbmFsQmFzZTY0RW5jb2RlLCBTdHJpbmcqIGNvbnRlbnQp CiB7CiAgICAgRnJhbWUqIGZyYW1lID0gZnJhbWVGb3JJZChmcmFtZUlkKTsKICAgICBpZiAoIWZy YW1lKSB7CiAgICAgICAgICplcnJvclN0cmluZyA9ICJObyBmcmFtZSBmb3IgZ2l2ZW4gaWQgZm91 bmQiOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIHJlc291cmNlQ29udGVudChlcnJvclN0 cmluZywgZnJhbWUsIEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1cmwpLCBjb250ZW50LCBiYXNlNjRF bmNvZGVkKTsKKyAgICBib29sIGJhc2U2NEVuY29kZSA9IG9wdGlvbmFsQmFzZTY0RW5jb2RlID8g Km9wdGlvbmFsQmFzZTY0RW5jb2RlIDogZmFsc2U7CisgICAgcmVzb3VyY2VDb250ZW50KGVycm9y U3RyaW5nLCBmcmFtZSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIGJhc2U2NEVuY29kZSwg Y29udGVudCk7CiB9CiAKIHN0YXRpYyBTdHJpbmcgY3JlYXRlU2VhcmNoUmVnZXhTb3VyY2UoY29u c3QgU3RyaW5nJiB0ZXh0KQpAQCAtNDgzLDE1ICs0NzgsMTMgQEAgdm9pZCBJbnNwZWN0b3JQYWdl QWdlbnQ6OnNlYXJjaEluUmVzb3VyY2VzKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB0ZXh0 LCBjb24KIAogICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5tYWluRnJhbWUoKTsgZnJh bWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJhdmVyc2VOZXh0KG1fcGFnZS0+bWFpbkZyYW1l KCkpKSB7CiAgICAgICAgIFN0cmluZyBjb250ZW50OwotICAgICAgICBib29sIGJhc2U2NEVuY29k ZWQ7CiAgICAgICAgIFZlY3RvcjxDYWNoZWRSZXNvdXJjZSo+IGFsbFJlc291cmNlcyA9IGNhY2hl ZFJlc291cmNlc0ZvckZyYW1lKGZyYW1lKTsKICAgICAgICAgZm9yIChWZWN0b3I8Q2FjaGVkUmVz b3VyY2UqPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBhbGxSZXNvdXJjZXMuYmVnaW4oKTsgaXQgIT0g YWxsUmVzb3VyY2VzLmVuZCgpOyArK2l0KSB7CiAgICAgICAgICAgICBDYWNoZWRSZXNvdXJjZSog Y2FjaGVkUmVzb3VyY2UgPSAqaXQ7CiAgICAgICAgICAgICBzd2l0Y2ggKEluc3BlY3RvclBhZ2VB Z2VudDo6Y2FjaGVkUmVzb3VyY2VUeXBlKCpjYWNoZWRSZXNvdXJjZSkpIHsKICAgICAgICAgICAg IGNhc2UgSW5zcGVjdG9yUGFnZUFnZW50OjpTdHlsZXNoZWV0UmVzb3VyY2U6CiAgICAgICAgICAg ICBjYXNlIEluc3BlY3RvclBhZ2VBZ2VudDo6U2NyaXB0UmVzb3VyY2U6Ci0gICAgICAgICAgICAg ICAgaWYgKGNhY2hlZFJlc291cmNlQ29udGVudChjYWNoZWRSZXNvdXJjZSwgJmNvbnRlbnQsICZi YXNlNjRFbmNvZGVkKSkgewotICAgICAgICAgICAgICAgICAgICBBU1NFUlQoIWJhc2U2NEVuY29k ZWQpOworICAgICAgICAgICAgICAgIGlmIChjYWNoZWRSZXNvdXJjZUNvbnRlbnQoY2FjaGVkUmVz b3VyY2UsIGZhbHNlLCAmY29udGVudCkpIHsKICAgICAgICAgICAgICAgICAgICAgaW50IG1hdGNo ZXNDb3VudCA9IGNvdW50UmVndWxhckV4cHJlc3Npb25NYXRjaGVzKHJlZ2V4LCBjb250ZW50KTsK ICAgICAgICAgICAgICAgICAgICAgaWYgKG1hdGNoZXNDb3VudCkKICAgICAgICAgICAgICAgICAg ICAgICAgIHJlc3VsdC0+cHVzaFZhbHVlKGJ1aWxkT2JqZWN0Rm9yU2VhcmNoTWF0Y2goZnJhbWVJ ZChmcmFtZSksIGNhY2hlZFJlc291cmNlLT51cmwoKSwgbWF0Y2hlc0NvdW50KSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmggYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmgKaW5kZXggNWE5MDUwYjYy ZTdhZWNjNGIxY2RlMjBhMjAwNmRjYWQ4ZmM0YWU2OS4uNjg5MTY0MzU1NTY5NGRjMzM1OTUxMDg5 MzMwYzYwNjhlMGNjYzBiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclBhZ2VBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JQYWdlQWdlbnQuaApAQCAtNzUsOSArNzUsOSBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgUGFz c093blB0cjxJbnNwZWN0b3JQYWdlQWdlbnQ+IGNyZWF0ZShJbnN0cnVtZW50aW5nQWdlbnRzKiwg UGFnZSosIEluamVjdGVkU2NyaXB0TWFuYWdlciopOwogCi0gICAgc3RhdGljIGJvb2wgY2FjaGVk UmVzb3VyY2VDb250ZW50KENhY2hlZFJlc291cmNlKiwgU3RyaW5nKiByZXN1bHQsIGJvb2wqIGJh c2U2NEVuY29kZWQpOworICAgIHN0YXRpYyBib29sIGNhY2hlZFJlc291cmNlQ29udGVudChDYWNo ZWRSZXNvdXJjZSosIGJvb2wgd2l0aEJhc2U2NEVuY29kZSwgU3RyaW5nKiByZXN1bHQpOwogICAg IHN0YXRpYyBib29sIHNoYXJlZEJ1ZmZlckNvbnRlbnQoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+ LCBjb25zdCBTdHJpbmcmIHRleHRFbmNvZGluZ05hbWUsIGJvb2wgd2l0aEJhc2U2NEVuY29kZSwg U3RyaW5nKiByZXN1bHQpOwotICAgIHN0YXRpYyB2b2lkIHJlc291cmNlQ29udGVudChFcnJvclN0 cmluZyosIEZyYW1lKiwgY29uc3QgS1VSTCYsIFN0cmluZyogcmVzdWx0LCBib29sKiBiYXNlNjRF bmNvZGVkKTsKKyAgICBzdGF0aWMgdm9pZCByZXNvdXJjZUNvbnRlbnQoRXJyb3JTdHJpbmcqLCBG cmFtZSosIGNvbnN0IEtVUkwmLCBib29sIGJhc2U2NEVuY29kZSwgU3RyaW5nKiByZXN1bHQpOwog CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiByZXNvdXJjZURhdGEoRnJhbWUq LCBjb25zdCBLVVJMJiwgU3RyaW5nKiB0ZXh0RW5jb2RpbmdOYW1lKTsKICAgICBzdGF0aWMgQ2Fj aGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlKEZyYW1lKiwgY29uc3QgS1VSTCYpOwpAQCAtOTMs NyArOTMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBnZXRDb29raWVzKEVycm9yU3RyaW5nKiwgUmVm UHRyPEluc3BlY3RvckFycmF5PiogY29va2llcywgV1RGOjpTdHJpbmcqIGNvb2tpZXNTdHJpbmcp OwogICAgIHZvaWQgZGVsZXRlQ29va2llKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBjb29r aWVOYW1lLCBjb25zdCBTdHJpbmcmIGRvbWFpbik7CiAgICAgdm9pZCBnZXRSZXNvdXJjZVRyZWUo RXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiopOwotICAgIHZvaWQgZ2V0UmVz b3VyY2VDb250ZW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBmcmFtZUlkLCBjb25zdCBT dHJpbmcmIHVybCwgU3RyaW5nKiBjb250ZW50LCBib29sKiBiYXNlNjRFbmNvZGVkKTsKKyAgICB2 b2lkIGdldFJlc291cmNlQ29udGVudChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgZnJhbWVJ ZCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IGJvb2wqIGNvbnN0IGJhc2U2NEVuY29kZSwgU3Ry aW5nKiBjb250ZW50KTsKICAgICB2b2lkIHNlYXJjaEluUmVzb3VyY2VzKEVycm9yU3RyaW5nKiwg Y29uc3QgU3RyaW5nJiwgY29uc3QgYm9vbCogY29uc3QgY2FzZVNlbnNpdGl2ZSwgY29uc3QgYm9v bCogY29uc3QgaXNSZWdleCwgUmVmUHRyPEluc3BlY3RvckFycmF5PiopOwogCiAgICAgLy8gSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCmluZGV4IDI5ZWMxNWE0MWVmNjhmMTRkZjVk OWMzYWQ4ZjE3NGJjMjJiYzQ1ODAuLmQ2MDhmNWMyNDMyODgzMDFmMzA2MTYzZjE3ZDIwNzM2N2Uz MWQ4YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNv dXJjZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVz b3VyY2VBZ2VudC5jcHAKQEAgLTQzNCw3ICs0MzQsNyBAQCB2b2lkIEluc3BlY3RvclJlc291cmNl QWdlbnQ6OmluaXRpYWxpemVCYWNrZ3JvdW5kQ29sbGVjdGlvbigpCiAgICAgbV9tb2NrRnJvbnRl bmQgPSBhZG9wdFB0cihuZXcgSW5zcGVjdG9yRnJvbnRlbmQ6Ok5ldHdvcmsobV9pbnNwZWN0b3JG cm9udGVuZFByb3h5LmdldCgpKSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6 Z2V0UmVzb3VyY2VDb250ZW50KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgdW5zaWduZWQgbG9u ZyBpZGVudGlmaWVyLCBTdHJpbmcqIGNvbnRlbnQsIGJvb2wqIGJhc2U2NEVuY29kZWQpCit2b2lk IEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmdldFJlc291cmNlQ29udGVudChFcnJvclN0cmluZyog ZXJyb3JTdHJpbmcsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgYm9vbCogY29uc3Qg b3B0aW9uYWxCYXNlNjRFbmNvZGUsIFN0cmluZyogY29udGVudCkKIHsKICAgICBOZXR3b3JrUmVz b3VyY2VzRGF0YTo6UmVzb3VyY2VEYXRhKiByZXNvdXJjZURhdGEgPSBtX3Jlc291cmNlc0RhdGEt PmRhdGEoaWRlbnRpZmllcik7CiAgICAgaWYgKCFyZXNvdXJjZURhdGEpIHsKQEAgLTQ0MiwyMCAr NDQyLDIwIEBAIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6Z2V0UmVzb3VyY2VDb250ZW50 KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgdW5zaWduCiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKKyAgICBib29sIGJhc2U2NEVuY29kZSA9IG9wdGlvbmFsQmFzZTY0RW5jb2RlID8gKm9wdGlv bmFsQmFzZTY0RW5jb2RlIDogZmFsc2U7CisKICAgICBpZiAocmVzb3VyY2VEYXRhLT5oYXNDb250 ZW50KCkpIHsKLSAgICAgICAgKmJhc2U2NEVuY29kZWQgPSBmYWxzZTsKICAgICAgICAgKmNvbnRl bnQgPSByZXNvdXJjZURhdGEtPmNvbnRlbnQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAog ICAgIGlmIChyZXNvdXJjZURhdGEtPmJ1ZmZlcigpICYmICFyZXNvdXJjZURhdGEtPnRleHRFbmNv ZGluZ05hbWUoKS5pc051bGwoKSkgewotICAgICAgICAqYmFzZTY0RW5jb2RlZCA9IGZhbHNlOwot ICAgICAgICBpZiAoSW5zcGVjdG9yUGFnZUFnZW50OjpzaGFyZWRCdWZmZXJDb250ZW50KHJlc291 cmNlRGF0YS0+YnVmZmVyKCksIHJlc291cmNlRGF0YS0+dGV4dEVuY29kaW5nTmFtZSgpLCAqYmFz ZTY0RW5jb2RlZCwgY29udGVudCkpCisgICAgICAgIGlmIChJbnNwZWN0b3JQYWdlQWdlbnQ6OnNo YXJlZEJ1ZmZlckNvbnRlbnQocmVzb3VyY2VEYXRhLT5idWZmZXIoKSwgcmVzb3VyY2VEYXRhLT50 ZXh0RW5jb2RpbmdOYW1lKCksIGJhc2U2NEVuY29kZSwgY29udGVudCkpCiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgfQogCiAgICAgaWYgKHJlc291cmNlRGF0YS0+Y2FjaGVkUmVzb3VyY2UoKSkg ewotICAgICAgICBpZiAoSW5zcGVjdG9yUGFnZUFnZW50OjpjYWNoZWRSZXNvdXJjZUNvbnRlbnQo cmVzb3VyY2VEYXRhLT5jYWNoZWRSZXNvdXJjZSgpLCBjb250ZW50LCBiYXNlNjRFbmNvZGVkKSkK KyAgICAgICAgaWYgKEluc3BlY3RvclBhZ2VBZ2VudDo6Y2FjaGVkUmVzb3VyY2VDb250ZW50KHJl c291cmNlRGF0YS0+Y2FjaGVkUmVzb3VyY2UoKSwgYmFzZTY0RW5jb2RlLCBjb250ZW50KSkKICAg ICAgICAgICAgIHJldHVybjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oCmluZGV4IGI0NDEwYjM3NWNhZjFkMmU2ZmE2MmVm ZTk5NGNhZWJiOWNlMTkxMTYuLjg2YzBjMjM1N2JiODZiYTM1NzdlNWFkZDBiZWQ1Mzc2YTcwNjlj ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJj ZUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNl QWdlbnQuaApAQCAtMTE4LDcgKzExOCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc2FibGUoRXJy b3JTdHJpbmcqKTsKICAgICB2b2lkIHNldFVzZXJBZ2VudE92ZXJyaWRlKEVycm9yU3RyaW5nKiwg Y29uc3QgU3RyaW5nJiB1c2VyQWdlbnQpOwogICAgIHZvaWQgc2V0RXh0cmFIZWFkZXJzKEVycm9y U3RyaW5nKiwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KTsKLSAgICB2b2lkIGdldFJlc291 cmNlQ29udGVudChFcnJvclN0cmluZyosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgU3RyaW5n KiBjb250ZW50LCBib29sKiBiYXNlNjRFbmNvZGVkKTsKKyAgICB2b2lkIGdldFJlc291cmNlQ29u dGVudChFcnJvclN0cmluZyosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgYm9vbCog Y29uc3QgYmFzZTY0RW5jb2RlLCBTdHJpbmcqIGNvbnRlbnQpOwogICAgIHZvaWQgY2xlYXJDYWNo ZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyogY29uc3Qgb3B0aW9uYWxQcmVzZXJ2ZWRMb2Fk ZXJJZCk7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yU3R5bGVTaGVldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yU3R5bGVTaGVldC5jcHAKaW5kZXggYTM0NWI1M2I4MzgxN2U4YTE1MTQzOGUxZmJjMzU1ZmQx YjFjMjE2YS4uYWI2YmE0OGVjMDI4MTBmMzRiZjBmZGE1MDNmNjc4OGJiYWJmNGE1OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcApAQCAt MTA2OSw5ICsxMDY5LDggQEAgYm9vbCBJbnNwZWN0b3JTdHlsZVNoZWV0OjpyZXNvdXJjZVN0eWxl U2hlZXRUZXh0KFN0cmluZyogcmVzdWx0KSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICBTdHJpbmcgZXJyb3I7Ci0gICAgYm9vbCBiYXNlNjRFbmNvZGVkOwotICAgIEluc3BlY3Rv clBhZ2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KCZlcnJvciwgb3duZXJEb2N1bWVudCgpLT5mcmFt ZSgpLCBtX3BhZ2VTdHlsZVNoZWV0LT5maW5hbFVSTCgpLCByZXN1bHQsICZiYXNlNjRFbmNvZGVk KTsKLSAgICByZXR1cm4gZXJyb3IuaXNFbXB0eSgpICYmICFiYXNlNjRFbmNvZGVkOworICAgIElu c3BlY3RvclBhZ2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KCZlcnJvciwgb3duZXJEb2N1bWVudCgp LT5mcmFtZSgpLCBtX3BhZ2VTdHlsZVNoZWV0LT5maW5hbFVSTCgpLCBmYWxzZSwgcmVzdWx0KTsK KyAgICByZXR1cm4gZXJyb3IuaXNFbXB0eSgpOwogfQogCiBib29sIEluc3BlY3RvclN0eWxlU2hl ZXQ6OmlubGluZVN0eWxlU2hlZXRUZXh0KFN0cmluZyogcmVzdWx0KSBjb25zdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKaW5k ZXggMzg5ZGMxYjEyNDgxMzFjYjM1YzdhNTYwNGY0YTJlMmMzYzNhMzE3ZC4uOWQyYmE1YTZkNDVl ZTNhNjdmMmI5ODQwOGU3NWY2MzIwMTlhMjkzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCkBAIC00MiwxOCArNDIsMTgg QEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMgPSB7CiB9CiAKIFdlYklu c3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUgPSB7Ci0gICAgcmVxdWVzdENvbnRlbnQ6 IGZ1bmN0aW9uKHJlc291cmNlLCBjYWxsYmFjaykKKyAgICByZXF1ZXN0Q29udGVudDogZnVuY3Rp b24ocmVzb3VyY2UsIGJhc2U2NEVuY29kZSwgY2FsbGJhY2spCiAgICAgewotICAgICAgICBmdW5j dGlvbiBjYWxsYmFja1dyYXBwZXIoZXJyb3IsIGNvbnRlbnQsIGNvbnRlbnRFbmNvZGVkKQorICAg ICAgICBmdW5jdGlvbiBjYWxsYmFja1dyYXBwZXIoZXJyb3IsIGNvbnRlbnQpCiAgICAgICAgIHsK LSAgICAgICAgICAgIGNhbGxiYWNrKCFlcnJvciA/IGNvbnRlbnQgOiBudWxsLCBjb250ZW50RW5j b2RlZCk7CisgICAgICAgICAgICBjYWxsYmFjayghZXJyb3IgPyBjb250ZW50IDogbnVsbCk7CiAg ICAgICAgIH0KICAgICAgICAgLy8gRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02MTM2MyBXZSBzaG91bGQgc2VwYXJhdGUgTmV0d29ya1Jlc291cmNlIChOZXR3 b3JrUGFuZWwgcmVzb3VyY2UpIAogICAgICAgICAvLyBmcm9tIFJlc291cmNlUmV2aXNpb24gKFJl c291cmNlc1BhbmVsL1NjcmlwdHNQYW5lbCByZXNvdXJjZSkgYW5kIHJlcXVlc3QgY29udGVudCBh Y2NvcmRpbmdseS4KICAgICAgICAgaWYgKHJlc291cmNlLmlkZW50aWZpZXIpCi0gICAgICAgICAg ICBOZXR3b3JrQWdlbnQuZ2V0UmVzb3VyY2VDb250ZW50KHJlc291cmNlLmlkZW50aWZpZXIsIGNh bGxiYWNrV3JhcHBlcik7CisgICAgICAgICAgICBOZXR3b3JrQWdlbnQuZ2V0UmVzb3VyY2VDb250 ZW50KHJlc291cmNlLmlkZW50aWZpZXIsIGJhc2U2NEVuY29kZSwgY2FsbGJhY2tXcmFwcGVyKTsK ICAgICAgICAgZWxzZQotICAgICAgICAgICAgUGFnZUFnZW50LmdldFJlc291cmNlQ29udGVudChy ZXNvdXJjZS5mcmFtZUlkLCByZXNvdXJjZS51cmwsIGNhbGxiYWNrV3JhcHBlcik7CisgICAgICAg ICAgICBQYWdlQWdlbnQuZ2V0UmVzb3VyY2VDb250ZW50KHJlc291cmNlLmZyYW1lSWQsIHJlc291 cmNlLnVybCwgYmFzZTY0RW5jb2RlLCBjYWxsYmFja1dyYXBwZXIpOwogICAgIH0sCiAKICAgICBp bmZsaWdodFJlc291cmNlRm9yVVJMOiBmdW5jdGlvbih1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwppbmRleCAxMGJhMjc3NmNlYjg5MjZiZmFi ZjdlYjg1MGYwZWJhYWQxOTNkZDgxLi43ZjEyY2NhZDVhMWE0NzNjZGU3ODE4NDM0NzJkNGVhOTQ4 NjZjZjhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2UuanMKQEAgLTkxMiwxMCArOTEyLDEwIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl9jb250ZW50UmVxdWVzdGVkKQogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB0aGlzLl9jb250ZW50UmVxdWVzdGVkID0gdHJ1ZTsKKyAgICAgICAg dGhpcy5fY29udGVudEVuY29kZWQgPSAhV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuaXNUZXh0 VHlwZSh0aGlzLnR5cGUpOwogCi0gICAgICAgIGZ1bmN0aW9uIG9uUmVzb3VyY2VDb250ZW50KGRh dGEsIGNvbnRlbnRFbmNvZGVkKQorICAgICAgICBmdW5jdGlvbiBvblJlc291cmNlQ29udGVudChk YXRhKQogICAgICAgICB7Ci0gICAgICAgICAgICB0aGlzLl9jb250ZW50RW5jb2RlZCA9IGNvbnRl bnRFbmNvZGVkOwogICAgICAgICAgICAgdGhpcy5fY29udGVudCA9IGRhdGE7CiAgICAgICAgICAg ICB0aGlzLl9vcmlnaW5hbENvbnRlbnQgPSBkYXRhOwogICAgICAgICAgICAgdmFyIGNhbGxiYWNr cyA9IHRoaXMuX3BlbmRpbmdDb250ZW50Q2FsbGJhY2tzLnNsaWNlKCk7CkBAIC05MjQsNyArOTI0 LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRo aXMuX3BlbmRpbmdDb250ZW50Q2FsbGJhY2tzLmxlbmd0aCA9IDA7CiAgICAgICAgICAgICBkZWxl dGUgdGhpcy5fY29udGVudFJlcXVlc3RlZDsKICAgICAgICAgfQotICAgICAgICBXZWJJbnNwZWN0 b3IubmV0d29ya01hbmFnZXIucmVxdWVzdENvbnRlbnQodGhpcywgb25SZXNvdXJjZUNvbnRlbnQu YmluZCh0aGlzKSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5uZXR3b3JrTWFuYWdlci5yZXF1ZXN0 Q29udGVudCh0aGlzLCB0aGlzLl9jb250ZW50RW5jb2RlZCwgb25SZXNvdXJjZUNvbnRlbnQuYmlu ZCh0aGlzKSk7CiAgICAgfQogfQogCg==