119422 2013-08-01 19:08:25 -0700 hasIndexingHeader should be a property of the Structure, not just the IndexingType 2013-08-02 11:26:52 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 119064 1 fpizlo fpizlo barraclough eflews.bot ggaren gyuyoung.kim mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 913961 0 fpizlo 2013-08-01 19:08:25 -0700 Patch forthcoming. 913965 1 207974 fpizlo 2013-08-01 19:14:31 -0700 Created attachment 207974 the patch 913966 2 207974 mhahnenberg 2013-08-01 19:17:01 -0700 Comment on attachment 207974 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=207974&action=review > Source/JavaScriptCore/runtime/Structure.h:233 > + return hasIndexedProperties(indexingType()); Perhaps hasIndexedProperties() should be moved into Structure as well for the sake of consistency? 913968 3 fpizlo 2013-08-01 19:18:32 -0700 (In reply to comment #2) > (From update of attachment 207974 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=207974&action=review > > > Source/JavaScriptCore/runtime/Structure.h:233 > > + return hasIndexedProperties(indexingType()); > > Perhaps hasIndexedProperties() should be moved into Structure as well for the sake of consistency? We sometimes call that one without having a Structure*, as you would sort of expect: the point is that the indexing type always entirely determines whether or not you have indexed properties, in the pure-JS-object sense (rather than the typed-array or string sense). 913978 4 207974 eflews.bot 2013-08-01 19:40:30 -0700 Comment on attachment 207974 the patch Attachment 207974 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1330019 914218 5 fpizlo 2013-08-02 11:26:52 -0700 Landed in http://trac.webkit.org/changeset/153657 207974 2013-08-01 19:14:31 -0700 2013-08-02 10:09:09 -0700 the patch blah.patch text/plain 11520 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTUzNjMzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBA CisyMDEzLTA4LTAxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg aGFzSW5kZXhpbmdIZWFkZXIgc2hvdWxkIGJlIGEgcHJvcGVydHkgb2YgdGhlIFN0cnVjdHVyZSwg bm90IGp1c3QgdGhlIEluZGV4aW5nVHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NDIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisgICAgICAgIAorICAgICAgICBUaGlzIHNpbXBsaWZpZXMgc29tZSBjb2RlIGFuZCBh bHNvIGFsbG93cyBTdHJ1Y3R1cmUgdG8gY2xhaW0gdGhhdCBhbiBvYmplY3QKKyAgICAgICAgaGFz IGFuIGluZGV4aW5nIGhlYWRlciBldmVuIGlmIGl0IGRvZXNuJ3QgaGF2ZSBpbmRleGVkIHByb3Bl cnRpZXMuCisgICAgICAgIAorICAgICAgICBJIGFsc28gY2hhbmdlZCBzb21lIGNhbGxzIHRvIHVz ZSBoYXNJbmRleGVkUHJvcGVydGllcygpIHNpbmNlIGluIHNvbWUgY2FzZXMsCisgICAgICAgIHRo YXQncyB3aGF0IHdlIGFjdHVhbGx5IG1lYW50LiBDdXJyZW50bHkgdGhlIHR3byBhcmUgc3lub255 bXMuCisKKyAgICAgICAgKiBkZmcvREZHUmVwYXRjaC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6 dHJ5Q2FjaGVQdXRCeUlEKToKKyAgICAgICAgKEpTQzo6REZHOjp0cnlCdWlsZFB1dEJ5SWRMaXN0 KToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpE Rkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlQWxsb2NhdGVQcm9wZXJ0eVN0b3JhZ2UpOgorICAg ICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlUmVhbGxvY2F0ZVByb3BlcnR5 U3RvcmFnZSk6CisgICAgICAgICogcnVudGltZS9CdXR0ZXJmbHlJbmxpbmVzLmg6CisgICAgICAg IChKU0M6OkJ1dHRlcmZseTo6Y3JlYXRlKToKKyAgICAgICAgKEpTQzo6QnV0dGVyZmx5Ojpncm93 UHJvcGVydHlTdG9yYWdlKToKKyAgICAgICAgKEpTQzo6QnV0dGVyZmx5Ojpncm93QXJyYXlSaWdo dCk6CisgICAgICAgIChKU0M6OkJ1dHRlcmZseTo6cmVzaXplQXJyYXkpOgorICAgICAgICAqIHJ1 bnRpbWUvSW5kZXhpbmdUeXBlLmg6CisgICAgICAgICogcnVudGltZS9KU09iamVjdC5jcHA6Cisg ICAgICAgIChKU0M6OkpTT2JqZWN0Ojpjb3B5QnV0dGVyZmx5KToKKyAgICAgICAgKEpTQzo6SlNP YmplY3Q6OnZpc2l0QnV0dGVyZmx5KToKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OnNldFByb3Rv dHlwZSk6CisgICAgICAgICogcnVudGltZS9KU09iamVjdC5oOgorICAgICAgICAoSlNDOjpKU09i amVjdDo6c2V0QnV0dGVyZmx5KToKKyAgICAgICAgKiBydW50aW1lL0pTUHJvcGVydHlOYW1lSXRl cmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpKU1Byb3BlcnR5TmFtZUl0ZXJhdG9yOjpjcmVhdGUp OgorICAgICAgICAqIHJ1bnRpbWUvU3RydWN0dXJlLmg6CisgICAgICAgIChKU0M6OlN0cnVjdHVy ZTo6aGFzSW5kZXhpbmdIZWFkZXIpOgorCiAyMDEzLTA4LTAxICBSdXRoIEZvbmcgIDxydXRoX2Zv bmdAYXBwbGUuY29tPgogCiAgICAgICAgIFtGb3JtczogY29sb3JdIDxpbnB1dCB0eXBlPSdjb2xv cic+IHBvcG92ZXIgY29sb3Igd2VsbCBpbXBsZW1lbnRhdGlvbgpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdSZXBhdGNoLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1JlcGF0Y2guY3BwCShyZXZpc2lvbiAxNTM2MzEpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1JlcGF0Y2guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NjUs NyArOTY1LDcgQEAgc3RhdGljIGJvb2wgdHJ5Q2FjaGVQdXRCeUlEKEV4ZWNTdGF0ZSogZQogICAg ICAgICAgICAgCiAgICAgICAgICAgICAvLyBTa2lwIG9wdGltaXppbmcgdGhlIGNhc2Ugd2hlcmUg d2UgbmVlZCByZWFsbG9jLCBhbmQgdGhlIHN0cnVjdHVyZSBoYXMKICAgICAgICAgICAgIC8vIGlu ZGV4aW5nIHN0b3JhZ2UuCi0gICAgICAgICAgICBpZiAoaGFzSW5kZXhpbmdIZWFkZXIob2xkU3Ry dWN0dXJlLT5pbmRleGluZ1R5cGUoKSkpCisgICAgICAgICAgICBpZiAob2xkU3RydWN0dXJlLT5o YXNJbmRleGluZ0hlYWRlcigpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgICAgIAogICAgICAgICAgICAgaWYgKG5vcm1hbGl6ZVByb3RvdHlwZUNoYWluKGV4ZWMsIGJh c2VDZWxsKSA9PSBJbnZhbGlkUHJvdG90eXBlQ2hhaW4pCkBAIC0xMDQwLDcgKzEwNDAsNyBAQCBz dGF0aWMgYm9vbCB0cnlCdWlsZFB1dEJ5SWRMaXN0KEV4ZWNTdGF0CiAgICAgICAgICAgICAKICAg ICAgICAgICAgIC8vIFNraXAgb3B0aW1pemluZyB0aGUgY2FzZSB3aGVyZSB3ZSBuZWVkIHJlYWxs b2MsIGFuZCB0aGUgc3RydWN0dXJlIGhhcwogICAgICAgICAgICAgLy8gaW5kZXhpbmcgc3RvcmFn ZS4KLSAgICAgICAgICAgIGlmIChoYXNJbmRleGluZ0hlYWRlcihvbGRTdHJ1Y3R1cmUtPmluZGV4 aW5nVHlwZSgpKSkKKyAgICAgICAgICAgIGlmIChvbGRTdHJ1Y3R1cmUtPmhhc0luZGV4aW5nSGVh ZGVyKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgCiAgICAg ICAgICAgICBpZiAobm9ybWFsaXplUHJvdG90eXBlQ2hhaW4oZXhlYywgYmFzZUNlbGwpID09IElu dmFsaWRQcm90b3R5cGVDaGFpbikKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCShyZXZpc2lvbiAxNTM2MzEpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDI1OSw3ICs0MjU5LDcgQEAgYm9vbCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVJlZ0V4cEV4ZWMo TgogCiB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlQWxsb2NhdGVQcm9wZXJ0eVN0b3JhZ2Uo Tm9kZSogbm9kZSkKIHsKLSAgICBpZiAoaGFzSW5kZXhpbmdIZWFkZXIobm9kZS0+c3RydWN0dXJl VHJhbnNpdGlvbkRhdGEoKS5wcmV2aW91c1N0cnVjdHVyZS0+aW5kZXhpbmdUeXBlKCkpKSB7Cisg ICAgaWYgKG5vZGUtPnN0cnVjdHVyZVRyYW5zaXRpb25EYXRhKCkucHJldmlvdXNTdHJ1Y3R1cmUt Pmhhc0luZGV4aW5nSGVhZGVyKCkpIHsKICAgICAgICAgU3BlY3VsYXRlQ2VsbE9wZXJhbmQgYmFz ZSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgIAogICAgICAgICBHUFJSZWcgYmFzZUdQ UiA9IGJhc2UuZ3ByKCk7CkBAIC00MzAyLDcgKzQzMDIsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklU Ojpjb21waWxlUmVhbGxvY2F0ZVByCiAgICAgc2l6ZV90IG5ld1NpemUgPSBvbGRTaXplICogb3V0 T2ZMaW5lR3Jvd3RoRmFjdG9yOwogICAgIEFTU0VSVChuZXdTaXplID09IG5vZGUtPnN0cnVjdHVy ZVRyYW5zaXRpb25EYXRhKCkubmV3U3RydWN0dXJlLT5vdXRPZkxpbmVDYXBhY2l0eSgpICogc2l6 ZW9mKEpTVmFsdWUpKTsKIAotICAgIGlmIChoYXNJbmRleGluZ0hlYWRlcihub2RlLT5zdHJ1Y3R1 cmVUcmFuc2l0aW9uRGF0YSgpLnByZXZpb3VzU3RydWN0dXJlLT5pbmRleGluZ1R5cGUoKSkpIHsK KyAgICBpZiAobm9kZS0+c3RydWN0dXJlVHJhbnNpdGlvbkRhdGEoKS5wcmV2aW91c1N0cnVjdHVy ZS0+aGFzSW5kZXhpbmdIZWFkZXIoKSkgewogICAgICAgICBTcGVjdWxhdGVDZWxsT3BlcmFuZCBi YXNlKHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgCiAgICAgICAgIEdQUlJlZyBiYXNl R1BSID0gYmFzZS5ncHIoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0J1 dHRlcmZseUlubGluZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9CdXR0ZXJmbHlJbmxpbmVzLmgJKHJldmlzaW9uIDE1MzYzMSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0J1dHRlcmZseUlubGluZXMuaAkod29ya2luZyBjb3B5KQpAQCAt NTgsNyArNTgsNyBAQCBpbmxpbmUgQnV0dGVyZmx5KiBCdXR0ZXJmbHk6OmNyZWF0ZShWTSYgCiB7 CiAgICAgcmV0dXJuIGNyZWF0ZSgKICAgICAgICAgdm0sIGludGVuZGVkT3duZXIsIDAsIHN0cnVj dHVyZS0+b3V0T2ZMaW5lQ2FwYWNpdHkoKSwKLSAgICAgICAgaGFzSW5kZXhpbmdIZWFkZXIoc3Ry dWN0dXJlLT5pbmRleGluZ1R5cGUoKSksIEluZGV4aW5nSGVhZGVyKCksIDApOworICAgICAgICBz dHJ1Y3R1cmUtPmhhc0luZGV4aW5nSGVhZGVyKCksIEluZGV4aW5nSGVhZGVyKCksIDApOwogfQog CiBpbmxpbmUgQnV0dGVyZmx5KiBCdXR0ZXJmbHk6OmNyZWF0ZVVuaW5pdGlhbGl6ZWREdXJpbmdD b2xsZWN0aW9uKENvcHlWaXNpdG9yJiB2aXNpdG9yLCBzaXplX3QgcHJlQ2FwYWNpdHksIHNpemVf dCBwcm9wZXJ0eUNhcGFjaXR5LCBib29sIGhhc0luZGV4aW5nSGVhZGVyLCBzaXplX3QgaW5kZXhp bmdQYXlsb2FkU2l6ZUluQnl0ZXMpCkBAIC05Niw3ICs5Niw3IEBAIGlubGluZSBCdXR0ZXJmbHkq IEJ1dHRlcmZseTo6Z3Jvd1Byb3BlcnQKIHsKICAgICByZXR1cm4gZ3Jvd1Byb3BlcnR5U3RvcmFn ZSgKICAgICAgICAgdm0sIGludGVuZGVkT3duZXIsIGluZGV4aW5nSGVhZGVyKCktPnByZUNhcGFj aXR5KHN0cnVjdHVyZSksIG9sZFByb3BlcnR5Q2FwYWNpdHksCi0gICAgICAgIGhhc0luZGV4aW5n SGVhZGVyKHN0cnVjdHVyZS0+aW5kZXhpbmdUeXBlKCkpLAorICAgICAgICBzdHJ1Y3R1cmUtPmhh c0luZGV4aW5nSGVhZGVyKCksCiAgICAgICAgIGluZGV4aW5nSGVhZGVyKCktPmluZGV4aW5nUGF5 bG9hZFNpemVJbkJ5dGVzKHN0cnVjdHVyZSksIG5ld1Byb3BlcnR5Q2FwYWNpdHkpOwogfQogCkBA IC0xMjksNyArMTI5LDcgQEAgaW5saW5lIEJ1dHRlcmZseSogQnV0dGVyZmx5Ojpncm93QXJyYXlS aQogICAgIHNpemVfdCBuZXdJbmRleGluZ1BheWxvYWRTaXplSW5CeXRlcykKIHsKICAgICBBU1NF UlRfVU5VU0VEKG9sZFN0cnVjdHVyZSwgIWluZGV4aW5nSGVhZGVyKCktPnByZUNhcGFjaXR5KG9s ZFN0cnVjdHVyZSkpOwotICAgIEFTU0VSVF9VTlVTRUQob2xkU3RydWN0dXJlLCBoYWRJbmRleGlu Z0hlYWRlciA9PSBoYXNJbmRleGluZ0hlYWRlcihvbGRTdHJ1Y3R1cmUtPmluZGV4aW5nVHlwZSgp KSk7CisgICAgQVNTRVJUX1VOVVNFRChvbGRTdHJ1Y3R1cmUsIGhhZEluZGV4aW5nSGVhZGVyID09 IG9sZFN0cnVjdHVyZS0+aGFzSW5kZXhpbmdIZWFkZXIoKSk7CiAgICAgdm9pZCogdGhlQmFzZSA9 IGJhc2UoMCwgcHJvcGVydHlDYXBhY2l0eSk7CiAgICAgc2l6ZV90IG9sZFNpemUgPSB0b3RhbFNp emUoMCwgcHJvcGVydHlDYXBhY2l0eSwgaGFkSW5kZXhpbmdIZWFkZXIsIG9sZEluZGV4aW5nUGF5 bG9hZFNpemVJbkJ5dGVzKTsKICAgICBzaXplX3QgbmV3U2l6ZSA9IHRvdGFsU2l6ZSgwLCBwcm9w ZXJ0eUNhcGFjaXR5LCB0cnVlLCBuZXdJbmRleGluZ1BheWxvYWRTaXplSW5CeXRlcyk7CkBAIC0x NDQsOCArMTQ0LDkgQEAgaW5saW5lIEJ1dHRlcmZseSogQnV0dGVyZmx5Ojpncm93QXJyYXlSaQog ewogICAgIHJldHVybiBncm93QXJyYXlSaWdodCgKICAgICAgICAgdm0sIGludGVuZGVkT3duZXIs IG9sZFN0cnVjdHVyZSwgb2xkU3RydWN0dXJlLT5vdXRPZkxpbmVDYXBhY2l0eSgpLAotICAgICAg ICBoYXNJbmRleGluZ0hlYWRlcihvbGRTdHJ1Y3R1cmUtPmluZGV4aW5nVHlwZSgpKSwKLSAgICAg ICAgaW5kZXhpbmdIZWFkZXIoKS0+aW5kZXhpbmdQYXlsb2FkU2l6ZUluQnl0ZXMob2xkU3RydWN0 dXJlKSwgbmV3SW5kZXhpbmdQYXlsb2FkU2l6ZUluQnl0ZXMpOworICAgICAgICBvbGRTdHJ1Y3R1 cmUtPmhhc0luZGV4aW5nSGVhZGVyKCksIAorICAgICAgICBpbmRleGluZ0hlYWRlcigpLT5pbmRl eGluZ1BheWxvYWRTaXplSW5CeXRlcyhvbGRTdHJ1Y3R1cmUpLAorICAgICAgICBuZXdJbmRleGlu Z1BheWxvYWRTaXplSW5CeXRlcyk7CiB9CiAKIGlubGluZSBCdXR0ZXJmbHkqIEJ1dHRlcmZseTo6 cmVzaXplQXJyYXkoCkBAIC0xNzEsNyArMTcyLDcgQEAgaW5saW5lIEJ1dHRlcmZseSogQnV0dGVy Zmx5OjpyZXNpemVBcnJheQogICAgIFZNJiB2bSwgSlNDZWxsKiBpbnRlbmRlZE93bmVyLCBTdHJ1 Y3R1cmUqIHN0cnVjdHVyZSwgc2l6ZV90IG5ld1ByZUNhcGFjaXR5LAogICAgIHNpemVfdCBuZXdJ bmRleGluZ1BheWxvYWRTaXplSW5CeXRlcykKIHsKLSAgICBib29sIGhhc0luZGV4aW5nSGVhZGVy ID0gSlNDOjpoYXNJbmRleGluZ0hlYWRlcihzdHJ1Y3R1cmUtPmluZGV4aW5nVHlwZSgpKTsKKyAg ICBib29sIGhhc0luZGV4aW5nSGVhZGVyID0gc3RydWN0dXJlLT5oYXNJbmRleGluZ0hlYWRlcigp OwogICAgIHJldHVybiByZXNpemVBcnJheSgKICAgICAgICAgdm0sIGludGVuZGVkT3duZXIsIHN0 cnVjdHVyZS0+b3V0T2ZMaW5lQ2FwYWNpdHkoKSwgaGFzSW5kZXhpbmdIZWFkZXIsCiAgICAgICAg IGluZGV4aW5nSGVhZGVyKCktPmluZGV4aW5nUGF5bG9hZFNpemVJbkJ5dGVzKHN0cnVjdHVyZSks IG5ld1ByZUNhcGFjaXR5LApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW5k ZXhpbmdUeXBlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SW5kZXhpbmdUeXBlLmgJKHJldmlzaW9uIDE1MzYzMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0luZGV4aW5nVHlwZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDEsMTEgKzEwMSw2 IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBoYXNJbmRleGVkUHJvcGVydGllcygKICAgICByZXR1cm4g KGluZGV4aW5nVHlwZSAmIEluZGV4aW5nU2hhcGVNYXNrKSAhPSBOb0luZGV4aW5nU2hhcGU7CiB9 CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBoYXNJbmRleGluZ0hlYWRlcihJbmRleGluZ1R5cGUgdHlw ZSkKLXsKLSAgICByZXR1cm4gaGFzSW5kZXhlZFByb3BlcnRpZXModHlwZSk7Ci19Ci0KIHN0YXRp YyBpbmxpbmUgYm9vbCBoYXNVbmRlY2lkZWQoSW5kZXhpbmdUeXBlIGluZGV4aW5nVHlwZSkKIHsK ICAgICByZXR1cm4gKGluZGV4aW5nVHlwZSAmIEluZGV4aW5nU2hhcGVNYXNrKSA9PSBVbmRlY2lk ZWRTaGFwZTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5j cHAJKHJldmlzaW9uIDE1MzYzMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT T2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAyLDcgKzEwMiw3IEBAIEFMV0FZU19JTkxJ TkUgdm9pZCBKU09iamVjdDo6Y29weUJ1dHRlcmYKICAgICBzaXplX3QgcHJvcGVydHlDYXBhY2l0 eSA9IHN0cnVjdHVyZS0+b3V0T2ZMaW5lQ2FwYWNpdHkoKTsKICAgICBzaXplX3QgcHJlQ2FwYWNp dHk7CiAgICAgc2l6ZV90IGluZGV4aW5nUGF5bG9hZFNpemVJbkJ5dGVzOwotICAgIGJvb2wgaGFz SW5kZXhpbmdIZWFkZXIgPSBKU0M6Omhhc0luZGV4aW5nSGVhZGVyKHN0cnVjdHVyZS0+aW5kZXhp bmdUeXBlKCkpOworICAgIGJvb2wgaGFzSW5kZXhpbmdIZWFkZXIgPSBzdHJ1Y3R1cmUtPmhhc0lu ZGV4aW5nSGVhZGVyKCk7CiAgICAgaWYgKFVOTElLRUxZKGhhc0luZGV4aW5nSGVhZGVyKSkgewog ICAgICAgICBwcmVDYXBhY2l0eSA9IGJ1dHRlcmZseS0+aW5kZXhpbmdIZWFkZXIoKS0+cHJlQ2Fw YWNpdHkoc3RydWN0dXJlKTsKICAgICAgICAgaW5kZXhpbmdQYXlsb2FkU2l6ZUluQnl0ZXMgPSBi dXR0ZXJmbHktPmluZGV4aW5nSGVhZGVyKCktPmluZGV4aW5nUGF5bG9hZFNpemVJbkJ5dGVzKHN0 cnVjdHVyZSk7CkBAIC0xNDgsOCArMTQ4LDggQEAgQUxXQVlTX0lOTElORSB2b2lkIEpTT2JqZWN0 Ojpjb3B5QnV0dGVyZgogICAgICAgICAgICAgICAgIGNvdW50ID0gbmV3QnV0dGVyZmx5LT5hcnJh eVN0b3JhZ2UoKS0+dmVjdG9yTGVuZ3RoKCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICB9CisgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICBkZWZhdWx0OgotICAgICAg ICAgICAgICAgIENSQVNIKCk7CiAgICAgICAgICAgICAgICAgY3VycmVudFRhcmdldCA9IDA7CiAg ICAgICAgICAgICAgICAgY3VycmVudFNvdXJjZSA9IDA7CiAgICAgICAgICAgICAgICAgY291bnQg PSAwOwpAQCAtMTczLDcgKzE3Myw3IEBAIEFMV0FZU19JTkxJTkUgdm9pZCBKU09iamVjdDo6dmlz aXRCdXR0ZXIKICAgICBzaXplX3QgcHJvcGVydHlDYXBhY2l0eSA9IHN0cnVjdHVyZS0+b3V0T2ZM aW5lQ2FwYWNpdHkoKTsKICAgICBzaXplX3QgcHJlQ2FwYWNpdHk7CiAgICAgc2l6ZV90IGluZGV4 aW5nUGF5bG9hZFNpemVJbkJ5dGVzOwotICAgIGJvb2wgaGFzSW5kZXhpbmdIZWFkZXIgPSBKU0M6 Omhhc0luZGV4aW5nSGVhZGVyKHN0cnVjdHVyZS0+aW5kZXhpbmdUeXBlKCkpOworICAgIGJvb2wg aGFzSW5kZXhpbmdIZWFkZXIgPSBzdHJ1Y3R1cmUtPmhhc0luZGV4aW5nSGVhZGVyKCk7CiAgICAg aWYgKFVOTElLRUxZKGhhc0luZGV4aW5nSGVhZGVyKSkgewogICAgICAgICBwcmVDYXBhY2l0eSA9 IGJ1dHRlcmZseS0+aW5kZXhpbmdIZWFkZXIoKS0+cHJlQ2FwYWNpdHkoc3RydWN0dXJlKTsKICAg ICAgICAgaW5kZXhpbmdQYXlsb2FkU2l6ZUluQnl0ZXMgPSBidXR0ZXJmbHktPmluZGV4aW5nSGVh ZGVyKCktPmluZGV4aW5nUGF5bG9hZFNpemVJbkJ5dGVzKHN0cnVjdHVyZSk7CkBAIC0xMTQ2LDcg KzExNDYsNyBAQCB2b2lkIEpTT2JqZWN0OjpzZXRQcm90b3R5cGUoVk0mIHZtLCBKU1ZhCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAgICAgCi0gICAgaWYgKCFoYXNJbmRleGluZ0hlYWRlcihzdHJ1 Y3R1cmUoKS0+aW5kZXhpbmdUeXBlKCkpKQorICAgIGlmICghaGFzSW5kZXhlZFByb3BlcnRpZXMo c3RydWN0dXJlKCktPmluZGV4aW5nVHlwZSgpKSkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAg IGlmIChzaG91bGRVc2VTbG93UHV0KHN0cnVjdHVyZSgpLT5pbmRleGluZ1R5cGUoKSkpCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgJKHJldmlzaW9uIDE1MzYz MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgJKHdvcmtpbmcg Y29weSkKQEAgLTExMDcsNyArMTEwNyw3IEBAIGlubGluZSBib29sIEpTT2JqZWN0Ojppc0Vycm9y SW5zdGFuY2UoKSAKIGlubGluZSB2b2lkIEpTT2JqZWN0OjpzZXRCdXR0ZXJmbHkoVk0mIHZtLCBC dXR0ZXJmbHkqIGJ1dHRlcmZseSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUpCiB7CiAgICAgQVNTRVJU KHN0cnVjdHVyZSk7Ci0gICAgQVNTRVJUKCFidXR0ZXJmbHkgPT0gKCFzdHJ1Y3R1cmUtPm91dE9m TGluZUNhcGFjaXR5KCkgJiYgIWhhc0luZGV4aW5nSGVhZGVyKHN0cnVjdHVyZS0+aW5kZXhpbmdU eXBlKCkpKSk7CisgICAgQVNTRVJUKCFidXR0ZXJmbHkgPT0gKCFzdHJ1Y3R1cmUtPm91dE9mTGlu ZUNhcGFjaXR5KCkgJiYgIXN0cnVjdHVyZS0+aGFzSW5kZXhpbmdIZWFkZXIoKSkpOwogICAgIHNl dFN0cnVjdHVyZSh2bSwgc3RydWN0dXJlKTsKICAgICBtX2J1dHRlcmZseSA9IGJ1dHRlcmZseTsK IH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTUHJvcGVydHlOYW1lSXRl cmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT UHJvcGVydHlOYW1lSXRlcmF0b3IuY3BwCShyZXZpc2lvbiAxNTM2MzEpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU1Byb3BlcnR5TmFtZUl0ZXJhdG9yLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjUsNyArNjUsNyBAQCBKU1Byb3BlcnR5TmFtZUl0ZXJhdG9yKiBKU1Byb3BlcnR5 TmFtZUl0CiAgICAgaWYgKG8tPnN0cnVjdHVyZSgpLT50eXBlSW5mbygpLm92ZXJyaWRlc0dldFBy b3BlcnR5TmFtZXMoKSkKICAgICAgICAgcmV0dXJuIGpzUHJvcGVydHlOYW1lSXRlcmF0b3I7CiAg ICAgCi0gICAgaWYgKGhhc0luZGV4aW5nSGVhZGVyKG8tPnN0cnVjdHVyZSgpLT5pbmRleGluZ1R5 cGUoKSkpCisgICAgaWYgKGhhc0luZGV4ZWRQcm9wZXJ0aWVzKG8tPnN0cnVjdHVyZSgpLT5pbmRl eGluZ1R5cGUoKSkpCiAgICAgICAgIHJldHVybiBqc1Byb3BlcnR5TmFtZUl0ZXJhdG9yOwogICAg IAogICAgIHNpemVfdCBjb3VudCA9IG5vcm1hbGl6ZVByb3RvdHlwZUNoYWluKGV4ZWMsIG8pOwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmgJKHJldmlzaW9u IDE1MzYzMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yMjcsNiArMjI3LDExIEBAIHB1YmxpYzoKICAgICAgICAgICAgICYm IG9mZnNldCA8PSBtX29mZnNldAogICAgICAgICAgICAgJiYgKG9mZnNldCA8IG1faW5saW5lQ2Fw YWNpdHkgfHwgb2Zmc2V0ID49IGZpcnN0T3V0T2ZMaW5lT2Zmc2V0KTsKICAgICB9CisgICAgCisg ICAgYm9vbCBoYXNJbmRleGluZ0hlYWRlcigpIGNvbnN0CisgICAgeworICAgICAgICByZXR1cm4g aGFzSW5kZXhlZFByb3BlcnRpZXMoaW5kZXhpbmdUeXBlKCkpOworICAgIH0KIAogICAgIGJvb2wg bWFzcXVlcmFkZXNBc1VuZGVmaW5lZChKU0dsb2JhbE9iamVjdCogbGV4aWNhbEdsb2JhbE9iamVj dCk7CiAK