37263 2010-04-08 05:11:42 -0700 [v8] SerializedScriptValue fails to deserialize an Object that has prototype with properties 2010-04-08 08:10:45 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 yurys yurys pfeldman vitalyr yurys oldest_to_newest 210114 0 yurys 2010-04-08 05:11:42 -0700 SerializedScriptValue fails to deserialize an Object that has prototype with properties. Try to serialize and the deserialize object with the following constructor: InjectedScript.CallFrameProxy = function(id) { this.id = id; } InjectedScript.CallFrameProxy.prototype = { _wrapScopeChain: function(callFrame) {} } 210115 1 52853 yurys 2010-04-08 05:15:31 -0700 Created attachment 52853 proposed fix 210134 2 52857 yurys 2010-04-08 06:37:59 -0700 Created attachment 52857 patch 210144 3 52859 yurys 2010-04-08 06:44:45 -0700 Created attachment 52859 patch Moved ++m_numSerializedProperties; after property names serialization according to vitalyr feedback. 210163 4 yurys 2010-04-08 07:28:49 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/fast/dom/Window/window-postmessage-clone-expected.txt M LayoutTests/fast/dom/Window/window-postmessage-clone.html M WebCore/ChangeLog M WebCore/bindings/v8/SerializedScriptValue.cpp Committed r57276 210200 5 vitalyr 2010-04-08 08:10:45 -0700 (In reply to comment #4) > Committing to http://svn.webkit.org/repository/webkit/trunk ... > M LayoutTests/ChangeLog > M LayoutTests/fast/dom/Window/window-postmessage-clone-expected.txt > M LayoutTests/fast/dom/Window/window-postmessage-clone.html > M WebCore/ChangeLog > M WebCore/bindings/v8/SerializedScriptValue.cpp > Committed r57276 Thanks a lot for fixing this! 52853 2010-04-08 05:15:31 -0700 2010-04-08 06:37:59 -0700 proposed fix proposed-fix.patch text/plain 1244 yurys SW5kZXg6IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHANCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBTZXJpYWxp emVkU2NyaXB0VmFsdWUuY3BwCShyZXZpc2lvbiA1NzE2MCkNCisrKyBTZXJpYWxpemVkU2NyaXB0 VmFsdWUuY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtMzgzLDYgKzM4Myw3IEBADQogICAgICAgICAg ICAgOiBTdGF0ZTx2ODo6T2JqZWN0PihvYmplY3QsIG5leHQpCiAgICAgICAgICAgICAsIG1fcHJv cGVydHlOYW1lcyhvYmplY3QtPkdldFByb3BlcnR5TmFtZXMoKSkKICAgICAgICAgICAgICwgbV9p bmRleCgtMSkKKyAgICAgICAgICAgICwgbV9udW1TZXJpYWxpemVkUHJvcGVydGllcygwKQogICAg ICAgICAgICAgLCBtX25hbWVEb25lKGZhbHNlKQogICAgICAgICB7CiAgICAgICAgIH0KQEAgLTM5 OSw2ICs0MDAsNyBAQA0KICAgICAgICAgICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICB9CisJCQkJKyttX251bVNlcmlh bGl6ZWRQcm9wZXJ0aWVzOwogICAgICAgICAgICAgICAgIEFTU0VSVCghbV9wcm9wZXJ0eU5hbWUu SXNFbXB0eSgpKTsKICAgICAgICAgICAgICAgICBpZiAoIW1fbmFtZURvbmUpIHsKICAgICAgICAg ICAgICAgICAgICAgbV9uYW1lRG9uZSA9IHRydWU7CkBAIC00MTEsNyArNDEzLDcgQEANCiAgICAg ICAgICAgICAgICAgaWYgKFN0YXRlQmFzZSogbmV3U3RhdGUgPSBzZXJpYWxpemVyLmRvU2VyaWFs aXplKHZhbHVlLCB0aGlzKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG5ld1N0YXRlOwog ICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIG9iamVjdERvbmUobV9pbmRleCwgc2Vy aWFsaXplcik7CisgICAgICAgICAgICByZXR1cm4gb2JqZWN0RG9uZShtX251bVNlcmlhbGl6ZWRQ cm9wZXJ0aWVzLCBzZXJpYWxpemVyKTsKICAgICAgICAgfQogCiAgICAgcHJvdGVjdGVkOgpAQCAt NDIxLDYgKzQyMyw3IEBADQogICAgICAgICB2ODo6TG9jYWw8djg6OkFycmF5PiBtX3Byb3BlcnR5 TmFtZXM7CiAgICAgICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IG1fcHJvcGVydHlOYW1lOwogICAg ICAgICB1bnNpZ25lZCBtX2luZGV4OworICAgICAgICB1bnNpZ25lZCBtX251bVNlcmlhbGl6ZWRQ cm9wZXJ0aWVzOwogICAgICAgICBib29sIG1fbmFtZURvbmU7CiAgICAgfTsKIAo= 52857 2010-04-08 06:37:59 -0700 2010-04-08 06:44:45 -0700 patch serialized-script-value.patch text/plain 4410 yurys ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmYTkyMzJmLi5jNjI4YTZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQt MDggIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCB0aGF0IG9iamVjdCB3aXRo IHB0b3RvdHlwZSBjYW4gYmUgc2VudCBhcyBtZXNzYWdlLgorCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzI2MworCisgICAgICAgICogZmFzdC9kb20v V2luZG93L3dpbmRvdy1wb3N0bWVzc2FnZS1jbG9uZS1leHBlY3RlZC50eHQ6CisgICAgICAgICog ZmFzdC9kb20vV2luZG93L3dpbmRvdy1wb3N0bWVzc2FnZS1jbG9uZS5odG1sOgorCiAyMDEwLTA0 LTA4ICBWaXRhbHkgUmVwZXNoa28gIDx2aXRhbHlyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2RvbS9XaW5kb3cvd2luZG93LXBvc3RtZXNzYWdlLWNsb25lLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3QvZG9tL1dpbmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUtZXhwZWN0ZWQu dHh0CmluZGV4IGU3MmFiMjAuLjZkZjI1YWYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qv ZG9tL1dpbmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUtZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvZG9tL1dpbmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUtZXhwZWN0 ZWQudHh0CkBAIC0xNSw2ICsxNSw3IEBAIFBBU1M6IGV2ZW50RGF0YSBpcyAxLDIsMyBvZiB0eXBl IG9iamVjdAogUEFTUzogZXZlbnREYXRhIGlzICwsMSBvZiB0eXBlIG9iamVjdAogUEFTUzogZXZl bnREYXRhIGlzIG51bGwgb2YgdHlwZSBvYmplY3QKIFBBU1M6IGV2ZW50RGF0YSBpcyAyMDA5LTAy LTEzVDIzOjMxOjMwLjAwMFogb2YgdHlwZSBvYmplY3QKK1BBU1M6IGV2ZW50RGF0YSBpcyBbb2Jq ZWN0IE9iamVjdF0gb2YgdHlwZSBvYmplY3QKIFBBU1M6IGV2ZW50RGF0YSBpcyBbb2JqZWN0IEFy cmF5XShkZWZhdWx0IHRvU3RyaW5nIHRocmV3IFJhbmdlRXJyb3I6IE1heGltdW0gY2FsbCBzdGFj ayBzaXplIGV4Y2VlZGVkLikgb2YgdHlwZSBvYmplY3QKIFBBU1M6IGV2ZW50RGF0YSBpcyBbb2Jq ZWN0IEZpbGVdIG9mIHR5cGUgb2JqZWN0CiBQQVNTOiBldmVudERhdGEgaXMgW29iamVjdCBGaWxl TGlzdF0gb2YgdHlwZSBvYmplY3QKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL1dp bmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZG9t L1dpbmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUuaHRtbAppbmRleCA5Y2I2ZThkLi5lNzU1 ZjRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9XaW5kb3cvd2luZG93LXBvc3Rt ZXNzYWdlLWNsb25lLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vV2luZG93L3dpbmRv dy1wb3N0bWVzc2FnZS1jbG9uZS5odG1sCkBAIC05Miw2ICs5MiwxNCBAQCBmdW5jdGlvbiBvbm1l c3NhZ2UoZXZ0KSB7CiAKIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdtZXNzYWdlJywgb25tZXNz YWdlLCBmYWxzZSk7CiAKK2Z1bmN0aW9uIENvbnN0cnVjdG9yV2l0aFByb3RvdHlwZShzKSB7Cisg ICAgdGhpcy5maWVsZCA9IHM7Cit9CisKK0NvbnN0cnVjdG9yV2l0aFByb3RvdHlwZS5wcm90b3R5 cGUgPSB7CisgICAgcHJvdG9Qcm9wZXJ0eTogMjAxMAorfTsKKwogZnVuY3Rpb24gdHJ5UG9zdE1l c3NhZ2UobWVzc2FnZSwgc2hvdWxkVGhyb3csIGV4cGVjdGVkKSB7CiAgICAgdHJ5IHsKICAgICAg ICAgdmFyIHZhbHVlID0gZXZhbChtZXNzYWdlKTsKQEAgLTEyMSw2ICsxMjksNyBAQCB0cnlQb3N0 TWVzc2FnZSgnWzEsMiwzXScpOwogdHJ5UG9zdE1lc3NhZ2UoJ1ssLDFdJyk7CiB0cnlQb3N0TWVz c2FnZSgnKGZ1bmN0aW9uKCl7fSknLCBmYWxzZSwgJ251bGwnKTsKIHRyeVBvc3RNZXNzYWdlKCdu ZXcgRGF0ZSgxMjM0NTY3ODkwMDAwKScpOwordHJ5UG9zdE1lc3NhZ2UoJ25ldyBDb25zdHJ1Y3Rv cldpdGhQcm90b3R5cGUoImZvbyIpJywgZmFsc2UsICcoe2ZpZWxkOiJmb28ifSknKTsKIGN5Y2xp Y09iamVjdD17fTsKIGN5Y2xpY09iamVjdC5zZWxmID0gY3ljbGljT2JqZWN0OwogdHJ5UG9zdE1l c3NhZ2UoJ2N5Y2xpY09iamVjdCcsIHRydWUpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VM b2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxZTU5OWY1Li5iOTQ2NGIyIDEwMDY0NAotLS0g YS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEwLTA0LTA4ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcnJlY3Rs eSBzYXZlIG51bWJlciBvZiBwcm9wZXJ0aWVzIHdoZW4gb2JqZWN0IGJlaW5nIHNlcmlhbGl6ZWQK KyAgICAgICAgaGF2ZSBwcm9wZXJ0aWVzIGluIGl0cyBwcm9yb3R5cGUuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MjYzCisKKyAgICAgICAgKiBi aW5kaW5ncy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 WmlnWmFnOjpTZXJpYWxpemVyOjpBYnN0cmFjdE9iamVjdFN0YXRlOjpBYnN0cmFjdE9iamVjdFN0 YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlppZ1phZzo6U2VyaWFsaXplcjo6QWJzdHJhY3RPYmpl Y3RTdGF0ZTo6YWR2YW5jZSk6CisKIDIwMTAtMDQtMDggIFZpdGFseSBSZXBlc2hrbyAgPHZpdGFs eXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNw cCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcAppbmRleCAy YWQ0NTg0Li5mMDk5YTNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6 ZWRTY3JpcHRWYWx1ZS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9TZXJpYWxpemVkU2Ny aXB0VmFsdWUuY3BwCkBAIC0zODQsNiArMzg0LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIDog U3RhdGU8djg6Ok9iamVjdD4ob2JqZWN0LCBuZXh0KQogICAgICAgICAgICAgLCBtX3Byb3BlcnR5 TmFtZXMob2JqZWN0LT5HZXRQcm9wZXJ0eU5hbWVzKCkpCiAgICAgICAgICAgICAsIG1faW5kZXgo LTEpCisgICAgICAgICAgICAsIG1fbnVtU2VyaWFsaXplZFByb3BlcnRpZXMoMCkKICAgICAgICAg ICAgICwgbV9uYW1lRG9uZShmYWxzZSkKICAgICAgICAgewogICAgICAgICB9CkBAIC00MDAsNiAr NDAxLDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAg ICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAg ICAgKyttX251bVNlcmlhbGl6ZWRQcm9wZXJ0aWVzOwogICAgICAgICAgICAgICAgIEFTU0VSVCgh bV9wcm9wZXJ0eU5hbWUuSXNFbXB0eSgpKTsKICAgICAgICAgICAgICAgICBpZiAoIW1fbmFtZURv bmUpIHsKICAgICAgICAgICAgICAgICAgICAgbV9uYW1lRG9uZSA9IHRydWU7CkBAIC00MTIsNyAr NDE0LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBpZiAoU3RhdGVCYXNlKiBuZXdTdGF0 ZSA9IHNlcmlhbGl6ZXIuZG9TZXJpYWxpemUodmFsdWUsIHRoaXMpKQogICAgICAgICAgICAgICAg ICAgICByZXR1cm4gbmV3U3RhdGU7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4g b2JqZWN0RG9uZShtX2luZGV4LCBzZXJpYWxpemVyKTsKKyAgICAgICAgICAgIHJldHVybiBvYmpl Y3REb25lKG1fbnVtU2VyaWFsaXplZFByb3BlcnRpZXMsIHNlcmlhbGl6ZXIpOwogICAgICAgICB9 CiAKICAgICBwcm90ZWN0ZWQ6CkBAIC00MjIsNiArNDI0LDcgQEAgcHJpdmF0ZToKICAgICAgICAg djg6OkxvY2FsPHY4OjpBcnJheT4gbV9wcm9wZXJ0eU5hbWVzOwogICAgICAgICB2ODo6TG9jYWw8 djg6OlZhbHVlPiBtX3Byb3BlcnR5TmFtZTsKICAgICAgICAgdW5zaWduZWQgbV9pbmRleDsKKyAg ICAgICAgdW5zaWduZWQgbV9udW1TZXJpYWxpemVkUHJvcGVydGllczsKICAgICAgICAgYm9vbCBt X25hbWVEb25lOwogICAgIH07CiAK 52859 2010-04-08 06:44:45 -0700 2010-04-08 07:29:01 -0700 patch serialized-script-value2.patch text/plain 4331 yurys ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmYTkyMzJmLi5jNjI4YTZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQt MDggIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCB0aGF0IG9iamVjdCB3aXRo IHB0b3RvdHlwZSBjYW4gYmUgc2VudCBhcyBtZXNzYWdlLgorCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzI2MworCisgICAgICAgICogZmFzdC9kb20v V2luZG93L3dpbmRvdy1wb3N0bWVzc2FnZS1jbG9uZS1leHBlY3RlZC50eHQ6CisgICAgICAgICog ZmFzdC9kb20vV2luZG93L3dpbmRvdy1wb3N0bWVzc2FnZS1jbG9uZS5odG1sOgorCiAyMDEwLTA0 LTA4ICBWaXRhbHkgUmVwZXNoa28gIDx2aXRhbHlyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2RvbS9XaW5kb3cvd2luZG93LXBvc3RtZXNzYWdlLWNsb25lLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3QvZG9tL1dpbmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUtZXhwZWN0ZWQu dHh0CmluZGV4IGU3MmFiMjAuLjZkZjI1YWYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qv ZG9tL1dpbmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUtZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvZG9tL1dpbmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUtZXhwZWN0 ZWQudHh0CkBAIC0xNSw2ICsxNSw3IEBAIFBBU1M6IGV2ZW50RGF0YSBpcyAxLDIsMyBvZiB0eXBl IG9iamVjdAogUEFTUzogZXZlbnREYXRhIGlzICwsMSBvZiB0eXBlIG9iamVjdAogUEFTUzogZXZl bnREYXRhIGlzIG51bGwgb2YgdHlwZSBvYmplY3QKIFBBU1M6IGV2ZW50RGF0YSBpcyAyMDA5LTAy LTEzVDIzOjMxOjMwLjAwMFogb2YgdHlwZSBvYmplY3QKK1BBU1M6IGV2ZW50RGF0YSBpcyBbb2Jq ZWN0IE9iamVjdF0gb2YgdHlwZSBvYmplY3QKIFBBU1M6IGV2ZW50RGF0YSBpcyBbb2JqZWN0IEFy cmF5XShkZWZhdWx0IHRvU3RyaW5nIHRocmV3IFJhbmdlRXJyb3I6IE1heGltdW0gY2FsbCBzdGFj ayBzaXplIGV4Y2VlZGVkLikgb2YgdHlwZSBvYmplY3QKIFBBU1M6IGV2ZW50RGF0YSBpcyBbb2Jq ZWN0IEZpbGVdIG9mIHR5cGUgb2JqZWN0CiBQQVNTOiBldmVudERhdGEgaXMgW29iamVjdCBGaWxl TGlzdF0gb2YgdHlwZSBvYmplY3QKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL1dp bmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZG9t L1dpbmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUuaHRtbAppbmRleCA5Y2I2ZThkLi5lNzU1 ZjRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9XaW5kb3cvd2luZG93LXBvc3Rt ZXNzYWdlLWNsb25lLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vV2luZG93L3dpbmRv dy1wb3N0bWVzc2FnZS1jbG9uZS5odG1sCkBAIC05Miw2ICs5MiwxNCBAQCBmdW5jdGlvbiBvbm1l c3NhZ2UoZXZ0KSB7CiAKIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdtZXNzYWdlJywgb25tZXNz YWdlLCBmYWxzZSk7CiAKK2Z1bmN0aW9uIENvbnN0cnVjdG9yV2l0aFByb3RvdHlwZShzKSB7Cisg ICAgdGhpcy5maWVsZCA9IHM7Cit9CisKK0NvbnN0cnVjdG9yV2l0aFByb3RvdHlwZS5wcm90b3R5 cGUgPSB7CisgICAgcHJvdG9Qcm9wZXJ0eTogMjAxMAorfTsKKwogZnVuY3Rpb24gdHJ5UG9zdE1l c3NhZ2UobWVzc2FnZSwgc2hvdWxkVGhyb3csIGV4cGVjdGVkKSB7CiAgICAgdHJ5IHsKICAgICAg ICAgdmFyIHZhbHVlID0gZXZhbChtZXNzYWdlKTsKQEAgLTEyMSw2ICsxMjksNyBAQCB0cnlQb3N0 TWVzc2FnZSgnWzEsMiwzXScpOwogdHJ5UG9zdE1lc3NhZ2UoJ1ssLDFdJyk7CiB0cnlQb3N0TWVz c2FnZSgnKGZ1bmN0aW9uKCl7fSknLCBmYWxzZSwgJ251bGwnKTsKIHRyeVBvc3RNZXNzYWdlKCdu ZXcgRGF0ZSgxMjM0NTY3ODkwMDAwKScpOwordHJ5UG9zdE1lc3NhZ2UoJ25ldyBDb25zdHJ1Y3Rv cldpdGhQcm90b3R5cGUoImZvbyIpJywgZmFsc2UsICcoe2ZpZWxkOiJmb28ifSknKTsKIGN5Y2xp Y09iamVjdD17fTsKIGN5Y2xpY09iamVjdC5zZWxmID0gY3ljbGljT2JqZWN0OwogdHJ5UG9zdE1l c3NhZ2UoJ2N5Y2xpY09iamVjdCcsIHRydWUpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VM b2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxZTU5OWY1Li5iOTQ2NGIyIDEwMDY0NAotLS0g YS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEwLTA0LTA4ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcnJlY3Rs eSBzYXZlIG51bWJlciBvZiBwcm9wZXJ0aWVzIHdoZW4gb2JqZWN0IGJlaW5nIHNlcmlhbGl6ZWQK KyAgICAgICAgaGF2ZSBwcm9wZXJ0aWVzIGluIGl0cyBwcm9yb3R5cGUuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MjYzCisKKyAgICAgICAgKiBi aW5kaW5ncy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 WmlnWmFnOjpTZXJpYWxpemVyOjpBYnN0cmFjdE9iamVjdFN0YXRlOjpBYnN0cmFjdE9iamVjdFN0 YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlppZ1phZzo6U2VyaWFsaXplcjo6QWJzdHJhY3RPYmpl Y3RTdGF0ZTo6YWR2YW5jZSk6CisKIDIwMTAtMDQtMDggIFZpdGFseSBSZXBlc2hrbyAgPHZpdGFs eXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNw cCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcAppbmRleCAy YWQ0NTg0Li4zNTNmNGNhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6 ZWRTY3JpcHRWYWx1ZS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9TZXJpYWxpemVkU2Ny aXB0VmFsdWUuY3BwCkBAIC0zODQsNiArMzg0LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIDog U3RhdGU8djg6Ok9iamVjdD4ob2JqZWN0LCBuZXh0KQogICAgICAgICAgICAgLCBtX3Byb3BlcnR5 TmFtZXMob2JqZWN0LT5HZXRQcm9wZXJ0eU5hbWVzKCkpCiAgICAgICAgICAgICAsIG1faW5kZXgo LTEpCisgICAgICAgICAgICAsIG1fbnVtU2VyaWFsaXplZFByb3BlcnRpZXMoMCkKICAgICAgICAg ICAgICwgbV9uYW1lRG9uZShmYWxzZSkKICAgICAgICAgewogICAgICAgICB9CkBAIC00MDksMTAg KzQxMCwxMSBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+ IHZhbHVlID0gY29tcG9zaXRlKCktPkdldChtX3Byb3BlcnR5TmFtZSk7CiAgICAgICAgICAgICAg ICAgbV9uYW1lRG9uZSA9IGZhbHNlOwogICAgICAgICAgICAgICAgIG1fcHJvcGVydHlOYW1lLkNs ZWFyKCk7CisgICAgICAgICAgICAgICAgKyttX251bVNlcmlhbGl6ZWRQcm9wZXJ0aWVzOwogICAg ICAgICAgICAgICAgIGlmIChTdGF0ZUJhc2UqIG5ld1N0YXRlID0gc2VyaWFsaXplci5kb1Nlcmlh bGl6ZSh2YWx1ZSwgdGhpcykpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBuZXdTdGF0ZTsK ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBvYmplY3REb25lKG1faW5kZXgsIHNl cmlhbGl6ZXIpOworICAgICAgICAgICAgcmV0dXJuIG9iamVjdERvbmUobV9udW1TZXJpYWxpemVk UHJvcGVydGllcywgc2VyaWFsaXplcik7CiAgICAgICAgIH0KIAogICAgIHByb3RlY3RlZDoKQEAg LTQyMiw2ICs0MjQsNyBAQCBwcml2YXRlOgogICAgICAgICB2ODo6TG9jYWw8djg6OkFycmF5PiBt X3Byb3BlcnR5TmFtZXM7CiAgICAgICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IG1fcHJvcGVydHlO YW1lOwogICAgICAgICB1bnNpZ25lZCBtX2luZGV4OworICAgICAgICB1bnNpZ25lZCBtX251bVNl cmlhbGl6ZWRQcm9wZXJ0aWVzOwogICAgICAgICBib29sIG1fbmFtZURvbmU7CiAgICAgfTsKIAo=