102739 2012-11-19 16:36:24 -0800 V8: EmptyScriptState passed to functions marked with CallWith=ScriptState 2012-11-20 15:51:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 102552 0 michael webkit-unassigned abarth alecflett dglazkov haraken japhet jsbell webkit.review.bot oldest_to_newest 771180 0 michael 2012-11-19 16:36:24 -0800 Adding CallWith=ScriptState to a function causes the V8 binding generator to invoke the function with an EmptyScriptState rather than with ScriptState::current(). Since the EmptyScriptState has a null v8::Context, any clients which depend upon a valid v8::Context will fail. 771371 1 175112 michael 2012-11-19 18:41:49 -0800 Created attachment 175112 Patch This change causes CodeGeneratorV8.pm to pass ScriptState::current() rather than an EmptyScriptState to functions marked with CallWith=ScriptState. With this patch I was able to update IndexedDB to use the ScriptState provided by the binding generator for serialization. 771372 2 175112 abarth 2012-11-19 18:42:56 -0800 Comment on attachment 175112 Patch Great. Do you want to prepare a proper patch for review (e.g., with a ChangeLog) 771379 3 175112 haraken 2012-11-19 18:49:36 -0800 Comment on attachment 175112 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175112&action=review The change makes sense. > Source/WebCore/bindings/scripts/CodeGeneratorV8.pm:3529 > - my @callWithArgs = GenerateCallWith($callWith, \@callWithOutput, $indent, 0, 1, $function); > + my @callWithArgs = GenerateCallWith($callWith, \@callWithOutput, $indent, 0, 0, $function); I think that now no one uses 1. Maybe you can kill the $emptyContext argument from GenerateCallWith(). 771380 4 175112 haraken 2012-11-19 18:50:05 -0800 Comment on attachment 175112 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175112&action=review > Source/WebCore/bindings/scripts/CodeGeneratorV8.pm:1633 > } else { Then you can remove this if-else branch. 771397 5 175115 michael 2012-11-19 19:17:05 -0800 Created attachment 175115 Patch 771398 6 175115 haraken 2012-11-19 19:18:53 -0800 Comment on attachment 175115 Patch LGTM. If you set r?, I can r+ it. 771401 7 michael 2012-11-19 19:22:20 -0800 Do you know if there is a reason why EmptyScriptState was used in the past in preference to ScriptState::current()? 771403 8 haraken 2012-11-19 19:23:53 -0800 (In reply to comment #7) > Do you know if there is a reason why EmptyScriptState was used in the past in preference to ScriptState::current()? Don't know. Would you git blame its history and cc folks? 771428 9 michael 2012-11-19 20:10:39 -0800 Passing EmptyScriptState to functions marked with CallWith=ScriptState seems to have been introduced to CodeGeneratorV8.pm in revision 58298 on 2010-04-27 by Adam Barth. There was no previous use of either EmptyScriptState or ScriptState::current(). 771579 10 abarth 2012-11-19 23:38:44 -0800 I have no idea why I used EmptyScriptState. 771580 11 haraken 2012-11-19 23:39:17 -0800 Either way I think this change looks reasonable. 771593 12 175158 michael 2012-11-19 23:43:46 -0800 Created attachment 175158 Patch I have updated the ChangeLog to note that this patch has been reviewed by Kentaro Hara. 771595 13 175158 haraken 2012-11-19 23:44:48 -0800 Comment on attachment 175158 Patch From next time, instead of writing my name to the ChangeLog, please set r?. Then a reviewer can set r+ or r-. 771598 14 175158 haraken 2012-11-19 23:45:30 -0800 Comment on attachment 175158 Patch And if you want to commit it, please set cq?. (You can find these forms at the right bottom of https://bugs.webkit.org/attachment.cgi?id=175158&action=review) 771645 15 175158 webkit.review.bot 2012-11-20 00:37:56 -0800 Comment on attachment 175158 Patch Attachment 175158 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14912534 New failing tests: traversal/exception-forwarding.html 772007 16 175245 michael 2012-11-20 10:50:47 -0800 Created attachment 175245 Patch Previously any exception thrown while in EmptyScriptState was cleared when EmptyScriptState went out of scope. I've updated the patch to explicitly clear an exception before throwing it. 772078 17 175245 webkit.review.bot 2012-11-20 12:13:44 -0800 Comment on attachment 175245 Patch Attachment 175245 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14894690 New failing tests: fast/dom/shadow/shadow-dom-event-dispatching.html 772221 18 175245 haraken 2012-11-20 15:34:19 -0800 Comment on attachment 175245 Patch It looks like the failure is not related to the patch. Let's try again. 772240 19 175245 webkit.review.bot 2012-11-20 15:51:39 -0800 Comment on attachment 175245 Patch Clearing flags on attachment: 175245 Committed r135325: <http://trac.webkit.org/changeset/135325> 772241 20 webkit.review.bot 2012-11-20 15:51:44 -0800 All reviewed patches have been landed. Closing bug. 175112 2012-11-19 18:41:49 -0800 2012-11-19 19:17:05 -0800 Patch CodeGeneratorV8-ScriptState.patch text/plain 1623 michael ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv clY4LnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgu cG0KaW5kZXggYTFmODc3OC4uZjQ2M2NhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KQEAgLTE2MzEsMTAgKzE2MzEsMTEgQEAg c3ViIEdlbmVyYXRlQ2FsbFdpdGgKICAgICAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgJGlu ZGVudCAuICJFbXB0eVNjcmlwdFN0YXRlIHN0YXRlO1xuIik7CiAgICAgICAgICAgICBwdXNoKEBj YWxsV2l0aEFyZ3MsICImc3RhdGUiKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHB1 c2goQCRvdXRwdXRBcnJheSwgJGluZGVudCAuICJTY3JpcHRTdGF0ZSogc3RhdGUgPSBTY3JpcHRT dGF0ZTo6Y3VycmVudCgpO1xuIik7Ci0gICAgICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICRp bmRlbnQgLiAiaWYgKCFzdGF0ZSlcbiIpOworICAgICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5 LCAkaW5kZW50IC4gIlNjcmlwdFN0YXRlKiBjdXJyZW50U3RhdGUgPSBTY3JpcHRTdGF0ZTo6Y3Vy cmVudCgpO1xuIik7CisgICAgICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICRpbmRlbnQgLiAi aWYgKCFjdXJyZW50U3RhdGUpXG4iKTsKICAgICAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwg JGluZGVudCAuICIgICAgcmV0dXJuIiAuICgkcmV0dXJuVm9pZCA/ICIiIDogIiB2OFVuZGVmaW5l ZCgpIikgLiAiO1xuIik7Ci0gICAgICAgICAgICBwdXNoKEBjYWxsV2l0aEFyZ3MsICJzdGF0ZSIp OworICAgICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAkaW5kZW50IC4gIlNjcmlwdFN0YXRl JiBzdGF0ZSA9ICpjdXJyZW50U3RhdGU7XG4iKTsKKyAgICAgICAgICAgIHB1c2goQGNhbGxXaXRo QXJncywgIiZzdGF0ZSIpOwogICAgICAgICB9CiAgICAgfQogICAgIGlmICgkY29kZUdlbmVyYXRv ci0+RXh0ZW5kZWRBdHRyaWJ1dGVDb250YWlucygkY2FsbFdpdGgsICJTY3JpcHRFeGVjdXRpb25D b250ZXh0IikpIHsKQEAgLTM1MjUsNyArMzUyNiw3IEBAIHN1YiBHZW5lcmF0ZUZ1bmN0aW9uQ2Fs bFN0cmluZygpCiAKICAgICBteSAkY2FsbFdpdGggPSAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0 ZW5kZWRBdHRyaWJ1dGVzLT57IkNhbGxXaXRoIn07CiAgICAgbXkgQGNhbGxXaXRoT3V0cHV0ID0g KCk7Ci0gICAgbXkgQGNhbGxXaXRoQXJncyA9IEdlbmVyYXRlQ2FsbFdpdGgoJGNhbGxXaXRoLCBc QGNhbGxXaXRoT3V0cHV0LCAkaW5kZW50LCAwLCAxLCAkZnVuY3Rpb24pOworICAgIG15IEBjYWxs V2l0aEFyZ3MgPSBHZW5lcmF0ZUNhbGxXaXRoKCRjYWxsV2l0aCwgXEBjYWxsV2l0aE91dHB1dCwg JGluZGVudCwgMCwgMCwgJGZ1bmN0aW9uKTsKICAgICAkcmVzdWx0IC49IGpvaW4oIiIsIEBjYWxs V2l0aE91dHB1dCk7CiAgICAgdW5zaGlmdChAYXJndW1lbnRzLCBAY2FsbFdpdGhBcmdzKTsKICAg ICAkaW5kZXggKz0gQGNhbGxXaXRoQXJnczsK 175115 2012-11-19 19:17:05 -0800 2012-11-19 23:43:46 -0800 Patch CodeGeneratorV8-ScriptState.patch text/plain 4600 michael RnJvbSA0MGRmNmFkMTM2MTQ4MTZjODE2OGJmZDgwMmNlZTQ4ZjUzYmZhMTc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIFBydWV0dCA8bWljaGFlbEA2OGsub3JnPgpEYXRl OiBNb24sIDE5IE5vdiAyMDEyIDE4OjQ2OjQwIC0wODAwClN1YmplY3Q6IFtQQVRDSF0gUGFzcyBT Y3JpcHRTdGF0ZTo6Y3VycmVudCgpIHJhdGhlciB0aGFuIEVtcHR5U2NyaXB0U3RhdGUgdG8KIGZ1 bmN0aW9ucyBtYXJrZWQgd2l0aCBDYWxsV2l0aD1TY3JpcHRTdGF0ZQoKLS0tCiBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTggKysrKysrKysr KysrKysrKysKIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4 LnBtIHwgICAyMSArKysrKysrKy0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNl cnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg3YTk1MC4uM2NkZjll NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTE5ICBNaWNoYWVsIFBydWV0 dCAgPG1pY2hhZWxANjhrLm9yZz4KKworICAgICAgICBbVjhdIFBhc3MgU2NyaXB0U3RhdGU6OmN1 cnJlbnQoKSB0byBmdW5jdGlvbnMgbWFya2VkIHdpdGggQ2FsbFdpdGg9U2NyaXB0U3RhdGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjczOQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZpb3VzbHkg RW1wdHlTY3JpcHRTdGF0ZSByYXRoZXIgdGhhbiBTY3JpcHRTdGF0ZTo6Y3VycmVudCgpCisgICAg ICAgIHdhcyBwYXNzZWQgdG8gZnVuY3Rpb25zIG1hcmtlZCB3aXRoIFtDYWxsV2l0aD1TY3JpcHRT dGF0ZV0uCisgICAgICAgIFNpbmNlIHRoZSBFbXB0eVNjcmlwdFN0YXRlIGhhcyBhIG51bGwgdjg6 OkNvbnRleHQsIGFueSBmdW5jdGlvbnMKKyAgICAgICAgd2hpY2ggZGVwZW5kZWQgdXBvbiBhIHZh bGlkIHY4OjpDb250ZXh0IHdvdWxkIGZhaWwuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBDb3Zl cmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9yVjgucG06CisgICAgICAgIChHZW5lcmF0ZUNhbGxXaXRoKToKKyAgICAgICAgKEdl bmVyYXRlRnVuY3Rpb25DYWxsU3RyaW5nKToKKwogMjAxMi0xMS0xOSAgQWJoaXNoZWsgQXJ5YSAg PGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENyYXNoIGluIEFwcGx5U3R5bGVDb21t YW5kOjpjbGVhbnVwVW5zdHlsZWRBcHBsZVN0eWxlU3BhbnMuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbSBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCmluZGV4IGExZjg3NzguLjgx MGRmNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdl bmVyYXRvclY4LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdl bmVyYXRvclY4LnBtCkBAIC05ODMsNyArOTgzLDcgQEAgRU5ECiAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICAkZnVuY3Rpb25OYW1lID0gImltcC0+JHtmdW5jdGlvbk5hbWV9IjsKICAgICAg ICAgfQotICAgICAgICB1bnNoaWZ0KEBhcmd1bWVudHMsIEdlbmVyYXRlQ2FsbFdpdGgoJGF0dHJp YnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ2FsbFdpdGgifSwgXEBpbXBs Q29udGVudERlY2xzLCAiICAgICIsIDAsIDApKTsKKyAgICAgICAgdW5zaGlmdChAYXJndW1lbnRz LCBHZW5lcmF0ZUNhbGxXaXRoKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1 dGVzLT57IkNhbGxXaXRoIn0sIFxAaW1wbENvbnRlbnREZWNscywgIiAgICAiLCAwKSk7CiAgICAg ICAgICRnZXR0ZXJTdHJpbmcgPSAiJHtmdW5jdGlvbk5hbWV9KCIgLiBqb2luKCIsICIsIEBhcmd1 bWVudHMpIC4gIikiOwogICAgIH0gZWxzZSB7CiAgICAgICAgICRnZXR0ZXJTdHJpbmcgPSAiaW1w SW5zdGFuY2UiOwpAQCAtMTMwMCw3ICsxMzAwLDcgQEAgRU5ECiAgICAgICAgICAgICB9IGVsc2Ug ewogICAgICAgICAgICAgICAgICRmdW5jdGlvbk5hbWUgPSAiaW1wLT4ke2Z1bmN0aW9uTmFtZX0i OwogICAgICAgICAgICAgfQotICAgICAgICAgICAgdW5zaGlmdChAYXJndW1lbnRzLCBHZW5lcmF0 ZUNhbGxXaXRoKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNh bGxXaXRoIn0sIFxAaW1wbENvbnRlbnREZWNscywgIiAgICAiLCAxLCAwKSk7CisgICAgICAgICAg ICB1bnNoaWZ0KEBhcmd1bWVudHMsIEdlbmVyYXRlQ2FsbFdpdGgoJGF0dHJpYnV0ZS0+c2lnbmF0 dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ2FsbFdpdGgifSwgXEBpbXBsQ29udGVudERlY2xz LCAiICAgICIsIDEpKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAg JHtmdW5jdGlvbk5hbWV9KCIgLiBqb2luKCIsICIsIEBhcmd1bWVudHMpIC4gIik7XG4iKTsKICAg ICAgICAgfQogICAgIH0KQEAgLTE2MjIsMjAgKzE2MjIsMTUgQEAgc3ViIEdlbmVyYXRlQ2FsbFdp dGgKICAgICBteSAkb3V0cHV0QXJyYXkgPSBzaGlmdDsKICAgICBteSAkaW5kZW50ID0gc2hpZnQ7 CiAgICAgbXkgJHJldHVyblZvaWQgPSBzaGlmdDsKLSAgICBteSAkZW1wdHlDb250ZXh0ID0gc2hp ZnQ7CiAgICAgbXkgJGZ1bmN0aW9uID0gc2hpZnQ7CiAKICAgICBteSBAY2FsbFdpdGhBcmdzOwog ICAgIGlmICgkY29kZUdlbmVyYXRvci0+RXh0ZW5kZWRBdHRyaWJ1dGVDb250YWlucygkY2FsbFdp dGgsICJTY3JpcHRTdGF0ZSIpKSB7Ci0gICAgICAgIGlmICgkZW1wdHlDb250ZXh0KSB7Ci0gICAg ICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICRpbmRlbnQgLiAiRW1wdHlTY3JpcHRTdGF0ZSBz dGF0ZTtcbiIpOwotICAgICAgICAgICAgcHVzaChAY2FsbFdpdGhBcmdzLCAiJnN0YXRlIik7Ci0g ICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICRpbmRlbnQg LiAiU2NyaXB0U3RhdGUqIHN0YXRlID0gU2NyaXB0U3RhdGU6OmN1cnJlbnQoKTtcbiIpOwotICAg ICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAkaW5kZW50IC4gImlmICghc3RhdGUpXG4iKTsK LSAgICAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgJGluZGVudCAuICIgICAgcmV0dXJuIiAu ICgkcmV0dXJuVm9pZCA/ICIiIDogIiB2OFVuZGVmaW5lZCgpIikgLiAiO1xuIik7Ci0gICAgICAg ICAgICBwdXNoKEBjYWxsV2l0aEFyZ3MsICJzdGF0ZSIpOwotICAgICAgICB9CisgICAgICAgIHB1 c2goQCRvdXRwdXRBcnJheSwgJGluZGVudCAuICJTY3JpcHRTdGF0ZSogY3VycmVudFN0YXRlID0g U2NyaXB0U3RhdGU6OmN1cnJlbnQoKTtcbiIpOworICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXks ICRpbmRlbnQgLiAiaWYgKCFjdXJyZW50U3RhdGUpXG4iKTsKKyAgICAgICAgcHVzaChAJG91dHB1 dEFycmF5LCAkaW5kZW50IC4gIiAgICByZXR1cm4iIC4gKCRyZXR1cm5Wb2lkID8gIiIgOiAiIHY4 VW5kZWZpbmVkKCkiKSAuICI7XG4iKTsKKyAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAkaW5k ZW50IC4gIlNjcmlwdFN0YXRlJiBzdGF0ZSA9ICpjdXJyZW50U3RhdGU7XG4iKTsKKyAgICAgICAg cHVzaChAY2FsbFdpdGhBcmdzLCAiJnN0YXRlIik7CiAgICAgfQogICAgIGlmICgkY29kZUdlbmVy YXRvci0+RXh0ZW5kZWRBdHRyaWJ1dGVDb250YWlucygkY2FsbFdpdGgsICJTY3JpcHRFeGVjdXRp b25Db250ZXh0IikpIHsKICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAkaW5kZW50IC4gIlNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdENvbnRleHQgPSBnZXRTY3JpcHRFeGVjdXRpb25D b250ZXh0KCk7XG4iKTsKQEAgLTM1MjUsNyArMzUyMCw3IEBAIHN1YiBHZW5lcmF0ZUZ1bmN0aW9u Q2FsbFN0cmluZygpCiAKICAgICBteSAkY2FsbFdpdGggPSAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNhbGxXaXRoIn07CiAgICAgbXkgQGNhbGxXaXRoT3V0cHV0 ID0gKCk7Ci0gICAgbXkgQGNhbGxXaXRoQXJncyA9IEdlbmVyYXRlQ2FsbFdpdGgoJGNhbGxXaXRo LCBcQGNhbGxXaXRoT3V0cHV0LCAkaW5kZW50LCAwLCAxLCAkZnVuY3Rpb24pOworICAgIG15IEBj YWxsV2l0aEFyZ3MgPSBHZW5lcmF0ZUNhbGxXaXRoKCRjYWxsV2l0aCwgXEBjYWxsV2l0aE91dHB1 dCwgJGluZGVudCwgMCwgJGZ1bmN0aW9uKTsKICAgICAkcmVzdWx0IC49IGpvaW4oIiIsIEBjYWxs V2l0aE91dHB1dCk7CiAgICAgdW5zaGlmdChAYXJndW1lbnRzLCBAY2FsbFdpdGhBcmdzKTsKICAg ICAkaW5kZXggKz0gQGNhbGxXaXRoQXJnczsKLS0gCjEuNy45LjUKCg== 175158 2012-11-19 23:43:46 -0800 2012-11-20 10:50:47 -0800 Patch CodeGeneratorV8-ScriptState.patch text/plain 4593 michael RnJvbTogTWljaGFlbCBQcnVldHQgPG1pY2hhZWxANjhrLm9yZz4KRGF0ZTogTW9uLCAxOSBOb3Yg MjAxMiAxODo0Njo0MCAtMDgwMApTdWJqZWN0OiBQYXNzIFNjcmlwdFN0YXRlOjpjdXJyZW50KCkg cmF0aGVyIHRoYW4gRW1wdHlTY3JpcHRTdGF0ZSB0byBmdW5jdGlvbnMgbWFya2VkIHdpdGggQ2Fs bFdpdGg9U2NyaXB0U3RhdGUKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAg ICAgICAgICAgICAgICAgICAgfCAgIDIwICsrKysrKysrKysrKysrKysrKysKIFNvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtIHwgICAyMSArKysrKysrKy0t LS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggNTgxODkzNy4uODI4ZThkNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDIzIEBACisyMDEyLTExLTE5ICBNaWNoYWVsIFBydWV0dCAgPG1pY2hhZWxANjhrLm9yZz4K KworICAgICAgICBbVjhdIFBhc3MgU2NyaXB0U3RhdGU6OmN1cnJlbnQoKSB0byBmdW5jdGlvbnMg bWFya2VkIHdpdGggQ2FsbFdpdGg9U2NyaXB0U3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjczOQorCisgICAgICAgIFJldmlld2VkIGJ5IEtl bnRhcm8gSGFyYS4KKworICAgICAgICBQcmV2aW91c2x5IEVtcHR5U2NyaXB0U3RhdGUgcmF0aGVy IHRoYW4gU2NyaXB0U3RhdGU6OmN1cnJlbnQoKQorICAgICAgICB3YXMgcGFzc2VkIHRvIGZ1bmN0 aW9ucyBtYXJrZWQgd2l0aCBbQ2FsbFdpdGg9U2NyaXB0U3RhdGVdLgorICAgICAgICBTaW5jZSB0 aGUgRW1wdHlTY3JpcHRTdGF0ZSBoYXMgYSBudWxsIHY4OjpDb250ZXh0LCBhbnkgZnVuY3Rpb25z CisgICAgICAgIHdoaWNoIGRlcGVuZGVkIHVwb24gYSB2YWxpZCB2ODo6Q29udGV4dCB3b3VsZCBm YWlsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4K KworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtOgorICAgICAg ICAoR2VuZXJhdGVOb3JtYWxBdHRyR2V0dGVyKToKKyAgICAgICAgKEdlbmVyYXRlTm9ybWFsQXR0 clNldHRlcik6CisgICAgICAgIChHZW5lcmF0ZUNhbGxXaXRoKToKKyAgICAgICAgKEdlbmVyYXRl RnVuY3Rpb25DYWxsU3RyaW5nKToKKwogMjAxMi0xMS0xOSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1 cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggQ2hyb21pdW0gRGVi dWcgY29tcGlsYXRpb24gYWZ0ZXIgcjEzNTIzMC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KaW5kZXggN2U0NTNiZS4uMzU2MmQ4MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y VjgucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y VjgucG0KQEAgLTk4Miw3ICs5ODIsNyBAQCBFTkQKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAg ICAgICRmdW5jdGlvbk5hbWUgPSAiaW1wLT4ke2Z1bmN0aW9uTmFtZX0iOwogICAgICAgICB9Ci0g ICAgICAgIHVuc2hpZnQoQGFyZ3VtZW50cywgR2VuZXJhdGVDYWxsV2l0aCgkYXR0cmlidXRlLT5z aWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDYWxsV2l0aCJ9LCBcQGltcGxDb250ZW50 RGVjbHMsICIgICAgIiwgMCwgMCkpOworICAgICAgICB1bnNoaWZ0KEBhcmd1bWVudHMsIEdlbmVy YXRlQ2FsbFdpdGgoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsi Q2FsbFdpdGgifSwgXEBpbXBsQ29udGVudERlY2xzLCAiICAgICIsIDApKTsKICAgICAgICAgJGdl dHRlclN0cmluZyA9ICIke2Z1bmN0aW9uTmFtZX0oIiAuIGpvaW4oIiwgIiwgQGFyZ3VtZW50cykg LiAiKSI7CiAgICAgfSBlbHNlIHsKICAgICAgICAgJGdldHRlclN0cmluZyA9ICJpbXBJbnN0YW5j ZSI7CkBAIC0xMjk5LDcgKzEyOTksNyBAQCBFTkQKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICAgICAgJGZ1bmN0aW9uTmFtZSA9ICJpbXAtPiR7ZnVuY3Rpb25OYW1lfSI7CiAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICB1bnNoaWZ0KEBhcmd1bWVudHMsIEdlbmVyYXRlQ2FsbFdp dGgoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ2FsbFdpdGgi fSwgXEBpbXBsQ29udGVudERlY2xzLCAiICAgICIsIDEsIDApKTsKKyAgICAgICAgICAgIHVuc2hp ZnQoQGFyZ3VtZW50cywgR2VuZXJhdGVDYWxsV2l0aCgkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4 dGVuZGVkQXR0cmlidXRlcy0+eyJDYWxsV2l0aCJ9LCBcQGltcGxDb250ZW50RGVjbHMsICIgICAg IiwgMSkpOwogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICAke2Z1bmN0 aW9uTmFtZX0oIiAuIGpvaW4oIiwgIiwgQGFyZ3VtZW50cykgLiAiKTtcbiIpOwogICAgICAgICB9 CiAgICAgfQpAQCAtMTYyMSwyMCArMTYyMSwxNSBAQCBzdWIgR2VuZXJhdGVDYWxsV2l0aAogICAg IG15ICRvdXRwdXRBcnJheSA9IHNoaWZ0OwogICAgIG15ICRpbmRlbnQgPSBzaGlmdDsKICAgICBt eSAkcmV0dXJuVm9pZCA9IHNoaWZ0OwotICAgIG15ICRlbXB0eUNvbnRleHQgPSBzaGlmdDsKICAg ICBteSAkZnVuY3Rpb24gPSBzaGlmdDsKIAogICAgIG15IEBjYWxsV2l0aEFyZ3M7CiAgICAgaWYg KCRjb2RlR2VuZXJhdG9yLT5FeHRlbmRlZEF0dHJpYnV0ZUNvbnRhaW5zKCRjYWxsV2l0aCwgIlNj cmlwdFN0YXRlIikpIHsKLSAgICAgICAgaWYgKCRlbXB0eUNvbnRleHQpIHsKLSAgICAgICAgICAg IHB1c2goQCRvdXRwdXRBcnJheSwgJGluZGVudCAuICJFbXB0eVNjcmlwdFN0YXRlIHN0YXRlO1xu Iik7Ci0gICAgICAgICAgICBwdXNoKEBjYWxsV2l0aEFyZ3MsICImc3RhdGUiKTsKLSAgICAgICAg fSBlbHNlIHsKLSAgICAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgJGluZGVudCAuICJTY3Jp cHRTdGF0ZSogc3RhdGUgPSBTY3JpcHRTdGF0ZTo6Y3VycmVudCgpO1xuIik7Ci0gICAgICAgICAg ICBwdXNoKEAkb3V0cHV0QXJyYXksICRpbmRlbnQgLiAiaWYgKCFzdGF0ZSlcbiIpOwotICAgICAg ICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAkaW5kZW50IC4gIiAgICByZXR1cm4iIC4gKCRyZXR1 cm5Wb2lkID8gIiIgOiAiIHY4VW5kZWZpbmVkKCkiKSAuICI7XG4iKTsKLSAgICAgICAgICAgIHB1 c2goQGNhbGxXaXRoQXJncywgInN0YXRlIik7Ci0gICAgICAgIH0KKyAgICAgICAgcHVzaChAJG91 dHB1dEFycmF5LCAkaW5kZW50IC4gIlNjcmlwdFN0YXRlKiBjdXJyZW50U3RhdGUgPSBTY3JpcHRT dGF0ZTo6Y3VycmVudCgpO1xuIik7CisgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgJGluZGVu dCAuICJpZiAoIWN1cnJlbnRTdGF0ZSlcbiIpOworICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXks ICRpbmRlbnQgLiAiICAgIHJldHVybiIgLiAoJHJldHVyblZvaWQgPyAiIiA6ICIgdjhVbmRlZmlu ZWQoKSIpIC4gIjtcbiIpOworICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICRpbmRlbnQgLiAi U2NyaXB0U3RhdGUmIHN0YXRlID0gKmN1cnJlbnRTdGF0ZTtcbiIpOworICAgICAgICBwdXNoKEBj YWxsV2l0aEFyZ3MsICImc3RhdGUiKTsKICAgICB9CiAgICAgaWYgKCRjb2RlR2VuZXJhdG9yLT5F eHRlbmRlZEF0dHJpYnV0ZUNvbnRhaW5zKCRjYWxsV2l0aCwgIlNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQiKSkgewogICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICRpbmRlbnQgLiAiU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCogc2NyaXB0Q29udGV4dCA9IGdldFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQo KTtcbiIpOwpAQCAtMzUyNCw3ICszNTE5LDcgQEAgc3ViIEdlbmVyYXRlRnVuY3Rpb25DYWxsU3Ry aW5nKCkKIAogICAgIG15ICRjYWxsV2l0aCA9ICRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRl ZEF0dHJpYnV0ZXMtPnsiQ2FsbFdpdGgifTsKICAgICBteSBAY2FsbFdpdGhPdXRwdXQgPSAoKTsK LSAgICBteSBAY2FsbFdpdGhBcmdzID0gR2VuZXJhdGVDYWxsV2l0aCgkY2FsbFdpdGgsIFxAY2Fs bFdpdGhPdXRwdXQsICRpbmRlbnQsIDAsIDEsICRmdW5jdGlvbik7CisgICAgbXkgQGNhbGxXaXRo QXJncyA9IEdlbmVyYXRlQ2FsbFdpdGgoJGNhbGxXaXRoLCBcQGNhbGxXaXRoT3V0cHV0LCAkaW5k ZW50LCAwLCAkZnVuY3Rpb24pOwogICAgICRyZXN1bHQgLj0gam9pbigiIiwgQGNhbGxXaXRoT3V0 cHV0KTsKICAgICB1bnNoaWZ0KEBhcmd1bWVudHMsIEBjYWxsV2l0aEFyZ3MpOwogICAgICRpbmRl eCArPSBAY2FsbFdpdGhBcmdzOwotLSAKMS43LjkuNQoK 175245 2012-11-20 10:50:47 -0800 2012-11-20 15:51:39 -0800 Patch CodeGeneratorV8-ScriptState.patch text/plain 5882 michael RnJvbTogTWljaGFlbCBQcnVldHQgPG1pY2hhZWxANjhrLm9yZz4KRGF0ZTogVHVlLCAyMCBOb3Yg MjAxMiAxMDo0NTo0MCAtMDgwMApTdWJqZWN0OiBQYXNzIFNjcmlwdFN0YXRlOjpjdXJyZW50KCkg cmF0aGVyIHRoYW4gRW1wdHlTY3JpcHRTdGF0ZQogdG8gZnVuY3Rpb25zIG1hcmtlZCB3aXRoIENh bGxXaXRoPVNjcmlwdFN0YXRlCgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgICAgICAgIHwgICAyMiArKysrKysrKysrKysrKysKIFNvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtIHwgICAyOCArKysrKysrKystLS0t LS0tLS0tLQogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUuaCAgICAgICAg ICAgfCAgICAxICsKIDMgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDU4MTg5MzcuLjkwNTc3NGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxMi0xMS0yMCAgTWljaGFlbCBQcnVldHQgIDxtaWNoYWVsQDY4ay5vcmc+ CisKKyAgICAgICAgW1Y4XSBQYXNzIFNjcmlwdFN0YXRlOjpjdXJyZW50KCkgdG8gZnVuY3Rpb25z IG1hcmtlZCB3aXRoIENhbGxXaXRoPVNjcmlwdFN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI3MzkKKworICAgICAgICBSZXZpZXdlZCBieSBL ZW50YXJvIEhhcmEuCisKKyAgICAgICAgUHJldmlvdXNseSBFbXB0eVNjcmlwdFN0YXRlIHJhdGhl ciB0aGFuIFNjcmlwdFN0YXRlOjpjdXJyZW50KCkKKyAgICAgICAgd2FzIHBhc3NlZCB0byBmdW5j dGlvbnMgbWFya2VkIHdpdGggW0NhbGxXaXRoPVNjcmlwdFN0YXRlXS4KKyAgICAgICAgU2luY2Ug dGhlIEVtcHR5U2NyaXB0U3RhdGUgaGFzIGEgbnVsbCB2ODo6Q29udGV4dCwgYW55IGZ1bmN0aW9u cworICAgICAgICB3aGljaCBkZXBlbmRlZCB1cG9uIGEgdmFsaWQgdjg6OkNvbnRleHQgd291bGQg ZmFpbC4KKworICAgICAgICBObyBuZXcgdGVzdHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMu CisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbToKKyAgICAg ICAgKEdlbmVyYXRlTm9ybWFsQXR0ckdldHRlcik6CisgICAgICAgIChHZW5lcmF0ZU5vcm1hbEF0 dHJTZXR0ZXIpOgorICAgICAgICAoR2VuZXJhdGVDYWxsV2l0aCk6CisgICAgICAgIChHZW5lcmF0 ZUZ1bmN0aW9uQ2FsbFN0cmluZyk6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUu aDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdFN0YXRlOjpjbGVhckV4Y2VwdGlvbik6IEFkZGVk LgorCiAyMDEyLTExLTE5ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBDaHJvbWl1bSBEZWJ1ZyBjb21waWxhdGlvbiBhZnRl ciByMTM1MjMwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9D b2RlR2VuZXJhdG9yVjgucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JWOC5wbQppbmRleCA3ZTQ1M2JlLi5jMTBhNzcyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQpAQCAtOTgyLDcgKzk4 Miw3IEBAIEVORAogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgJGZ1bmN0aW9uTmFtZSA9 ICJpbXAtPiR7ZnVuY3Rpb25OYW1lfSI7CiAgICAgICAgIH0KLSAgICAgICAgdW5zaGlmdChAYXJn dW1lbnRzLCBHZW5lcmF0ZUNhbGxXaXRoKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57IkNhbGxXaXRoIn0sIFxAaW1wbENvbnRlbnREZWNscywgIiAgICAiLCAwLCAw KSk7CisgICAgICAgIHVuc2hpZnQoQGFyZ3VtZW50cywgR2VuZXJhdGVDYWxsV2l0aCgkYXR0cmli dXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDYWxsV2l0aCJ9LCBcQGltcGxD b250ZW50RGVjbHMsICIgICAgIiwgMCkpOwogICAgICAgICAkZ2V0dGVyU3RyaW5nID0gIiR7ZnVu Y3Rpb25OYW1lfSgiIC4gam9pbigiLCAiLCBAYXJndW1lbnRzKSAuICIpIjsKICAgICB9IGVsc2Ug ewogICAgICAgICAkZ2V0dGVyU3RyaW5nID0gImltcEluc3RhbmNlIjsKQEAgLTEyOTksNyArMTI5 OSw3IEBAIEVORAogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAkZnVuY3Rp b25OYW1lID0gImltcC0+JHtmdW5jdGlvbk5hbWV9IjsKICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIHVuc2hpZnQoQGFyZ3VtZW50cywgR2VuZXJhdGVDYWxsV2l0aCgkYXR0cmlidXRlLT5zaWdu YXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDYWxsV2l0aCJ9LCBcQGltcGxDb250ZW50RGVj bHMsICIgICAgIiwgMSwgMCkpOworICAgICAgICAgICAgdW5zaGlmdChAYXJndW1lbnRzLCBHZW5l cmF0ZUNhbGxXaXRoKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57 IkNhbGxXaXRoIn0sIFxAaW1wbENvbnRlbnREZWNscywgIiAgICAiLCAxKSk7CiAgICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgICR7ZnVuY3Rpb25OYW1lfSgiIC4gam9pbigi LCAiLCBAYXJndW1lbnRzKSAuICIpO1xuIik7CiAgICAgICAgIH0KICAgICB9CkBAIC0xNjIxLDIw ICsxNjIxLDE1IEBAIHN1YiBHZW5lcmF0ZUNhbGxXaXRoCiAgICAgbXkgJG91dHB1dEFycmF5ID0g c2hpZnQ7CiAgICAgbXkgJGluZGVudCA9IHNoaWZ0OwogICAgIG15ICRyZXR1cm5Wb2lkID0gc2hp ZnQ7Ci0gICAgbXkgJGVtcHR5Q29udGV4dCA9IHNoaWZ0OwogICAgIG15ICRmdW5jdGlvbiA9IHNo aWZ0OwogCiAgICAgbXkgQGNhbGxXaXRoQXJnczsKICAgICBpZiAoJGNvZGVHZW5lcmF0b3ItPkV4 dGVuZGVkQXR0cmlidXRlQ29udGFpbnMoJGNhbGxXaXRoLCAiU2NyaXB0U3RhdGUiKSkgewotICAg ICAgICBpZiAoJGVtcHR5Q29udGV4dCkgewotICAgICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5 LCAkaW5kZW50IC4gIkVtcHR5U2NyaXB0U3RhdGUgc3RhdGU7XG4iKTsKLSAgICAgICAgICAgIHB1 c2goQGNhbGxXaXRoQXJncywgIiZzdGF0ZSIpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgcHVzaChAJG91dHB1dEFycmF5LCAkaW5kZW50IC4gIlNjcmlwdFN0YXRlKiBzdGF0ZSA9IFNj cmlwdFN0YXRlOjpjdXJyZW50KCk7XG4iKTsKLSAgICAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJh eSwgJGluZGVudCAuICJpZiAoIXN0YXRlKVxuIik7Ci0gICAgICAgICAgICBwdXNoKEAkb3V0cHV0 QXJyYXksICRpbmRlbnQgLiAiICAgIHJldHVybiIgLiAoJHJldHVyblZvaWQgPyAiIiA6ICIgdjhV bmRlZmluZWQoKSIpIC4gIjtcbiIpOwotICAgICAgICAgICAgcHVzaChAY2FsbFdpdGhBcmdzLCAi c3RhdGUiKTsKLSAgICAgICAgfQorICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICRpbmRlbnQg LiAiU2NyaXB0U3RhdGUqIGN1cnJlbnRTdGF0ZSA9IFNjcmlwdFN0YXRlOjpjdXJyZW50KCk7XG4i KTsKKyAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAkaW5kZW50IC4gImlmICghY3VycmVudFN0 YXRlKVxuIik7CisgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgJGluZGVudCAuICIgICAgcmV0 dXJuIiAuICgkcmV0dXJuVm9pZCA/ICIiIDogIiB2OFVuZGVmaW5lZCgpIikgLiAiO1xuIik7Cisg ICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgJGluZGVudCAuICJTY3JpcHRTdGF0ZSYgc3RhdGUg PSAqY3VycmVudFN0YXRlO1xuIik7CisgICAgICAgIHB1c2goQGNhbGxXaXRoQXJncywgIiZzdGF0 ZSIpOwogICAgIH0KICAgICBpZiAoJGNvZGVHZW5lcmF0b3ItPkV4dGVuZGVkQXR0cmlidXRlQ29u dGFpbnMoJGNhbGxXaXRoLCAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dCIpKSB7CiAgICAgICAgIHB1 c2goQCRvdXRwdXRBcnJheSwgJGluZGVudCAuICJTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBzY3Jp cHRDb250ZXh0ID0gZ2V0U2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpO1xuIik7CkBAIC0zNTI0LDcg KzM1MTksNyBAQCBzdWIgR2VuZXJhdGVGdW5jdGlvbkNhbGxTdHJpbmcoKQogCiAgICAgbXkgJGNh bGxXaXRoID0gJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDYWxs V2l0aCJ9OwogICAgIG15IEBjYWxsV2l0aE91dHB1dCA9ICgpOwotICAgIG15IEBjYWxsV2l0aEFy Z3MgPSBHZW5lcmF0ZUNhbGxXaXRoKCRjYWxsV2l0aCwgXEBjYWxsV2l0aE91dHB1dCwgJGluZGVu dCwgMCwgMSwgJGZ1bmN0aW9uKTsKKyAgICBteSBAY2FsbFdpdGhBcmdzID0gR2VuZXJhdGVDYWxs V2l0aCgkY2FsbFdpdGgsIFxAY2FsbFdpdGhPdXRwdXQsICRpbmRlbnQsIDAsICRmdW5jdGlvbik7 CiAgICAgJHJlc3VsdCAuPSBqb2luKCIiLCBAY2FsbFdpdGhPdXRwdXQpOwogICAgIHVuc2hpZnQo QGFyZ3VtZW50cywgQGNhbGxXaXRoQXJncyk7CiAgICAgJGluZGV4ICs9IEBjYWxsV2l0aEFyZ3M7 CkBAIC0zNTgyLDggKzM1NzcsMTEgQEAgc3ViIEdlbmVyYXRlRnVuY3Rpb25DYWxsU3RyaW5nKCkK ICAgICB9CiAKICAgICBpZiAoJGNvZGVHZW5lcmF0b3ItPkV4dGVuZGVkQXR0cmlidXRlQ29udGFp bnMoJGNhbGxXaXRoLCAiU2NyaXB0U3RhdGUiKSkgewotICAgICAgICAkcmVzdWx0IC49ICRpbmRl bnQgLiAiaWYgKHN0YXRlLmhhZEV4Y2VwdGlvbigpKVxuIjsKLSAgICAgICAgJHJlc3VsdCAuPSAk aW5kZW50IC4gIiAgICByZXR1cm4gdGhyb3dFcnJvcihzdGF0ZS5leGNlcHRpb24oKSwgYXJncy5H ZXRJc29sYXRlKCkpO1xuIgorICAgICAgICAkcmVzdWx0IC49ICRpbmRlbnQgLiAiaWYgKHN0YXRl LmhhZEV4Y2VwdGlvbigpKSB7XG4iOworICAgICAgICAkcmVzdWx0IC49ICRpbmRlbnQgLiAiICAg IHY4OjpMb2NhbDx2ODo6VmFsdWU+IGV4Y2VwdGlvbiA9IHN0YXRlLmV4Y2VwdGlvbigpO1xuIjsK KyAgICAgICAgJHJlc3VsdCAuPSAkaW5kZW50IC4gIiAgICBzdGF0ZS5jbGVhckV4Y2VwdGlvbigp O1xuIjsKKyAgICAgICAgJHJlc3VsdCAuPSAkaW5kZW50IC4gIiAgICByZXR1cm4gdGhyb3dFcnJv cihleGNlcHRpb24sIGFyZ3MuR2V0SXNvbGF0ZSgpKTtcbiI7CisgICAgICAgICRyZXN1bHQgLj0g JGluZGVudCAuICJ9XG4iOwogICAgIH0KIAogICAgIGlmICgkaXNTVkdUZWFyT2ZmVHlwZSkgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUuaCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmgKaW5kZXggZjU5YWE4ZC4uOWRi ZjU1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTdGF0ZS5oCkBAIC01Niw2 ICs1Niw3IEBAIHB1YmxpYzoKICAgICAgICAgbV9leGNlcHRpb24gPSBleGNlcHRpb247CiAgICAg fQogICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IGV4Y2VwdGlvbigpIHsgcmV0dXJuIG1fZXhjZXB0 aW9uOyB9CisgICAgdm9pZCBjbGVhckV4Y2VwdGlvbigpIHsgbV9leGNlcHRpb24uQ2xlYXIoKTsg fQogCiAgICAgdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBjb250ZXh0KCkgY29uc3QKICAgICB7Ci0t IAoxLjcuOS41Cgo=