36892 2010-03-31 11:03:01 -0700 [V8] SerializedScriptValue must be deserialized only once and in the right context 2010-03-31 17:10:06 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vitalyr webkit-unassigned commit-queue levin oldest_to_newest 206586 0 vitalyr 2010-03-31 11:03:01 -0700 [V8] SerializedScriptValue must be deserialized only once and in the right context 206600 1 52190 vitalyr 2010-03-31 11:13:51 -0700 Created attachment 52190 patch v1 206608 2 52190 levin 2010-03-31 11:35:00 -0700 Comment on attachment 52190 patch v1 > diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm > + if ($serializedAttribute->type =~ /^readonly/) { > + $attrAttr .= "|v8::ReadOnly"; Ideally add spaces around | (so the code will match the general WK style). 206683 3 52205 vitalyr 2010-03-31 13:17:40 -0700 Created attachment 52205 patch v1.1 206828 4 52205 commit-queue 2010-03-31 17:10:02 -0700 Comment on attachment 52205 patch v1.1 Clearing flags on attachment: 52205 Committed r56877: <http://trac.webkit.org/changeset/56877> 206829 5 commit-queue 2010-03-31 17:10:06 -0700 All reviewed patches have been landed. Closing bug. 52190 2010-03-31 11:13:51 -0700 2010-03-31 13:17:40 -0700 patch v1 serialize.patch text/plain 7248 vitalyr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmU5NmQ0OS4uNGQ1ZTQ4YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxMC0wMy0zMSAgVml0YWx5IFJlcGVz aGtvICA8dml0YWx5ckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1Y4XSBTZXJpYWxpemVkU2NyaXB0VmFsdWUgbXVzdCBiZSBk ZXNlcmlhbGl6ZWQgb25seSBvbmNlIGFuZCBpbiB0aGUgcmlnaHQgY29udGV4dAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY4OTIKKworICAgICAgICBT ZWUgYWxzbyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQyMjcgZm9y IHRoZQorICAgICAgICBjb3JyZXNwb25kaW5nIEpTQyBjaGFuZ2UuCisKKyAgICAgICAgR2VuZXJh bCBpZGVhOiBTZXJpYWxpemVkU2NyaXB0VmFsdWUgbXVzdCBiZSBkZXNlcmlhbGl6ZWQgb25seSBv bmNlCisgICAgICAgIGFuZCBpbiB0aGUgY29udGV4dCBvZiB0aGUgaW50ZW5kZWQgTWVzc2FnZUV2 ZW50IHJlY2VwaWVudC4gVGhlCisgICAgICAgIGFwcHJvYWNoIHdlIHRha2UgZm9yIG5vdyBpcyB0 byBlYWdlcmx5IGRlc2VyaWFsaXplIHdoZW4gYQorICAgICAgICBKYXZhU2NyaXB0IHdyYXBwZXIg Zm9yIE1lc3NhZ2VFdmVudCBpcyBjcmVhdGVkLgorCisgICAgICAgIEEgYmV0dGVyIGZpeCB3b3Vs ZCBiZSB0byBrZWVwIGEgcmVmZXJlbmNlIHRvIHRoZSBjb250ZXh0IGluCisgICAgICAgIE1lc3Nh Z2VFdmVudCBhbmQgdXNlIGl0IHdoZW4gbGF6aWx5IGRlc2VyaWFsaXppbmcuIEl0J3MgaGFyZGVy IHRvCisgICAgICAgIGRvIHNpbmNlIHRoZSBBUEkgZG9lc24ndCBoYXZlIGEgY2xlYW4gbWV0aG9k IHRvIGhhdmUgc3VjaCBhIHJlZmVyZW5jZS4KKworICAgICAgICBUZXN0ZWQgYnkgZmFzdC9kb20v V2luZG93L3dpbmRvdy1wb3N0bWVzc2FnZS1jbG9uZS1mcmFtZXMuaHRtbC4gVGhpcworICAgICAg ICB0ZXN0IHN0aWxsIGZhaWxzIGJ1dCBvbmx5IGZvciB0aGUgdHlwZXMgd2hpY2ggd2UgY2FuJ3Qg c2VyaWFsaXplIHlldC4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv clY4LnBtOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oOgor ICAgICAgICAoV2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZUFuZFNl dFByb3BlcnR5KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRD dXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhNZXNzYWdlRXZlbnQ6OmluaXRNZXNzYWdl RXZlbnRDYWxsYmFjayk6CisKIDIwMTAtMDMtMzAgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFu ZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIGRlZmluZSBzdGF0aWMgdmFyaWFi bGVzIHdpdGggREVGSU5FX1NUQVRJQ19MT0NBTCBtYWNybwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbSBiL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KaW5kZXggNjgwMDdlMi4uMDU0MmRlOCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQorKysgYi9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCkBAIC0xMTQxLDYgKzExNDEs MTAgQEAgc3ViIEdlbmVyYXRlU2luZ2xlQmF0Y2hlZEF0dHJpYnV0ZQogICAgIG15ICRhdHRyTmFt ZSA9ICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+bmFtZTsKICAgICBteSAkYXR0ckV4dCA9ICRhdHRy aWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzOwogCisgICAgIyBBdHRyaWJ1dGVz IG9mIHR5cGUgU2VyaWFsaXplZFNjcmlwdFZhbHVlIGFyZSBzZXQgaW4gdGhlCisgICAgIyBjb25z dHJ1Y3RvciBhbmQgZG9uJ3QgcmVxdWlyZSBjYWxsYmFja3MuCisgICAgcmV0dXJuIGlmICgkYXR0 cmlidXRlLT5zaWduYXR1cmUtPnR5cGUgZXEgIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSIpOworCiAg ICAgbXkgJGFjY2Vzc0NvbnRyb2wgPSAidjg6OkRFRkFVTFQiOwogICAgIGlmICgkYXR0ckV4dC0+ eyJEb05vdENoZWNrRG9tYWluU2VjdXJpdHlPbkdldCJ9KSB7CiAgICAgICAgICRhY2Nlc3NDb250 cm9sID0gInY4OjpBTExfQ0FOX1JFQUQiOwpAQCAtMTQ2Nyw2ICsxNDcxLDcgQEAgc3ViIEdlbmVy YXRlSW1wbGVtZW50YXRpb24KICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAidGVtcGxhdGUg PHR5cGVuYW1lIFQ+IHZvaWQgVjhfVVNFKFQpIHsgfVxuXG4iKTsKIAogICAgIG15ICRoYXNDb25z dHJ1Y3RvcnMgPSAwOworICAgIG15ICRzZXJpYWxpemVkQXR0cmlidXRlOwogICAgICMgR2VuZXJh dGUgcHJvcGVydHkgYWNjZXNzb3JzIGZvciBhdHRyaWJ1dGVzLgogICAgIGZvciAoJGluZGV4ID0g MDsgJGluZGV4IDwgQHskZGF0YU5vZGUtPmF0dHJpYnV0ZXN9OyAkaW5kZXgrKykgewogICAgICAg ICAkYXR0cmlidXRlID0gQHskZGF0YU5vZGUtPmF0dHJpYnV0ZXN9WyRpbmRleF07CkBAIC0xNDg2 LDYgKzE0OTEsMTUgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICAgICRh dHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57InY4T25Qcm90byJ9ID0g MTsKICAgICAgICAgfQogCisgICAgICAgICMgQXR0cmlidXRlcyBvZiB0eXBlIFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZSBhcmUgc2V0IGluIHRoZQorICAgICAgICAjIGNvbnN0cnVjdG9yIGFuZCBkb24n dCByZXF1aXJlIGNhbGxiYWNrcy4KKyAgICAgICAgaWYgKCRhdHRyVHlwZSBlcSAiU2VyaWFsaXpl ZFNjcmlwdFZhbHVlIikgeworICAgICAgICAgICAgZGllICJPbmx5IG9uZSBhdHRyaWJ1dGUgb2Yg dHlwZSBTZXJpYWxpemVkU2NyaXB0VmFsdWUgc3VwcG9ydGVkIiBpZiAkc2VyaWFsaXplZEF0dHJp YnV0ZTsKKyAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7IlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5o In0gPSAxOworICAgICAgICAgICAgJHNlcmlhbGl6ZWRBdHRyaWJ1dGUgPSAkYXR0cmlidXRlOwor ICAgICAgICAgICAgbmV4dDsKKyAgICAgICAgfQorCiAgICAgICAgICMgRG8gbm90IGdlbmVyYXRl IGFjY2Vzc29yIGlmIHRoaXMgaXMgYSBjdXN0b20gYXR0cmlidXRlLiAgVGhlCiAgICAgICAgICMg Y2FsbCB3aWxsIGJlIGZvcndhcmRlZCB0byBhIGhhbmQtd3JpdHRlbiBhY2Nlc3NvcgogICAgICAg ICAjIGltcGxlbWVudGF0aW9uLgpAQCAtMTkxMSw3ICsxOTI1LDcgQEAgdjg6OlBlcnNpc3RlbnQ8 djg6Ok9iamVjdFRlbXBsYXRlPiBWOERPTVdpbmRvdzo6R2V0U2hhZG93T2JqZWN0VGVtcGxhdGUo KQogRU5ECiAgICAgfQogCi0gICAgR2VuZXJhdGVUb1Y4Q29udmVydGVycygkZGF0YU5vZGUsICRp bnRlcmZhY2VOYW1lLCAkY2xhc3NOYW1lLCAkbmF0aXZlVHlwZSk7CisgICAgR2VuZXJhdGVUb1Y4 Q29udmVydGVycygkZGF0YU5vZGUsICRpbnRlcmZhY2VOYW1lLCAkY2xhc3NOYW1lLCAkbmF0aXZl VHlwZSwgJHNlcmlhbGl6ZWRBdHRyaWJ1dGUpOwogCiAgICAgcHVzaChAaW1wbENvbnRlbnQsIDw8 RU5EKTsKIApAQCAtMTk0MCw2ICsxOTU0LDcgQEAgc3ViIEdlbmVyYXRlVG9WOENvbnZlcnRlcnMK ICAgICBteSAkaW50ZXJmYWNlTmFtZSA9IHNoaWZ0OwogICAgIG15ICRjbGFzc05hbWUgPSBzaGlm dDsKICAgICBteSAkbmF0aXZlVHlwZSA9IHNoaWZ0OworICAgIG15ICRzZXJpYWxpemVkQXR0cmli dXRlID0gc2hpZnQ7CiAKICAgICBteSAkZG9tTWFwRnVuY3Rpb24gPSBHZXREb21NYXBGdW5jdGlv bigkZGF0YU5vZGUsICRpbnRlcmZhY2VOYW1lKTsKICAgICBteSAkZm9yY2VOZXdPYmplY3RJbnB1 dCA9IElzRE9NTm9kZVR5cGUoJGludGVyZmFjZU5hbWUpID8gIiwgYm9vbCBmb3JjZU5ld09iamVj dCIgOiAiIjsKQEAgLTE5OTMsNyArMjAwOCw2IEBAIEVORAogICAgIHB1c2goQGltcGxDb250ZW50 LCA8PEVORCk7CiAgICAgd3JhcHBlciA9IFY4RE9NV3JhcHBlcjo6aW5zdGFudGlhdGVWOE9iamVj dChwcm94eSwgJmluZm8sIGltcGwpOwogRU5ECi0KICAgICBpZiAoSXNOb2RlU3ViVHlwZSgkZGF0 YU5vZGUpKSB7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCA8PEVORCk7CiAgICAgLy8gRXhp dCB0aGUgbm9kZSdzIGNvbnRleHQgaWYgaXQgd2FzIGVudGVyZWQuCkBAIC0yMDA4LDYgKzIwMjIs MjIgQEAgRU5ECiBFTkQKICAgICBwdXNoKEBpbXBsQ29udGVudCwgIlxuICAgIGltcGwtPnJlZigp O1xuIikgaWYgSXNSZWZQdHJUeXBlKCRpbnRlcmZhY2VOYW1lKTsKIAorICAgICMgRWFnZXJseSBk ZXNlcmlhbGl6ZSBhdHRyaWJ1dGVzIG9mIHR5cGUgU2VyaWFsaXplZFNjcmlwdFZhbHVlCisgICAg IyB3aGlsZSB3ZSdyZSBpbiB0aGUgcmlnaHQgY29udGV4dC4KKyAgICBpZiAoJHNlcmlhbGl6ZWRB dHRyaWJ1dGUpIHsKKyAgICAgICAgZGllICJBdHRyaWJ1dGUgb2YgdHlwZSBTZXJpYWxpemVkU2Ny aXB0VmFsdWUgZXhwZWN0ZWQiIGlmICRzZXJpYWxpemVkQXR0cmlidXRlLT5zaWduYXR1cmUtPnR5 cGUgbmUgIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSI7CisgICAgICAgIG15ICRhdHRyTmFtZSA9ICRz ZXJpYWxpemVkQXR0cmlidXRlLT5zaWduYXR1cmUtPm5hbWU7CisgICAgICAgIG15ICRhdHRyQXR0 ciA9ICJ2ODo6RG9udERlbGV0ZSI7CisgICAgICAgIGlmICgkc2VyaWFsaXplZEF0dHJpYnV0ZS0+ dHlwZSA9fiAvXnJlYWRvbmx5LykgeworICAgICAgICAgICAgJGF0dHJBdHRyIC49ICJ8djg6OlJl YWRPbmx5IjsKKyAgICAgICAgfQorICAgICAgICAkYXR0ckF0dHIgPSAic3RhdGljX2Nhc3Q8djg6 OlByb3BlcnR5QXR0cmlidXRlPigkYXR0ckF0dHIpIjsKKyAgICAgICAgbXkgJGdldHRlckZ1bmMg PSAkY29kZUdlbmVyYXRvci0+V0tfbGNmaXJzdCgkYXR0ck5hbWUpOworICAgICAgICBwdXNoKEBp bXBsQ29udGVudCwgPDxFTkQpOworICAgIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6ZGVzZXJpYWxp emVBbmRTZXRQcm9wZXJ0eSh3cmFwcGVyLCAiJHthdHRyTmFtZX0iLCAke2F0dHJBdHRyfSwgaW1w bC0+JHtnZXR0ZXJGdW5jfSgpKTsKK0VORAorICAgIH0KKwogICAgIGlmICgkZG9tTWFwRnVuY3Rp b24pIHsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsIDw8RU5EKTsKICAgICAke2RvbU1hcEZ1 bmN0aW9ufS5zZXQoaW1wbCwgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5ldyh3cmFwcGVy KSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1 ZS5oIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaAppbmRleCBi YTRkNWVkLi4yYjZjMzkyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6 ZWRTY3JpcHRWYWx1ZS5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlw dFZhbHVlLmgKQEAgLTQwLDYgKzQwLDE4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3Mg U2VyaWFsaXplZFNjcmlwdFZhbHVlIDogcHVibGljIFJlZkNvdW50ZWQ8U2VyaWFsaXplZFNjcmlw dFZhbHVlPiB7CiBwdWJsaWM6CisgICAgLy8gRGVzZXJpYWxpemVzIHRoZSBnaXZlbiB2YWx1ZSBh bmQgc2V0cyBpdCBhcyBhIHByb3BlcnR5IG9uIHRoZQorICAgIC8vIG9iamVjdC4KKyAgICBzdGF0 aWMgdm9pZCBkZXNlcmlhbGl6ZUFuZFNldFByb3BlcnR5KHY4OjpIYW5kbGU8djg6Ok9iamVjdD4g b2JqZWN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg Y2hhciogcHJvcGVydHlOYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdjg6OlByb3BlcnR5QXR0cmlidXRlIGF0dHJpYnV0ZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSogdmFsdWUpCisg ICAgeworICAgICAgICBBU1NFUlQodmFsdWUpOworICAgICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gZGVzZXJpYWxpemVkID0gdmFsdWUtPmRlc2VyaWFsaXplKCk7CisgICAgICAgIG9iamVjdC0+ Rm9yY2VTZXQodjg6OlN0cmluZzo6TmV3U3ltYm9sKHByb3BlcnR5TmFtZSksIGRlc2VyaWFsaXpl ZCwgYXR0cmlidXRlKTsKKyAgICB9CisKICAgICAvLyBDcmVhdGVzIGEgc2VyaWFsaXplZCByZXBy ZXNlbnRhdGlvbiBvZiB0aGUgZ2l2ZW4gVjggdmFsdWUuCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8 U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBjcmVhdGUodjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVl KQogICAgIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2Fn ZUV2ZW50Q3VzdG9tLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2FnZUV2 ZW50Q3VzdG9tLmNwcAppbmRleCBkNDFhNzg1Li5jY2E0YTI0IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VFdmVudEN1c3RvbS5jcHAKKysrIGIvV2ViQ29y ZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRDdXN0b20uY3BwCkBAIC04NCw2ICs4 NCw4IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOE1lc3NhZ2VFdmVudDo6aW5pdE1lc3NhZ2VF dmVudENhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVuCiAgICAgICAgICAgICByZXR1cm4gdjg6OlVu ZGVmaW5lZCgpOwogICAgIH0KICAgICBldmVudC0+aW5pdE1lc3NhZ2VFdmVudCh0eXBlQXJnLCBj YW5CdWJibGVBcmcsIGNhbmNlbGFibGVBcmcsIGRhdGFBcmcucmVsZWFzZSgpLCBvcmlnaW5Bcmcs IGxhc3RFdmVudElkQXJnLCBzb3VyY2VBcmcsIHBvcnRBcnJheS5yZWxlYXNlKCkpOworICAgIHY4 OjpQcm9wZXJ0eUF0dHJpYnV0ZSBkYXRhQXR0ciA9IHN0YXRpY19jYXN0PHY4OjpQcm9wZXJ0eUF0 dHJpYnV0ZT4odjg6OkRvbnREZWxldGUgfCB2ODo6UmVhZE9ubHkpOworICAgIFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZTo6ZGVzZXJpYWxpemVBbmRTZXRQcm9wZXJ0eShhcmdzLkhvbGRlcigpLCAiZGF0 YSIsIGRhdGFBdHRyLCBldmVudC0+ZGF0YSgpKTsKICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgp OwogICB9CiAK 52205 2010-03-31 13:17:40 -0700 2010-03-31 17:10:02 -0700 patch v1.1 serialize.patch text/plain 7250 vitalyr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NGNjM2MzNC4uMTEyNGMyOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxMC0wMy0zMSAgVml0YWx5IFJlcGVz aGtvICA8dml0YWx5ckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQg TGV2aW4uCisKKyAgICAgICAgW1Y4XSBTZXJpYWxpemVkU2NyaXB0VmFsdWUgbXVzdCBiZSBkZXNl cmlhbGl6ZWQgb25seSBvbmNlIGFuZCBpbiB0aGUgcmlnaHQgY29udGV4dAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY4OTIKKworICAgICAgICBTZWUg YWxzbyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQyMjcgZm9yIHRo ZQorICAgICAgICBjb3JyZXNwb25kaW5nIEpTQyBjaGFuZ2UuCisKKyAgICAgICAgR2VuZXJhbCBp ZGVhOiBTZXJpYWxpemVkU2NyaXB0VmFsdWUgbXVzdCBiZSBkZXNlcmlhbGl6ZWQgb25seSBvbmNl CisgICAgICAgIGFuZCBpbiB0aGUgY29udGV4dCBvZiB0aGUgaW50ZW5kZWQgTWVzc2FnZUV2ZW50 IHJlY2VwaWVudC4gVGhlCisgICAgICAgIGFwcHJvYWNoIHdlIHRha2UgZm9yIG5vdyBpcyB0byBl YWdlcmx5IGRlc2VyaWFsaXplIHdoZW4gYQorICAgICAgICBKYXZhU2NyaXB0IHdyYXBwZXIgZm9y IE1lc3NhZ2VFdmVudCBpcyBjcmVhdGVkLgorCisgICAgICAgIEEgYmV0dGVyIGZpeCB3b3VsZCBi ZSB0byBrZWVwIGEgcmVmZXJlbmNlIHRvIHRoZSBjb250ZXh0IGluCisgICAgICAgIE1lc3NhZ2VF dmVudCBhbmQgdXNlIGl0IHdoZW4gbGF6aWx5IGRlc2VyaWFsaXppbmcuIEl0J3MgaGFyZGVyIHRv CisgICAgICAgIGRvIHNpbmNlIHRoZSBBUEkgZG9lc24ndCBoYXZlIGEgY2xlYW4gbWV0aG9kIHRv IGhhdmUgc3VjaCBhIHJlZmVyZW5jZS4KKworICAgICAgICBUZXN0ZWQgYnkgZmFzdC9kb20vV2lu ZG93L3dpbmRvdy1wb3N0bWVzc2FnZS1jbG9uZS1mcmFtZXMuaHRtbC4gVGhpcworICAgICAgICB0 ZXN0IHN0aWxsIGZhaWxzIGJ1dCBvbmx5IGZvciB0aGUgdHlwZXMgd2hpY2ggd2UgY2FuJ3Qgc2Vy aWFsaXplIHlldC4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4 LnBtOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oOgorICAg ICAgICAoV2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZUFuZFNldFBy b3BlcnR5KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRDdXN0 b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhNZXNzYWdlRXZlbnQ6OmluaXRNZXNzYWdlRXZl bnRDYWxsYmFjayk6CisKIDIwMTAtMDMtMzEgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgTm90IHJldmlld2VkLiBSb2xsaW5nIG91dCByNTY4Mjkgc2lu Y2UgaXQgYnJva2UgY2hyb21pdW0gbGF5b3V0IHRlc3RzLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbSBiL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KaW5kZXggNjgwMDdlMi4uMGMyODcwNyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQorKysgYi9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCkBAIC0xMTQxLDYgKzExNDEs MTAgQEAgc3ViIEdlbmVyYXRlU2luZ2xlQmF0Y2hlZEF0dHJpYnV0ZQogICAgIG15ICRhdHRyTmFt ZSA9ICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+bmFtZTsKICAgICBteSAkYXR0ckV4dCA9ICRhdHRy aWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzOwogCisgICAgIyBBdHRyaWJ1dGVz IG9mIHR5cGUgU2VyaWFsaXplZFNjcmlwdFZhbHVlIGFyZSBzZXQgaW4gdGhlCisgICAgIyBjb25z dHJ1Y3RvciBhbmQgZG9uJ3QgcmVxdWlyZSBjYWxsYmFja3MuCisgICAgcmV0dXJuIGlmICgkYXR0 cmlidXRlLT5zaWduYXR1cmUtPnR5cGUgZXEgIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSIpOworCiAg ICAgbXkgJGFjY2Vzc0NvbnRyb2wgPSAidjg6OkRFRkFVTFQiOwogICAgIGlmICgkYXR0ckV4dC0+ eyJEb05vdENoZWNrRG9tYWluU2VjdXJpdHlPbkdldCJ9KSB7CiAgICAgICAgICRhY2Nlc3NDb250 cm9sID0gInY4OjpBTExfQ0FOX1JFQUQiOwpAQCAtMTQ2Nyw2ICsxNDcxLDcgQEAgc3ViIEdlbmVy YXRlSW1wbGVtZW50YXRpb24KICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAidGVtcGxhdGUg PHR5cGVuYW1lIFQ+IHZvaWQgVjhfVVNFKFQpIHsgfVxuXG4iKTsKIAogICAgIG15ICRoYXNDb25z dHJ1Y3RvcnMgPSAwOworICAgIG15ICRzZXJpYWxpemVkQXR0cmlidXRlOwogICAgICMgR2VuZXJh dGUgcHJvcGVydHkgYWNjZXNzb3JzIGZvciBhdHRyaWJ1dGVzLgogICAgIGZvciAoJGluZGV4ID0g MDsgJGluZGV4IDwgQHskZGF0YU5vZGUtPmF0dHJpYnV0ZXN9OyAkaW5kZXgrKykgewogICAgICAg ICAkYXR0cmlidXRlID0gQHskZGF0YU5vZGUtPmF0dHJpYnV0ZXN9WyRpbmRleF07CkBAIC0xNDg2 LDYgKzE0OTEsMTUgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICAgICRh dHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57InY4T25Qcm90byJ9ID0g MTsKICAgICAgICAgfQogCisgICAgICAgICMgQXR0cmlidXRlcyBvZiB0eXBlIFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZSBhcmUgc2V0IGluIHRoZQorICAgICAgICAjIGNvbnN0cnVjdG9yIGFuZCBkb24n dCByZXF1aXJlIGNhbGxiYWNrcy4KKyAgICAgICAgaWYgKCRhdHRyVHlwZSBlcSAiU2VyaWFsaXpl ZFNjcmlwdFZhbHVlIikgeworICAgICAgICAgICAgZGllICJPbmx5IG9uZSBhdHRyaWJ1dGUgb2Yg dHlwZSBTZXJpYWxpemVkU2NyaXB0VmFsdWUgc3VwcG9ydGVkIiBpZiAkc2VyaWFsaXplZEF0dHJp YnV0ZTsKKyAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7IlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5o In0gPSAxOworICAgICAgICAgICAgJHNlcmlhbGl6ZWRBdHRyaWJ1dGUgPSAkYXR0cmlidXRlOwor ICAgICAgICAgICAgbmV4dDsKKyAgICAgICAgfQorCiAgICAgICAgICMgRG8gbm90IGdlbmVyYXRl IGFjY2Vzc29yIGlmIHRoaXMgaXMgYSBjdXN0b20gYXR0cmlidXRlLiAgVGhlCiAgICAgICAgICMg Y2FsbCB3aWxsIGJlIGZvcndhcmRlZCB0byBhIGhhbmQtd3JpdHRlbiBhY2Nlc3NvcgogICAgICAg ICAjIGltcGxlbWVudGF0aW9uLgpAQCAtMTkxMSw3ICsxOTI1LDcgQEAgdjg6OlBlcnNpc3RlbnQ8 djg6Ok9iamVjdFRlbXBsYXRlPiBWOERPTVdpbmRvdzo6R2V0U2hhZG93T2JqZWN0VGVtcGxhdGUo KQogRU5ECiAgICAgfQogCi0gICAgR2VuZXJhdGVUb1Y4Q29udmVydGVycygkZGF0YU5vZGUsICRp bnRlcmZhY2VOYW1lLCAkY2xhc3NOYW1lLCAkbmF0aXZlVHlwZSk7CisgICAgR2VuZXJhdGVUb1Y4 Q29udmVydGVycygkZGF0YU5vZGUsICRpbnRlcmZhY2VOYW1lLCAkY2xhc3NOYW1lLCAkbmF0aXZl VHlwZSwgJHNlcmlhbGl6ZWRBdHRyaWJ1dGUpOwogCiAgICAgcHVzaChAaW1wbENvbnRlbnQsIDw8 RU5EKTsKIApAQCAtMTk0MCw2ICsxOTU0LDcgQEAgc3ViIEdlbmVyYXRlVG9WOENvbnZlcnRlcnMK ICAgICBteSAkaW50ZXJmYWNlTmFtZSA9IHNoaWZ0OwogICAgIG15ICRjbGFzc05hbWUgPSBzaGlm dDsKICAgICBteSAkbmF0aXZlVHlwZSA9IHNoaWZ0OworICAgIG15ICRzZXJpYWxpemVkQXR0cmli dXRlID0gc2hpZnQ7CiAKICAgICBteSAkZG9tTWFwRnVuY3Rpb24gPSBHZXREb21NYXBGdW5jdGlv bigkZGF0YU5vZGUsICRpbnRlcmZhY2VOYW1lKTsKICAgICBteSAkZm9yY2VOZXdPYmplY3RJbnB1 dCA9IElzRE9NTm9kZVR5cGUoJGludGVyZmFjZU5hbWUpID8gIiwgYm9vbCBmb3JjZU5ld09iamVj dCIgOiAiIjsKQEAgLTE5OTMsNyArMjAwOCw2IEBAIEVORAogICAgIHB1c2goQGltcGxDb250ZW50 LCA8PEVORCk7CiAgICAgd3JhcHBlciA9IFY4RE9NV3JhcHBlcjo6aW5zdGFudGlhdGVWOE9iamVj dChwcm94eSwgJmluZm8sIGltcGwpOwogRU5ECi0KICAgICBpZiAoSXNOb2RlU3ViVHlwZSgkZGF0 YU5vZGUpKSB7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCA8PEVORCk7CiAgICAgLy8gRXhp dCB0aGUgbm9kZSdzIGNvbnRleHQgaWYgaXQgd2FzIGVudGVyZWQuCkBAIC0yMDA4LDYgKzIwMjIs MjIgQEAgRU5ECiBFTkQKICAgICBwdXNoKEBpbXBsQ29udGVudCwgIlxuICAgIGltcGwtPnJlZigp O1xuIikgaWYgSXNSZWZQdHJUeXBlKCRpbnRlcmZhY2VOYW1lKTsKIAorICAgICMgRWFnZXJseSBk ZXNlcmlhbGl6ZSBhdHRyaWJ1dGVzIG9mIHR5cGUgU2VyaWFsaXplZFNjcmlwdFZhbHVlCisgICAg IyB3aGlsZSB3ZSdyZSBpbiB0aGUgcmlnaHQgY29udGV4dC4KKyAgICBpZiAoJHNlcmlhbGl6ZWRB dHRyaWJ1dGUpIHsKKyAgICAgICAgZGllICJBdHRyaWJ1dGUgb2YgdHlwZSBTZXJpYWxpemVkU2Ny aXB0VmFsdWUgZXhwZWN0ZWQiIGlmICRzZXJpYWxpemVkQXR0cmlidXRlLT5zaWduYXR1cmUtPnR5 cGUgbmUgIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSI7CisgICAgICAgIG15ICRhdHRyTmFtZSA9ICRz ZXJpYWxpemVkQXR0cmlidXRlLT5zaWduYXR1cmUtPm5hbWU7CisgICAgICAgIG15ICRhdHRyQXR0 ciA9ICJ2ODo6RG9udERlbGV0ZSI7CisgICAgICAgIGlmICgkc2VyaWFsaXplZEF0dHJpYnV0ZS0+ dHlwZSA9fiAvXnJlYWRvbmx5LykgeworICAgICAgICAgICAgJGF0dHJBdHRyIC49ICIgfCB2ODo6 UmVhZE9ubHkiOworICAgICAgICB9CisgICAgICAgICRhdHRyQXR0ciA9ICJzdGF0aWNfY2FzdDx2 ODo6UHJvcGVydHlBdHRyaWJ1dGU+KCRhdHRyQXR0cikiOworICAgICAgICBteSAkZ2V0dGVyRnVu YyA9ICRjb2RlR2VuZXJhdG9yLT5XS19sY2ZpcnN0KCRhdHRyTmFtZSk7CisgICAgICAgIHB1c2go QGltcGxDb250ZW50LCA8PEVORCk7CisgICAgU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpkZXNlcmlh bGl6ZUFuZFNldFByb3BlcnR5KHdyYXBwZXIsICIke2F0dHJOYW1lfSIsICR7YXR0ckF0dHJ9LCBp bXBsLT4ke2dldHRlckZ1bmN9KCkpOworRU5ECisgICAgfQorCiAgICAgaWYgKCRkb21NYXBGdW5j dGlvbikgewogICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgPDxFTkQpOwogICAgICR7ZG9tTWFw RnVuY3Rpb259LnNldChpbXBsLCB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0Pjo6TmV3KHdyYXBw ZXIpKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZh bHVlLmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oCmluZGV4 IGJhNGQ1ZWQuLjJiNmMzOTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFs aXplZFNjcmlwdFZhbHVlLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9TZXJpYWxpemVkU2Ny aXB0VmFsdWUuaApAQCAtNDAsNiArNDAsMTggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFz cyBTZXJpYWxpemVkU2NyaXB0VmFsdWUgOiBwdWJsaWMgUmVmQ291bnRlZDxTZXJpYWxpemVkU2Ny aXB0VmFsdWU+IHsKIHB1YmxpYzoKKyAgICAvLyBEZXNlcmlhbGl6ZXMgdGhlIGdpdmVuIHZhbHVl IGFuZCBzZXRzIGl0IGFzIGEgcHJvcGVydHkgb24gdGhlCisgICAgLy8gb2JqZWN0LgorICAgIHN0 YXRpYyB2b2lkIGRlc2VyaWFsaXplQW5kU2V0UHJvcGVydHkodjg6OkhhbmRsZTx2ODo6T2JqZWN0 PiBvYmplY3QsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBjaGFyKiBwcm9wZXJ0eU5hbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB2ODo6UHJvcGVydHlBdHRyaWJ1dGUgYXR0cmlidXRlLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgU2VyaWFsaXplZFNjcmlwdFZhbHVlKiB2YWx1ZSkK KyAgICB7CisgICAgICAgIEFTU0VSVCh2YWx1ZSk7CisgICAgICAgIHY4OjpIYW5kbGU8djg6OlZh bHVlPiBkZXNlcmlhbGl6ZWQgPSB2YWx1ZS0+ZGVzZXJpYWxpemUoKTsKKyAgICAgICAgb2JqZWN0 LT5Gb3JjZVNldCh2ODo6U3RyaW5nOjpOZXdTeW1ib2wocHJvcGVydHlOYW1lKSwgZGVzZXJpYWxp emVkLCBhdHRyaWJ1dGUpOworICAgIH0KKwogICAgIC8vIENyZWF0ZXMgYSBzZXJpYWxpemVkIHJl cHJlc2VudGF0aW9uIG9mIHRoZSBnaXZlbiBWOCB2YWx1ZS4KICAgICBzdGF0aWMgUGFzc1JlZlB0 cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IGNyZWF0ZSh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFs dWUpCiAgICAgewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNz YWdlRXZlbnRDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdl RXZlbnRDdXN0b20uY3BwCmluZGV4IGQ0MWE3ODUuLmNjYTRhMjQgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2FnZUV2ZW50Q3VzdG9tLmNwcAorKysgYi9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VFdmVudEN1c3RvbS5jcHAKQEAgLTg0LDYg Kzg0LDggQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4TWVzc2FnZUV2ZW50Ojppbml0TWVzc2Fn ZUV2ZW50Q2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW4KICAgICAgICAgICAgIHJldHVybiB2ODo6 VW5kZWZpbmVkKCk7CiAgICAgfQogICAgIGV2ZW50LT5pbml0TWVzc2FnZUV2ZW50KHR5cGVBcmcs IGNhbkJ1YmJsZUFyZywgY2FuY2VsYWJsZUFyZywgZGF0YUFyZy5yZWxlYXNlKCksIG9yaWdpbkFy ZywgbGFzdEV2ZW50SWRBcmcsIHNvdXJjZUFyZywgcG9ydEFycmF5LnJlbGVhc2UoKSk7CisgICAg djg6OlByb3BlcnR5QXR0cmlidXRlIGRhdGFBdHRyID0gc3RhdGljX2Nhc3Q8djg6OlByb3BlcnR5 QXR0cmlidXRlPih2ODo6RG9udERlbGV0ZSB8IHY4OjpSZWFkT25seSk7CisgICAgU2VyaWFsaXpl ZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZUFuZFNldFByb3BlcnR5KGFyZ3MuSG9sZGVyKCksICJk YXRhIiwgZGF0YUF0dHIsIGV2ZW50LT5kYXRhKCkpOwogICAgIHJldHVybiB2ODo6VW5kZWZpbmVk KCk7CiAgIH0KIAo=