31871 2009-11-25 07:12:08 -0800 REGRESSION (r50704): Incorrect property caching due to flattenDictionaryStructure (breaks google maps) 2010-04-23 14:52:27 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac (PowerPC) OS X 10.5 RESOLVED FIXED http://maps.google.com InRadar, Regression P1 Normal --- 0 koenvanderdrift webkit-unassigned fabien.coeurjoly ggaren mrowe oldest_to_newest 166423 0 koenvanderdrift 2009-11-25 07:12:08 -0800 When loading a Google maps page, many of the buttons in the map view are shifted around and/or not working. For instance, the street view puppet is not usable, and even disappears from the screen. This only occurs with the recent nightly builds since about 2 weeks. The regualr Safari 4.0.4 does not do this and Google maps works as expected. 170432 1 fabien.coeurjoly 2009-12-10 08:35:19 -0800 I can confirm this bug on a PowerPC machine too. This bug has been introduced recently, and apparently it seems to happen when JIT is disabled (which is obviously the case on PPC architecture). The bug can also be reproduced on x86 when JIT is disabled. 170521 2 ap 2009-12-10 14:13:39 -0800 See also: bug 32153. 170523 3 ap 2009-12-10 14:15:01 -0800 <rdar://problem/7461971> 181305 4 46696 ggaren 2010-01-15 12:14:14 -0800 Created attachment 46696 Patch 181307 5 46696 oliver 2010-01-15 12:16:03 -0800 Comment on attachment 46696 Patch r=me, assuming no perf hit 181327 6 ggaren 2010-01-15 12:49:14 -0800 Committed r53341: <http://trac.webkit.org/changeset/53341> 181331 7 ggaren 2010-01-15 12:51:00 -0800 *** Bug 33446 has been marked as a duplicate of this bug. *** 46696 2010-01-15 12:14:14 -0800 2010-01-15 12:16:02 -0800 Patch bug-31871-20100115121413.patch text/plain 13247 ggaren SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUzMzIyKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDEtMTQgIEdlb2ZmcmV5 IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBOZWVkIGEgc2hvcnQgZGVzY3JpcHRpb24gYW5kIGJ1ZyBVUkwg KE9PUFMhKQorCisgICAgICAgICogaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwOgorICAgICAg ICAoSlNDOjpJbnRlcnByZXRlcjo6dHJ5Q2FjaGVHZXRCeUlEKTogVXBkYXRlIG91ciBjYWNoZWQg b2Zmc2V0IGluIGNhc2UKKyAgICAgICAgZmxhdHRlbmluZyB0aGUgZGljdGlvbmFyeSBjaGFuZ2Vk IGFueSBvZiBpdHMgb2Zmc2V0cy4KKworICAgICAgICAqIGppdC9KSVRTdHVicy5jcHA6CisgICAg ICAgIChKU0M6OkpJVFRodW5rczo6dHJ5Q2FjaGVHZXRCeUlEKToKKyAgICAgICAgKEpTQzo6REVG SU5FX1NUVUJfRlVOQ1RJT04pOgorICAgICAgICAqIHJ1bnRpbWUvT3BlcmF0aW9ucy5oOgorICAg ICAgICAoSlNDOjpub3JtYWxpemVQcm90b3R5cGVDaGFpbik6IGRpdHRvCisKIDIwMTAtMDEtMTQg IEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9J bnRlcnByZXRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIv SW50ZXJwcmV0ZXIuY3BwCShyZXZpc2lvbiA1MzA5MCkKKysrIEphdmFTY3JpcHRDb3JlL2ludGVy cHJldGVyL0ludGVycHJldGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA0NCwyMyArMTA0NCwy NyBAQCBORVZFUl9JTkxJTkUgdm9pZCBJbnRlcnByZXRlcjo6dHJ5Q2FjaGVHCiAgICAgICAgIEFT U0VSVChzbG90LnNsb3RCYXNlKCkuaXNPYmplY3QoKSk7CiAKICAgICAgICAgSlNPYmplY3QqIGJh c2VPYmplY3QgPSBhc09iamVjdChzbG90LnNsb3RCYXNlKCkpOworICAgICAgICBzaXplX3Qgb2Zm c2V0ID0gc2xvdC5jYWNoZWRPZmZzZXQoKTsKIAogICAgICAgICAvLyBTaW5jZSB3ZSdyZSBhY2Nl c3NpbmcgYSBwcm90b3R5cGUgaW4gYSBsb29wLCBpdCdzIGEgZ29vZCBiZXQgdGhhdCBpdAogICAg ICAgICAvLyBzaG91bGQgbm90IGJlIHRyZWF0ZWQgYXMgYSBkaWN0aW9uYXJ5LgotICAgICAgICBp ZiAoYmFzZU9iamVjdC0+c3RydWN0dXJlKCktPmlzRGljdGlvbmFyeSgpKQorICAgICAgICBpZiAo YmFzZU9iamVjdC0+c3RydWN0dXJlKCktPmlzRGljdGlvbmFyeSgpKSB7CiAgICAgICAgICAgICBi YXNlT2JqZWN0LT5mbGF0dGVuRGljdGlvbmFyeU9iamVjdCgpOworICAgICAgICAgICAgb2Zmc2V0 ID0gYmFzZU9iamVjdC0+c3RydWN0dXJlKCktPmdldChwcm9wZXJ0eU5hbWUpOworICAgICAgICB9 CiAKICAgICAgICAgQVNTRVJUKCFiYXNlT2JqZWN0LT5zdHJ1Y3R1cmUoKS0+aXNVbmNhY2hlYWJs ZURpY3Rpb25hcnkoKSk7CiAKICAgICAgICAgdlBDWzBdID0gZ2V0T3Bjb2RlKG9wX2dldF9ieV9p ZF9wcm90byk7CiAgICAgICAgIHZQQ1s1XSA9IGJhc2VPYmplY3QtPnN0cnVjdHVyZSgpOwotICAg ICAgICB2UENbNl0gPSBzbG90LmNhY2hlZE9mZnNldCgpOworICAgICAgICB2UENbNl0gPSBvZmZz ZXQ7CiAKICAgICAgICAgY29kZUJsb2NrLT5yZWZTdHJ1Y3R1cmVzKHZQQyk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKLSAgICBzaXplX3QgY291bnQgPSBub3JtYWxpemVQcm90b3R5cGVDaGFp bihjYWxsRnJhbWUsIGJhc2VWYWx1ZSwgc2xvdC5zbG90QmFzZSgpKTsKKyAgICBzaXplX3Qgb2Zm c2V0ID0gc2xvdC5jYWNoZWRPZmZzZXQoKTsKKyAgICBzaXplX3QgY291bnQgPSBub3JtYWxpemVQ cm90b3R5cGVDaGFpbihjYWxsRnJhbWUsIGJhc2VWYWx1ZSwgc2xvdC5zbG90QmFzZSgpLCBwcm9w ZXJ0eU5hbWUsIG9mZnNldCk7CiAgICAgaWYgKCFjb3VudCkgewogICAgICAgICB2UENbMF0gPSBn ZXRPcGNvZGUob3BfZ2V0X2J5X2lkX2dlbmVyaWMpOwogICAgICAgICByZXR1cm47CkBAIC0xMDcw LDcgKzEwNzQsNyBAQCBORVZFUl9JTkxJTkUgdm9pZCBJbnRlcnByZXRlcjo6dHJ5Q2FjaGVHCiAg ICAgdlBDWzRdID0gc3RydWN0dXJlOwogICAgIHZQQ1s1XSA9IHN0cnVjdHVyZS0+cHJvdG90eXBl Q2hhaW4oY2FsbEZyYW1lKTsKICAgICB2UENbNl0gPSBjb3VudDsKLSAgICB2UENbN10gPSBzbG90 LmNhY2hlZE9mZnNldCgpOworICAgIHZQQ1s3XSA9IG9mZnNldDsKICAgICBjb2RlQmxvY2stPnJl ZlN0cnVjdHVyZXModlBDKTsKIH0KIApJbmRleDogSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3BwCShyZXZp c2lvbiA1MzA5MCkKKysrIEphdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTg4OSwyMSArODg5LDI1IEBAIE5FVkVSX0lOTElORSB2b2lkIEpJVFRodW5rczo6 dHJ5Q2FjaGVHZXQKICAgICAgICAgQVNTRVJUKHNsb3Quc2xvdEJhc2UoKS5pc09iamVjdCgpKTsK IAogICAgICAgICBKU09iamVjdCogc2xvdEJhc2VPYmplY3QgPSBhc09iamVjdChzbG90LnNsb3RC YXNlKCkpOwotCisgICAgICAgIHNpemVfdCBvZmZzZXQgPSBzbG90LmNhY2hlZE9mZnNldCgpOwor ICAgICAgICAKICAgICAgICAgLy8gU2luY2Ugd2UncmUgYWNjZXNzaW5nIGEgcHJvdG90eXBlIGlu IGEgbG9vcCwgaXQncyBhIGdvb2QgYmV0IHRoYXQgaXQKICAgICAgICAgLy8gc2hvdWxkIG5vdCBi ZSB0cmVhdGVkIGFzIGEgZGljdGlvbmFyeS4KLSAgICAgICAgaWYgKHNsb3RCYXNlT2JqZWN0LT5z dHJ1Y3R1cmUoKS0+aXNEaWN0aW9uYXJ5KCkpCisgICAgICAgIGlmIChzbG90QmFzZU9iamVjdC0+ c3RydWN0dXJlKCktPmlzRGljdGlvbmFyeSgpKSB7CiAgICAgICAgICAgICBzbG90QmFzZU9iamVj dC0+ZmxhdHRlbkRpY3Rpb25hcnlPYmplY3QoKTsKKyAgICAgICAgICAgIG9mZnNldCA9IHNsb3RC YXNlT2JqZWN0LT5zdHJ1Y3R1cmUoKS0+Z2V0KHByb3BlcnR5TmFtZSk7CisgICAgICAgIH0KICAg ICAgICAgCiAgICAgICAgIHN0dWJJbmZvLT5pbml0R2V0QnlJZFByb3RvKHN0cnVjdHVyZSwgc2xv dEJhc2VPYmplY3QtPnN0cnVjdHVyZSgpKTsKIAogICAgICAgICBBU1NFUlQoIXN0cnVjdHVyZS0+ aXNEaWN0aW9uYXJ5KCkpOwogICAgICAgICBBU1NFUlQoIXNsb3RCYXNlT2JqZWN0LT5zdHJ1Y3R1 cmUoKS0+aXNEaWN0aW9uYXJ5KCkpOwotICAgICAgICBKSVQ6OmNvbXBpbGVHZXRCeUlkUHJvdG8o Y2FsbEZyYW1lLT5zY29wZUNoYWluKCktPmdsb2JhbERhdGEsIGNhbGxGcmFtZSwgY29kZUJsb2Nr LCBzdHViSW5mbywgc3RydWN0dXJlLCBzbG90QmFzZU9iamVjdC0+c3RydWN0dXJlKCksIHNsb3Qu Y2FjaGVkT2Zmc2V0KCksIHJldHVybkFkZHJlc3MpOworICAgICAgICBKSVQ6OmNvbXBpbGVHZXRC eUlkUHJvdG8oY2FsbEZyYW1lLT5zY29wZUNoYWluKCktPmdsb2JhbERhdGEsIGNhbGxGcmFtZSwg Y29kZUJsb2NrLCBzdHViSW5mbywgc3RydWN0dXJlLCBzbG90QmFzZU9iamVjdC0+c3RydWN0dXJl KCksIG9mZnNldCwgcmV0dXJuQWRkcmVzcyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAg ICBzaXplX3QgY291bnQgPSBub3JtYWxpemVQcm90b3R5cGVDaGFpbihjYWxsRnJhbWUsIGJhc2VW YWx1ZSwgc2xvdC5zbG90QmFzZSgpKTsKKyAgICBzaXplX3Qgb2Zmc2V0ID0gc2xvdC5jYWNoZWRP ZmZzZXQoKTsKKyAgICBzaXplX3QgY291bnQgPSBub3JtYWxpemVQcm90b3R5cGVDaGFpbihjYWxs RnJhbWUsIGJhc2VWYWx1ZSwgc2xvdC5zbG90QmFzZSgpLCBwcm9wZXJ0eU5hbWUsIG9mZnNldCk7 CiAgICAgaWYgKCFjb3VudCkgewogICAgICAgICBzdHViSW5mby0+YWNjZXNzVHlwZSA9IGFjY2Vz c19nZXRfYnlfaWRfZ2VuZXJpYzsKICAgICAgICAgcmV0dXJuOwpAQCAtOTExLDcgKzkxNSw3IEBA IE5FVkVSX0lOTElORSB2b2lkIEpJVFRodW5rczo6dHJ5Q2FjaGVHZXQKIAogICAgIFN0cnVjdHVy ZUNoYWluKiBwcm90b3R5cGVDaGFpbiA9IHN0cnVjdHVyZS0+cHJvdG90eXBlQ2hhaW4oY2FsbEZy YW1lKTsKICAgICBzdHViSW5mby0+aW5pdEdldEJ5SWRDaGFpbihzdHJ1Y3R1cmUsIHByb3RvdHlw ZUNoYWluKTsKLSAgICBKSVQ6OmNvbXBpbGVHZXRCeUlkQ2hhaW4oY2FsbEZyYW1lLT5zY29wZUNo YWluKCktPmdsb2JhbERhdGEsIGNhbGxGcmFtZSwgY29kZUJsb2NrLCBzdHViSW5mbywgc3RydWN0 dXJlLCBwcm90b3R5cGVDaGFpbiwgY291bnQsIHNsb3QuY2FjaGVkT2Zmc2V0KCksIHJldHVybkFk ZHJlc3MpOworICAgIEpJVDo6Y29tcGlsZUdldEJ5SWRDaGFpbihjYWxsRnJhbWUtPnNjb3BlQ2hh aW4oKS0+Z2xvYmFsRGF0YSwgY2FsbEZyYW1lLCBjb2RlQmxvY2ssIHN0dWJJbmZvLCBzdHJ1Y3R1 cmUsIHByb3RvdHlwZUNoYWluLCBjb3VudCwgb2Zmc2V0LCByZXR1cm5BZGRyZXNzKTsKIH0KIAog I2VuZGlmIC8vIEVOQUJMRShKSVRfT1BUSU1JWkVfUFJPUEVSVFlfQUNDRVNTKQpAQCAtMTQzNiwx MCArMTQ0MCwxMSBAQCBERUZJTkVfU1RVQl9GVU5DVElPTihFbmNvZGVkSlNWYWx1ZSwgb3BfCiAg ICAgU1RVQl9JTklUX1NUQUNLX0ZSQU1FKHN0YWNrRnJhbWUpOwogCiAgICAgQ2FsbEZyYW1lKiBj YWxsRnJhbWUgPSBzdGFja0ZyYW1lLmNhbGxGcmFtZTsKKyAgICBjb25zdCBJZGVudGlmaWVyJiBw cm9wZXJ0eU5hbWUgPSBzdGFja0ZyYW1lLmFyZ3NbMV0uaWRlbnRpZmllcigpOwogCiAgICAgSlNW YWx1ZSBiYXNlVmFsdWUgPSBzdGFja0ZyYW1lLmFyZ3NbMF0uanNWYWx1ZSgpOwogICAgIFByb3Bl cnR5U2xvdCBzbG90KGJhc2VWYWx1ZSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBiYXNlVmFsdWUu Z2V0KGNhbGxGcmFtZSwgc3RhY2tGcmFtZS5hcmdzWzFdLmlkZW50aWZpZXIoKSwgc2xvdCk7Cisg ICAgSlNWYWx1ZSByZXN1bHQgPSBiYXNlVmFsdWUuZ2V0KGNhbGxGcmFtZSwgcHJvcGVydHlOYW1l LCBzbG90KTsKIAogICAgIENIRUNLX0ZPUl9FWENFUFRJT04oKTsKIApAQCAtMTQ1NCw2ICsxNDU5 LDggQEAgREVGSU5FX1NUVUJfRlVOQ1RJT04oRW5jb2RlZEpTVmFsdWUsIG9wXwogCiAgICAgQVNT RVJUKHNsb3Quc2xvdEJhc2UoKS5pc09iamVjdCgpKTsKICAgICBKU09iamVjdCogc2xvdEJhc2VP YmplY3QgPSBhc09iamVjdChzbG90LnNsb3RCYXNlKCkpOworICAgIAorICAgIHNpemVfdCBvZmZz ZXQgPSBzbG90LmNhY2hlZE9mZnNldCgpOwogCiAgICAgaWYgKHNsb3Quc2xvdEJhc2UoKSA9PSBi YXNlVmFsdWUpCiAgICAgICAgIGN0aVBhdGNoQ2FsbEJ5UmV0dXJuQWRkcmVzcyhjb2RlQmxvY2ss IFNUVUJfUkVUVVJOX0FERFJFU1MsIEZ1bmN0aW9uUHRyKGN0aV9vcF9nZXRfYnlfaWRfcHJvdG9f ZmFpbCkpOwpAQCAtMTQ2MSwyMyArMTQ2OCwyNSBAQCBERUZJTkVfU1RVQl9GVU5DVElPTihFbmNv ZGVkSlNWYWx1ZSwgb3BfCiAgICAgICAgIEFTU0VSVCghYXNDZWxsKGJhc2VWYWx1ZSktPnN0cnVj dHVyZSgpLT5pc0RpY3Rpb25hcnkoKSk7CiAgICAgICAgIC8vIFNpbmNlIHdlJ3JlIGFjY2Vzc2lu ZyBhIHByb3RvdHlwZSBpbiBhIGxvb3AsIGl0J3MgYSBnb29kIGJldCB0aGF0IGl0CiAgICAgICAg IC8vIHNob3VsZCBub3QgYmUgdHJlYXRlZCBhcyBhIGRpY3Rpb25hcnkuCi0gICAgICAgIGlmIChz bG90QmFzZU9iamVjdC0+c3RydWN0dXJlKCktPmlzRGljdGlvbmFyeSgpKQorICAgICAgICBpZiAo c2xvdEJhc2VPYmplY3QtPnN0cnVjdHVyZSgpLT5pc0RpY3Rpb25hcnkoKSkgewogICAgICAgICAg ICAgc2xvdEJhc2VPYmplY3QtPmZsYXR0ZW5EaWN0aW9uYXJ5T2JqZWN0KCk7CisgICAgICAgICAg ICBvZmZzZXQgPSBzbG90QmFzZU9iamVjdC0+c3RydWN0dXJlKCktPmdldChwcm9wZXJ0eU5hbWUp OworICAgICAgICB9CiAKICAgICAgICAgaW50IGxpc3RJbmRleDsKICAgICAgICAgUG9seW1vcnBo aWNBY2Nlc3NTdHJ1Y3R1cmVMaXN0KiBwcm90b3R5cGVTdHJ1Y3R1cmVMaXN0ID0gZ2V0UG9seW1v cnBoaWNBY2Nlc3NTdHJ1Y3R1cmVMaXN0U2xvdChzdHViSW5mbywgbGlzdEluZGV4KTsKIAotICAg ICAgICBKSVQ6OmNvbXBpbGVHZXRCeUlkUHJvdG9MaXN0KGNhbGxGcmFtZS0+c2NvcGVDaGFpbigp LT5nbG9iYWxEYXRhLCBjYWxsRnJhbWUsIGNvZGVCbG9jaywgc3R1YkluZm8sIHByb3RvdHlwZVN0 cnVjdHVyZUxpc3QsIGxpc3RJbmRleCwgc3RydWN0dXJlLCBzbG90QmFzZU9iamVjdC0+c3RydWN0 dXJlKCksIHNsb3QuY2FjaGVkT2Zmc2V0KCkpOworICAgICAgICBKSVQ6OmNvbXBpbGVHZXRCeUlk UHJvdG9MaXN0KGNhbGxGcmFtZS0+c2NvcGVDaGFpbigpLT5nbG9iYWxEYXRhLCBjYWxsRnJhbWUs IGNvZGVCbG9jaywgc3R1YkluZm8sIHByb3RvdHlwZVN0cnVjdHVyZUxpc3QsIGxpc3RJbmRleCwg c3RydWN0dXJlLCBzbG90QmFzZU9iamVjdC0+c3RydWN0dXJlKCksIG9mZnNldCk7CiAKICAgICAg ICAgaWYgKGxpc3RJbmRleCA9PSAoUE9MWU1PUlBISUNfTElTVF9DQUNIRV9TSVpFIC0gMSkpCiAg ICAgICAgICAgICBjdGlQYXRjaENhbGxCeVJldHVybkFkZHJlc3MoY29kZUJsb2NrLCBTVFVCX1JF VFVSTl9BRERSRVNTLCBGdW5jdGlvblB0cihjdGlfb3BfZ2V0X2J5X2lkX3Byb3RvX2xpc3RfZnVs bCkpOwotICAgIH0gZWxzZSBpZiAoc2l6ZV90IGNvdW50ID0gbm9ybWFsaXplUHJvdG90eXBlQ2hh aW4oY2FsbEZyYW1lLCBiYXNlVmFsdWUsIHNsb3Quc2xvdEJhc2UoKSkpIHsKKyAgICB9IGVsc2Ug aWYgKHNpemVfdCBjb3VudCA9IG5vcm1hbGl6ZVByb3RvdHlwZUNoYWluKGNhbGxGcmFtZSwgYmFz ZVZhbHVlLCBzbG90LnNsb3RCYXNlKCksIHByb3BlcnR5TmFtZSwgb2Zmc2V0KSkgewogICAgICAg ICBBU1NFUlQoIWFzQ2VsbChiYXNlVmFsdWUpLT5zdHJ1Y3R1cmUoKS0+aXNEaWN0aW9uYXJ5KCkp OwogICAgICAgICBpbnQgbGlzdEluZGV4OwogICAgICAgICBQb2x5bW9ycGhpY0FjY2Vzc1N0cnVj dHVyZUxpc3QqIHByb3RvdHlwZVN0cnVjdHVyZUxpc3QgPSBnZXRQb2x5bW9ycGhpY0FjY2Vzc1N0 cnVjdHVyZUxpc3RTbG90KHN0dWJJbmZvLCBsaXN0SW5kZXgpOwogCiAgICAgICAgIFN0cnVjdHVy ZUNoYWluKiBwcm90b0NoYWluID0gc3RydWN0dXJlLT5wcm90b3R5cGVDaGFpbihjYWxsRnJhbWUp OwotICAgICAgICBKSVQ6OmNvbXBpbGVHZXRCeUlkQ2hhaW5MaXN0KGNhbGxGcmFtZS0+c2NvcGVD aGFpbigpLT5nbG9iYWxEYXRhLCBjYWxsRnJhbWUsIGNvZGVCbG9jaywgc3R1YkluZm8sIHByb3Rv dHlwZVN0cnVjdHVyZUxpc3QsIGxpc3RJbmRleCwgc3RydWN0dXJlLCBwcm90b0NoYWluLCBjb3Vu dCwgc2xvdC5jYWNoZWRPZmZzZXQoKSk7CisgICAgICAgIEpJVDo6Y29tcGlsZUdldEJ5SWRDaGFp bkxpc3QoY2FsbEZyYW1lLT5zY29wZUNoYWluKCktPmdsb2JhbERhdGEsIGNhbGxGcmFtZSwgY29k ZUJsb2NrLCBzdHViSW5mbywgcHJvdG90eXBlU3RydWN0dXJlTGlzdCwgbGlzdEluZGV4LCBzdHJ1 Y3R1cmUsIHByb3RvQ2hhaW4sIGNvdW50LCBvZmZzZXQpOwogCiAgICAgICAgIGlmIChsaXN0SW5k ZXggPT0gKFBPTFlNT1JQSElDX0xJU1RfQ0FDSEVfU0laRSAtIDEpKQogICAgICAgICAgICAgY3Rp UGF0Y2hDYWxsQnlSZXR1cm5BZGRyZXNzKGNvZGVCbG9jaywgU1RVQl9SRVRVUk5fQUREUkVTUywg RnVuY3Rpb25QdHIoY3RpX29wX2dldF9ieV9pZF9wcm90b19saXN0X2Z1bGwpKTsKSW5kZXg6IEph dmFTY3JpcHRDb3JlL3J1bnRpbWUvT3BlcmF0aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3Jp cHRDb3JlL3J1bnRpbWUvT3BlcmF0aW9ucy5oCShyZXZpc2lvbiA1MzA5MCkKKysrIEphdmFTY3Jp cHRDb3JlL3J1bnRpbWUvT3BlcmF0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMzksNyArMzM5 LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHJldHVybiBqc0FkZFNsb3dDYXNlKGNhbGxG cmFtZSwgdjEsIHYyKTsKICAgICB9CiAKLSAgICBpbmxpbmUgc2l6ZV90IG5vcm1hbGl6ZVByb3Rv dHlwZUNoYWluKENhbGxGcmFtZSogY2FsbEZyYW1lLCBKU1ZhbHVlIGJhc2UsIEpTVmFsdWUgc2xv dEJhc2UpCisgICAgaW5saW5lIHNpemVfdCBub3JtYWxpemVQcm90b3R5cGVDaGFpbihDYWxsRnJh bWUqIGNhbGxGcmFtZSwgSlNWYWx1ZSBiYXNlLCBKU1ZhbHVlIHNsb3RCYXNlLCBjb25zdCBJZGVu dGlmaWVyJiBwcm9wZXJ0eU5hbWUsIHNpemVfdCYgc2xvdE9mZnNldCkKICAgICB7CiAgICAgICAg IEpTQ2VsbCogY2VsbCA9IGFzQ2VsbChiYXNlKTsKICAgICAgICAgc2l6ZV90IGNvdW50ID0gMDsK QEAgLTM1Nyw4ICszNTcsMTEgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAgICAgICAgICAgIC8vIFNp bmNlIHdlJ3JlIGFjY2Vzc2luZyBhIHByb3RvdHlwZSBpbiBhIGxvb3AsIGl0J3MgYSBnb29kIGJl dCB0aGF0IGl0CiAgICAgICAgICAgICAvLyBzaG91bGQgbm90IGJlIHRyZWF0ZWQgYXMgYSBkaWN0 aW9uYXJ5LgotICAgICAgICAgICAgaWYgKGNlbGwtPnN0cnVjdHVyZSgpLT5pc0RpY3Rpb25hcnko KSkKKyAgICAgICAgICAgIGlmIChjZWxsLT5zdHJ1Y3R1cmUoKS0+aXNEaWN0aW9uYXJ5KCkpIHsK ICAgICAgICAgICAgICAgICBhc09iamVjdChjZWxsKS0+ZmxhdHRlbkRpY3Rpb25hcnlPYmplY3Qo KTsKKyAgICAgICAgICAgICAgICBpZiAoc2xvdEJhc2UgPT0gY2VsbCkKKyAgICAgICAgICAgICAg ICAgICAgc2xvdE9mZnNldCA9IGNlbGwtPnN0cnVjdHVyZSgpLT5nZXQocHJvcGVydHlOYW1lKTsg CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICsrY291bnQ7CiAgICAgICAgIH0KSW5kZXg6 IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHJldmlzaW9uIDUzMzI2KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDEtMTUgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVu QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBOZWVkIGEgc2hvcnQgZGVzY3JpcHRpb24gYW5kIGJ1ZyBVUkwgKE9PUFMhKQorICAgICAg ICAKKyAgICAgICAgQWRkZWQgYSB0ZXN0IGZvciB0aGlzIGJ1Zy4KKworICAgICAgICAqIGZhc3Qv anMvcGljL3VuZGljdGlvbmFyeS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv anMvcGljL3VuZGljdGlvbmFyeS5odG1sOiBBZGRlZC4KKwogMjAxMC0wMS0xNCAgRGFyaW4gRmlz aGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEJyYWR5IEVp ZHNvbi4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvanMvcGljL3VuZGljdGlvbmFyeS1leHBlY3Rl ZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9qcy9waWMvdW5kaWN0aW9uYXJ5 LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvanMvcGljL3Vu ZGljdGlvbmFyeS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTUgQEAKK1Ro aXMgcGFnZSB0ZXN0cyBmb3IgYSBjYWNoaW5nIGVycm9yIHdoZW4gdHJhbnNpdGlvbmluZyBwcm90 b3R5cGVzIGF3YXkgZnJvbSBiZWluZyBkaWN0aW9uYXJpZXMuIElmIHRoZSB0ZXN0IHBhc3Nlcywg eW91J2xsIHNlZSBhIHNlcmllcyBvZiBQQVNTIG1lc3NhZ2VzIGJlbG93LgorCitQQVNTOiBnZXRC KG8pIHNob3VsZCBiZSBiIGFuZCBpcy4KK1BBU1M6IGdldEIobykgc2hvdWxkIGJlIGIgYW5kIGlz LgorUEFTUzogZ2V0QihvKSBzaG91bGQgYmUgYiBhbmQgaXMuCitQQVNTOiBnZXRCKG8yKSBzaG91 bGQgYmUgYiBhbmQgaXMuCitQQVNTOiBnZXRCKG8yKSBzaG91bGQgYmUgYiBhbmQgaXMuCitQQVNT OiBnZXRCKG8yKSBzaG91bGQgYmUgYiBhbmQgaXMuCitQQVNTOiBnZXRCKG8pIHNob3VsZCBiZSBi IGFuZCBpcy4KK1BBU1M6IGdldEIobykgc2hvdWxkIGJlIGIgYW5kIGlzLgorUEFTUzogZ2V0Qihv KSBzaG91bGQgYmUgYiBhbmQgaXMuCitQQVNTOiBnZXRCKG8yKSBzaG91bGQgYmUgYiBhbmQgaXMu CitQQVNTOiBnZXRCKG8yKSBzaG91bGQgYmUgYiBhbmQgaXMuCitQQVNTOiBnZXRCKG8yKSBzaG91 bGQgYmUgYiBhbmQgaXMuCisKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvanMvcGljL3VuZGljdGlv bmFyeS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvanMvcGljL3VuZGljdGlv bmFyeS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9qcy9waWMvdW5kaWN0 aW9uYXJ5Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsOTYgQEAKKzxwPgorVGhpcyBwYWdl IHRlc3RzIGZvciBhIGNhY2hpbmcgZXJyb3Igd2hlbiB0cmFuc2l0aW9uaW5nIHByb3RvdHlwZXMg YXdheSBmcm9tIGJlaW5nIGRpY3Rpb25hcmllcy4KK0lmIHRoZSB0ZXN0IHBhc3NlcywgeW91J2xs IHNlZSBhIHNlcmllcyBvZiBQQVNTIG1lc3NhZ2VzIGJlbG93LgorPC9wPgorCis8cHJlIGlkPSJj b25zb2xlIj48L3ByZT4KKworPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xs ZXIpCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCitmdW5jdGlvbiBs b2cocykKK3sKKyAgICBpZiAodGhpcy5kb2N1bWVudCkKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoImNvbnNvbGUiKS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShz ICsgIlxuIikpOworICAgIGVsc2UKKyAgICAgICAgcHJpbnQocyArICJcbiIpOworfQorCitmdW5j dGlvbiBzaG91bGRCZShhRGVzY3JpcHRpb24sIGEsIGIpCit7CisgICAgaWYgKGEgPT09IGIpIHsK KyAgICAgICAgbG9nKCJQQVNTOiAiICsgYURlc2NyaXB0aW9uICsgIiBzaG91bGQgYmUgIiArIGIg KyAiIGFuZCBpcy4iKTsKKyAgICB9IGVsc2UgeworICAgICAgICBsb2coIkZBSUw6ICIgKyBhRGVz Y3JpcHRpb24gKyAiIHNob3VsZCBiZSAiICsgYiArICIgYnV0IGluc3RlYWQgaXMgIiArIGEgKyAi LiIpOworICAgIH0KK30KKworLy8gUHJvdG90eXBlIHRlc3RzCisoZnVuY3Rpb24gKCkgeworICAg IGZ1bmN0aW9uIGdldEIobykKKyAgICB7CisgICAgICAgIHJldHVybiBvLmI7CisgICAgfQorCisg ICAgdmFyIG8gPSB7CisgICAgICAgIF9fcHJvdG9fXyA6IHsKKyAgICAgICAgICAgIGE6ICJhIiwK KyAgICAgICAgICAgIGI6ICJiIgorICAgICAgICB9CisgICAgfTsKKworICAgIGRlbGV0ZSBvLl9f cHJvdG9fXy5hOworICAgIG8uX19wcm90b19fLmMgPSAiYyI7IC8vIGlmIG8uX19wcm90b19fIHVu LWRpY3Rpb25hcmllcyBpdHNlbGYsIC5jIHdpbGwgb3ZlcndyaXRlIHRoZSBkZWxldGVkIC5iIHNs b3QuCisgICAgZm9yICh2YXIgaSA9IDA7IGkgPCAzOyArK2kpCisgICAgICAgIHNob3VsZEJlKCJn ZXRCKG8pIiwgZ2V0QihvKSwgImIiKTsKKyAgICAgICAgCisgICAgdmFyIG8yID0geworICAgICAg ICBfX3Byb3RvX18gOiB7CisgICAgICAgICAgICBhMjogImEyIiwKKyAgICAgICAgICAgIGI6ICJi IgorICAgICAgICB9CisgICAgfTsKKworICAgIGRlbGV0ZSBvMi5fX3Byb3RvX18uYTI7CisgICAg bzIuX19wcm90b19fLmMyID0gImMyIjsgLy8gaWYgbzIuX19wcm90b19fIHVuLWRpY3Rpb25hcmll cyBpdHNlbGYsIC5jMiB3aWxsIG92ZXJ3cml0ZSB0aGUgZGVsZXRlZCAuYiBzbG90LgorICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgMzsgKytpKQorICAgICAgICBzaG91bGRCZSgiZ2V0QihvMikiLCBn ZXRCKG8yKSwgImIiKTsKK30pKCk7CisKKy8vIFByb3RvdHlwZSBjaGFpbiB0ZXN0cworKGZ1bmN0 aW9uICgpIHsKKyAgICBmdW5jdGlvbiBnZXRCKG8pCisgICAgeworICAgICAgICByZXR1cm4gby5i OworICAgIH0KKworICAgIHZhciBvID0geworICAgICAgICBfX3Byb3RvX18gOiB7CisgICAgICAg ICAgICBfX3Byb3RvX18gOiB7CisgICAgICAgICAgICAgICAgYTogImEiLAorICAgICAgICAgICAg ICAgIGI6ICJiIgorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfTsKKworICAgIGRlbGV0 ZSBvLl9fcHJvdG9fXy5fX3Byb3RvX18uYTsKKyAgICBvLl9fcHJvdG9fXy5fX3Byb3RvX18uYyA9 ICJjIjsgLy8gaWYgby5fX3Byb3RvX18uX19wcm90b19fIHVuLWRpY3Rpb25hcmllcyBpdHNlbGYs IC5jIHdpbGwgb3ZlcndyaXRlIHRoZSBkZWxldGVkIC5iIHNsb3QuCisgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCAzOyArK2kpCisgICAgICAgIHNob3VsZEJlKCJnZXRCKG8pIiwgZ2V0QihvKSwgImIi KTsKKworICAgIHZhciBvMiA9IHsKKyAgICAgICAgX19wcm90b19fIDogeworICAgICAgICAgICAg X19wcm90b19fIDogeworICAgICAgICAgICAgICAgIGEyOiAiYSIsCisgICAgICAgICAgICAgICAg YjogImIiCisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9OworCisgICAgZGVsZXRlIG8y Ll9fcHJvdG9fXy5fX3Byb3RvX18uYTI7CisgICAgbzIuX19wcm90b19fLl9fcHJvdG9fXy5jID0g ImMiOyAvLyBpZiBvMi5fX3Byb3RvX18uX19wcm90b19fIHVuLWRpY3Rpb25hcmllcyBpdHNlbGYs IC5jIHdpbGwgb3ZlcndyaXRlIHRoZSBkZWxldGVkIC5iIHNsb3QuCisgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCAzOyArK2kpCisgICAgICAgIHNob3VsZEJlKCJnZXRCKG8yKSIsIGdldEIobzIpLCAi YiIpOworfSkoKTsKKzwvc2NyaXB0Pgo=