129531 2014-02-28 20:08:39 -0800 Remove unnecessary HashTable related functions that take ExecState. 2015-01-21 15:54:04 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 kling kling ggaren kling oldest_to_newest 985836 0 kling 2014-02-28 20:08:39 -0800 Remove unnecessary HashTable related functions that take ExecState. 985837 1 225524 kling 2014-02-28 20:10:50 -0800 Created attachment 225524 Patch 985844 2 225527 kling 2014-02-28 20:23:24 -0800 Created attachment 225527 Patch 985859 3 225534 kling 2014-02-28 20:55:02 -0800 Created attachment 225534 Patch La la la etc... 985864 4 225536 kling 2014-02-28 21:08:20 -0800 Created attachment 225536 Patch 985874 5 225538 kling 2014-02-28 21:50:32 -0800 Created attachment 225538 Patch 985875 6 225538 kling 2014-02-28 21:58:08 -0800 Comment on attachment 225538 Patch Okay to heck with this blind building. I'm gonna get indoors so I can actually build locally :| 1063221 7 kling 2015-01-21 15:54:04 -0800 This change no longer applies. 225524 2014-02-28 20:10:50 -0800 2014-02-28 20:23:24 -0800 Patch bug-129531.diff text/plain 7107 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDQ0ZWI2YTguLjZhYThiZTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE0LTAyLTI4ICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KIAorICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgSGFzaFRh YmxlIHJlbGF0ZWQgZnVuY3Rpb25zIHRoYXQgdGFrZSBFeGVjU3RhdGUuCisgICAgICAgIDxodHRw czovL3dlYmtpdC5vcmcvYi8xMjk1MzE+CisKKyAgICAgICAgUmVtb3ZlIHRoZSBFeGVjU3RhdGUg dmVyc2lvbnMgb2YgdGhlc2UgZnVuY3Rpb25zOgorCisgICAgICAgICAgICAtIENsYXNzSW5mbzo6 cHJvcEhhc2hUYWJsZSgpCisgICAgICAgICAgICAtIEhhc2hUYWJsZTo6aW5pdGlhbGl6ZUlmTmVl ZGVkKCkKKyAgICAgICAgICAgIC0gSGFzaFRhYmxlOjplbnRyeSgpCisKKyAgICAgICAgLi4uYW5k IG1ha2UgY2FsbGVycyBwYXNzIHRoZSBWTSBkaXJlY3RseSBpbnN0ZWFkLgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcnVudGltZS9DbGFzc0luZm8u aDoKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6Z2V0Q2xh c3NQcm9wZXJ0eU5hbWVzKToKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OmdldE93bk5vbkluZGV4 UHJvcGVydHlOYW1lcyk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpyZWlmeVN0YXRpY0Z1bmN0 aW9uc0ZvckRlbGV0ZSk6CisgICAgICAgICogcnVudGltZS9Mb29rdXAuaDoKKyAgICAgICAgKEpT Qzo6Z2V0U3RhdGljUHJvcGVydHlTbG90KToKKyAgICAgICAgKEpTQzo6Z2V0U3RhdGljRnVuY3Rp b25TbG90KToKKyAgICAgICAgKEpTQzo6Z2V0U3RhdGljVmFsdWVTbG90KToKKyAgICAgICAgKEpT Qzo6bG9va3VwUHV0KToKKworMjAxNC0wMi0yOCAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBs ZS5jb20+CisKICAgICAgICAgSlNPYmplY3Q6OmZpbmRQcm9wZXJ0eUhhc2hFbnRyeSgpIHNob3Vs ZCB0YWtlIFZNIGluc3RlYWQgb2YgRXhlY1N0YXRlLgogICAgICAgICA8aHR0cHM6Ly93ZWJraXQu b3JnL2IvMTI5NTI5PgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9DbGFzc0luZm8uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NsYXNzSW5mby5o CmluZGV4IDhmZjc1ZjQuLjhiZDkwZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0NsYXNzSW5mby5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0NsYXNzSW5mby5oCkBAIC0xNTQsMTQgKzE1NCw2IEBAIHN0cnVjdCBDbGFzc0luZm8gewogICAg IC8vIFN0YXRpYyBoYXNoLXRhYmxlIG9mIHByb3BlcnRpZXMuCiAgICAgLy8gRm9yIGNsYXNzZXMg dGhhdCBjYW4gYmUgdXNlZCBmcm9tIG11bHRpcGxlIHRocmVhZHMsIGl0IGlzIGFjY2Vzc2VkIHZp YSBhIGdldHRlciBmdW5jdGlvbgogICAgIC8vIHRoYXQgd291bGQgdHlwaWNhbGx5IHJldHVybiBh IHBvaW50ZXIgdG8gYSB0aHJlYWQtc3BlY2lmaWMgdmFsdWUuCi0gICAgY29uc3QgSGFzaFRhYmxl KiBwcm9wSGFzaFRhYmxlKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKLSAgICB7Ci0gICAgICAgIGlm IChjbGFzc1Byb3BIYXNoVGFibGVHZXR0ZXJGdW5jdGlvbikKLSAgICAgICAgICAgIHJldHVybiAm Y2xhc3NQcm9wSGFzaFRhYmxlR2V0dGVyRnVuY3Rpb24oZXhlYy0+dm0oKSk7Ci0KLSAgICAgICAg cmV0dXJuIHN0YXRpY1Byb3BIYXNoVGFibGU7Ci0gICAgfQotCiAgICAgY29uc3QgSGFzaFRhYmxl KiBwcm9wSGFzaFRhYmxlKFZNJiB2bSkgY29uc3QKICAgICB7CiAgICAgICAgIGlmIChjbGFzc1By b3BIYXNoVGFibGVHZXR0ZXJGdW5jdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTT2JqZWN0LmNwcAppbmRleCBiMGE3MDZlLi5lMjM0MzA0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCkBAIC03MywxNCArNzMsMTQgQEAgY29uc3QgQ2xh c3NJbmZvIEpTT2JqZWN0OjpzX2luZm8gPSB7ICJPYmplY3QiLCAwLCAwLCAwLCBDUkVBVEVfTUVU SE9EX1RBQkxFKEpTT2IKIAogY29uc3QgQ2xhc3NJbmZvIEpTRmluYWxPYmplY3Q6OnNfaW5mbyA9 IHsgIk9iamVjdCIsICZCYXNlOjpzX2luZm8sIDAsIDAsIENSRUFURV9NRVRIT0RfVEFCTEUoSlNG aW5hbE9iamVjdCkgfTsKIAotc3RhdGljIGlubGluZSB2b2lkIGdldENsYXNzUHJvcGVydHlOYW1l cyhFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IENsYXNzSW5mbyogY2xhc3NJbmZvLCBQcm9wZXJ0eU5h bWVBcnJheSYgcHJvcGVydHlOYW1lcywgRW51bWVyYXRpb25Nb2RlIG1vZGUsIGJvb2wgZGlkUmVp ZnkpCitzdGF0aWMgaW5saW5lIHZvaWQgZ2V0Q2xhc3NQcm9wZXJ0eU5hbWVzKFZNJiB2bSwgY29u c3QgQ2xhc3NJbmZvKiBjbGFzc0luZm8sIFByb3BlcnR5TmFtZUFycmF5JiBwcm9wZXJ0eU5hbWVz LCBFbnVtZXJhdGlvbk1vZGUgbW9kZSwgYm9vbCBkaWRSZWlmeSkKIHsKICAgICAvLyBBZGQgcHJv cGVydGllcyBmcm9tIHRoZSBzdGF0aWMgaGFzaHRhYmxlcyBvZiBwcm9wZXJ0aWVzCiAgICAgZm9y ICg7IGNsYXNzSW5mbzsgY2xhc3NJbmZvID0gY2xhc3NJbmZvLT5wYXJlbnRDbGFzcykgewotICAg ICAgICBjb25zdCBIYXNoVGFibGUqIHRhYmxlID0gY2xhc3NJbmZvLT5wcm9wSGFzaFRhYmxlKGV4 ZWMpOworICAgICAgICBjb25zdCBIYXNoVGFibGUqIHRhYmxlID0gY2xhc3NJbmZvLT5wcm9wSGFz aFRhYmxlKHZtKTsKICAgICAgICAgaWYgKCF0YWJsZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICB0YWJsZS0+aW5pdGlhbGl6ZUlmTmVlZGVkKGV4ZWMpOworICAgICAgICB0YWJsZS0+ aW5pdGlhbGl6ZUlmTmVlZGVkKHZtKTsKICAgICAgICAgQVNTRVJUKHRhYmxlLT50YWJsZSk7CiAK ICAgICAgICAgaW50IGhhc2hTaXplTWFzayA9IHRhYmxlLT5jb21wYWN0U2l6ZSAtIDE7CkBAIC0x NTQ5LDkgKzE1NDksOSBAQCB2b2lkIEpTT2JqZWN0OjpnZXRPd25Qcm9wZXJ0eU5hbWVzKEpTT2Jq ZWN0KiBvYmplY3QsIEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYQogCiB2b2lkIEpTT2JqZWN0 OjpnZXRPd25Ob25JbmRleFByb3BlcnR5TmFtZXMoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRl KiBleGVjLCBQcm9wZXJ0eU5hbWVBcnJheSYgcHJvcGVydHlOYW1lcywgRW51bWVyYXRpb25Nb2Rl IG1vZGUpCiB7Ci0gICAgZ2V0Q2xhc3NQcm9wZXJ0eU5hbWVzKGV4ZWMsIG9iamVjdC0+Y2xhc3NJ bmZvKCksIHByb3BlcnR5TmFtZXMsIG1vZGUsIG9iamVjdC0+c3RhdGljRnVuY3Rpb25zUmVpZmll ZCgpKTsKLQogICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CisgICAgZ2V0Q2xhc3NQcm9wZXJ0eU5h bWVzKHZtLCBvYmplY3QtPmNsYXNzSW5mbygpLCBwcm9wZXJ0eU5hbWVzLCBtb2RlLCBvYmplY3Qt PnN0YXRpY0Z1bmN0aW9uc1JlaWZpZWQoKSk7CisKICAgICBib29sIGNhbkNhY2hlUHJvcGVydGll c0Zyb21TdHJ1Y3R1cmUgPSAhcHJvcGVydHlOYW1lcy5zaXplKCk7CiAgICAgb2JqZWN0LT5zdHJ1 Y3R1cmUodm0pLT5nZXRQcm9wZXJ0eU5hbWVzRnJvbVN0cnVjdHVyZSh2bSwgcHJvcGVydHlOYW1l cywgbW9kZSk7CiAKQEAgLTE2MjEsNyArMTYyMSw3IEBAIHZvaWQgSlNPYmplY3Q6OnJlaWZ5U3Rh dGljRnVuY3Rpb25zRm9yRGVsZXRlKEV4ZWNTdGF0ZSogZXhlYykKICAgICAgICAgc2V0U3RydWN0 dXJlKHZtLCBTdHJ1Y3R1cmU6OnRvVW5jYWNoZWFibGVEaWN0aW9uYXJ5VHJhbnNpdGlvbih2bSwg c3RydWN0dXJlKHZtKSkpOwogCiAgICAgZm9yIChjb25zdCBDbGFzc0luZm8qIGluZm8gPSBjbGFz c0luZm8oKTsgaW5mbzsgaW5mbyA9IGluZm8tPnBhcmVudENsYXNzKSB7Ci0gICAgICAgIGNvbnN0 IEhhc2hUYWJsZSogaGFzaFRhYmxlID0gaW5mby0+cHJvcEhhc2hUYWJsZShnbG9iYWxPYmplY3Qo KS0+Z2xvYmFsRXhlYygpKTsKKyAgICAgICAgY29uc3QgSGFzaFRhYmxlKiBoYXNoVGFibGUgPSBp bmZvLT5wcm9wSGFzaFRhYmxlKHZtKTsKICAgICAgICAgaWYgKCFoYXNoVGFibGUpCiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgUHJvcGVydHlTbG90IHNsb3QodGhpcyk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Mb29rdXAuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCmluZGV4IGRiYTM4OWUuLjQ4MGI4NzEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCkBAIC0xMzQsMTIgKzEzNCw2IEBAIG5h bWVzcGFjZSBKU0MgewogICAgICAgICAgICAgICAgIGNyZWF0ZVRhYmxlKHZtKTsKICAgICAgICAg fQogCi0gICAgICAgIEFMV0FZU19JTkxJTkUgdm9pZCBpbml0aWFsaXplSWZOZWVkZWQoRXhlY1N0 YXRlKiBleGVjKSBjb25zdAotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIXRhYmxlKQotICAg ICAgICAgICAgICAgIGNyZWF0ZVRhYmxlKGV4ZWMtPnZtKCkpOwotICAgICAgICB9Ci0KICAgICAg ICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZWxldGVUYWJsZSgpIGNvbnN0OwogCiAgICAgICAg IC8vIEZpbmQgYW4gZW50cnkgaW4gdGhlIHRhYmxlLCBhbmQgcmV0dXJuIHRoZSBlbnRyeS4KQEAg LTE0OSwxMiArMTQzLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgICAgICByZXR1cm4gZW50 cnkoaWRlbnRpZmllcik7CiAgICAgICAgIH0KIAotICAgICAgICBBTFdBWVNfSU5MSU5FIGNvbnN0 IEhhc2hFbnRyeSogZW50cnkoRXhlY1N0YXRlKiBleGVjLCBQcm9wZXJ0eU5hbWUgaWRlbnRpZmll cikgY29uc3QKLSAgICAgICAgewotICAgICAgICAgICAgaW5pdGlhbGl6ZUlmTmVlZGVkKGV4ZWMp OwotICAgICAgICAgICAgcmV0dXJuIGVudHJ5KGlkZW50aWZpZXIpOwotICAgICAgICB9Ci0KICAg ICAgICAgY2xhc3MgQ29uc3RJdGVyYXRvciB7CiAgICAgICAgIHB1YmxpYzoKICAgICAgICAgICAg IENvbnN0SXRlcmF0b3IoY29uc3QgSGFzaFRhYmxlKiB0YWJsZSwgaW50IHBvc2l0aW9uKQpAQCAt MjUwLDcgKzIzOCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHRlbXBsYXRlIDxjbGFzcyBUaGlz SW1wLCBjbGFzcyBQYXJlbnRJbXA+CiAgICAgaW5saW5lIGJvb2wgZ2V0U3RhdGljUHJvcGVydHlT bG90KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSGFzaFRhYmxlJiB0YWJsZSwgVGhpc0ltcCogdGhp c09iaiwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQogICAg IHsKLSAgICAgICAgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMsIHBy b3BlcnR5TmFtZSk7CisgICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS5lbnRy eShleGVjLT52bSgpLCBwcm9wZXJ0eU5hbWUpOwogCiAgICAgICAgIGlmICghZW50cnkpIC8vIG5v dCBmb3VuZCwgZm9yd2FyZCB0byBwYXJlbnQKICAgICAgICAgICAgIHJldHVybiBQYXJlbnRJbXA6 OmdldE93blByb3BlcnR5U2xvdCh0aGlzT2JqLCBleGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwpA QCAtMjczLDcgKzI2MSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBpZiAoUGFyZW50SW1w OjpnZXRPd25Qcm9wZXJ0eVNsb3QodGhpc09iaiwgZXhlYywgcHJvcGVydHlOYW1lLCBzbG90KSkK ICAgICAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50 cnkgPSB0YWJsZS5lbnRyeShleGVjLCBwcm9wZXJ0eU5hbWUpOworICAgICAgICBjb25zdCBIYXNo RW50cnkqIGVudHJ5ID0gdGFibGUuZW50cnkoZXhlYy0+dm0oKSwgcHJvcGVydHlOYW1lKTsKICAg ICAgICAgaWYgKCFlbnRyeSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMjg3LDcg KzI3NSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHRlbXBsYXRlIDxjbGFzcyBUaGlzSW1wLCBj bGFzcyBQYXJlbnRJbXA+CiAgICAgaW5saW5lIGJvb2wgZ2V0U3RhdGljVmFsdWVTbG90KEV4ZWNT dGF0ZSogZXhlYywgY29uc3QgSGFzaFRhYmxlJiB0YWJsZSwgVGhpc0ltcCogdGhpc09iaiwgUHJv cGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQogICAgIHsKLSAgICAg ICAgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMsIHByb3BlcnR5TmFt ZSk7CisgICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS5lbnRyeShleGVjLT52 bSgpLCBwcm9wZXJ0eU5hbWUpOwogCiAgICAgICAgIGlmICghZW50cnkpIC8vIG5vdCBmb3VuZCwg Zm9yd2FyZCB0byBwYXJlbnQKICAgICAgICAgICAgIHJldHVybiBQYXJlbnRJbXA6OmdldE93blBy b3BlcnR5U2xvdCh0aGlzT2JqLCBleGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwpAQCAtMzE4LDcg KzMwNiw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAqLwogICAgIGlubGluZSBib29sIGxvb2t1 cFB1dChFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEpTT2JqZWN0 KiBiYXNlLCBKU1ZhbHVlIHZhbHVlLCBjb25zdCBIYXNoVGFibGUmIHRhYmxlLCBQdXRQcm9wZXJ0 eVNsb3QmIHNsb3QpCiAgICAgewotICAgICAgICBjb25zdCBIYXNoRW50cnkqIGVudHJ5ID0gdGFi bGUuZW50cnkoZXhlYywgcHJvcGVydHlOYW1lKTsKKyAgICAgICAgY29uc3QgSGFzaEVudHJ5KiBl bnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMtPnZtKCksIHByb3BlcnR5TmFtZSk7CiAKICAgICAgICAg aWYgKCFlbnRyeSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK 225527 2014-02-28 20:23:24 -0800 2014-02-28 20:55:02 -0800 Patch bug-129531-2.diff text/plain 8582 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDQ0ZWI2YTguLjZhYThiZTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE0LTAyLTI4ICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KIAorICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgSGFzaFRh YmxlIHJlbGF0ZWQgZnVuY3Rpb25zIHRoYXQgdGFrZSBFeGVjU3RhdGUuCisgICAgICAgIDxodHRw czovL3dlYmtpdC5vcmcvYi8xMjk1MzE+CisKKyAgICAgICAgUmVtb3ZlIHRoZSBFeGVjU3RhdGUg dmVyc2lvbnMgb2YgdGhlc2UgZnVuY3Rpb25zOgorCisgICAgICAgICAgICAtIENsYXNzSW5mbzo6 cHJvcEhhc2hUYWJsZSgpCisgICAgICAgICAgICAtIEhhc2hUYWJsZTo6aW5pdGlhbGl6ZUlmTmVl ZGVkKCkKKyAgICAgICAgICAgIC0gSGFzaFRhYmxlOjplbnRyeSgpCisKKyAgICAgICAgLi4uYW5k IG1ha2UgY2FsbGVycyBwYXNzIHRoZSBWTSBkaXJlY3RseSBpbnN0ZWFkLgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcnVudGltZS9DbGFzc0luZm8u aDoKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6Z2V0Q2xh c3NQcm9wZXJ0eU5hbWVzKToKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OmdldE93bk5vbkluZGV4 UHJvcGVydHlOYW1lcyk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpyZWlmeVN0YXRpY0Z1bmN0 aW9uc0ZvckRlbGV0ZSk6CisgICAgICAgICogcnVudGltZS9Mb29rdXAuaDoKKyAgICAgICAgKEpT Qzo6Z2V0U3RhdGljUHJvcGVydHlTbG90KToKKyAgICAgICAgKEpTQzo6Z2V0U3RhdGljRnVuY3Rp b25TbG90KToKKyAgICAgICAgKEpTQzo6Z2V0U3RhdGljVmFsdWVTbG90KToKKyAgICAgICAgKEpT Qzo6bG9va3VwUHV0KToKKworMjAxNC0wMi0yOCAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBs ZS5jb20+CisKICAgICAgICAgSlNPYmplY3Q6OmZpbmRQcm9wZXJ0eUhhc2hFbnRyeSgpIHNob3Vs ZCB0YWtlIFZNIGluc3RlYWQgb2YgRXhlY1N0YXRlLgogICAgICAgICA8aHR0cHM6Ly93ZWJraXQu b3JnL2IvMTI5NTI5PgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9DbGFzc0luZm8uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NsYXNzSW5mby5o CmluZGV4IDhmZjc1ZjQuLjhiZDkwZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0NsYXNzSW5mby5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0NsYXNzSW5mby5oCkBAIC0xNTQsMTQgKzE1NCw2IEBAIHN0cnVjdCBDbGFzc0luZm8gewogICAg IC8vIFN0YXRpYyBoYXNoLXRhYmxlIG9mIHByb3BlcnRpZXMuCiAgICAgLy8gRm9yIGNsYXNzZXMg dGhhdCBjYW4gYmUgdXNlZCBmcm9tIG11bHRpcGxlIHRocmVhZHMsIGl0IGlzIGFjY2Vzc2VkIHZp YSBhIGdldHRlciBmdW5jdGlvbgogICAgIC8vIHRoYXQgd291bGQgdHlwaWNhbGx5IHJldHVybiBh IHBvaW50ZXIgdG8gYSB0aHJlYWQtc3BlY2lmaWMgdmFsdWUuCi0gICAgY29uc3QgSGFzaFRhYmxl KiBwcm9wSGFzaFRhYmxlKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKLSAgICB7Ci0gICAgICAgIGlm IChjbGFzc1Byb3BIYXNoVGFibGVHZXR0ZXJGdW5jdGlvbikKLSAgICAgICAgICAgIHJldHVybiAm Y2xhc3NQcm9wSGFzaFRhYmxlR2V0dGVyRnVuY3Rpb24oZXhlYy0+dm0oKSk7Ci0KLSAgICAgICAg cmV0dXJuIHN0YXRpY1Byb3BIYXNoVGFibGU7Ci0gICAgfQotCiAgICAgY29uc3QgSGFzaFRhYmxl KiBwcm9wSGFzaFRhYmxlKFZNJiB2bSkgY29uc3QKICAgICB7CiAgICAgICAgIGlmIChjbGFzc1By b3BIYXNoVGFibGVHZXR0ZXJGdW5jdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTT2JqZWN0LmNwcAppbmRleCBiMGE3MDZlLi5lMjM0MzA0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCkBAIC03MywxNCArNzMsMTQgQEAgY29uc3QgQ2xh c3NJbmZvIEpTT2JqZWN0OjpzX2luZm8gPSB7ICJPYmplY3QiLCAwLCAwLCAwLCBDUkVBVEVfTUVU SE9EX1RBQkxFKEpTT2IKIAogY29uc3QgQ2xhc3NJbmZvIEpTRmluYWxPYmplY3Q6OnNfaW5mbyA9 IHsgIk9iamVjdCIsICZCYXNlOjpzX2luZm8sIDAsIDAsIENSRUFURV9NRVRIT0RfVEFCTEUoSlNG aW5hbE9iamVjdCkgfTsKIAotc3RhdGljIGlubGluZSB2b2lkIGdldENsYXNzUHJvcGVydHlOYW1l cyhFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IENsYXNzSW5mbyogY2xhc3NJbmZvLCBQcm9wZXJ0eU5h bWVBcnJheSYgcHJvcGVydHlOYW1lcywgRW51bWVyYXRpb25Nb2RlIG1vZGUsIGJvb2wgZGlkUmVp ZnkpCitzdGF0aWMgaW5saW5lIHZvaWQgZ2V0Q2xhc3NQcm9wZXJ0eU5hbWVzKFZNJiB2bSwgY29u c3QgQ2xhc3NJbmZvKiBjbGFzc0luZm8sIFByb3BlcnR5TmFtZUFycmF5JiBwcm9wZXJ0eU5hbWVz LCBFbnVtZXJhdGlvbk1vZGUgbW9kZSwgYm9vbCBkaWRSZWlmeSkKIHsKICAgICAvLyBBZGQgcHJv cGVydGllcyBmcm9tIHRoZSBzdGF0aWMgaGFzaHRhYmxlcyBvZiBwcm9wZXJ0aWVzCiAgICAgZm9y ICg7IGNsYXNzSW5mbzsgY2xhc3NJbmZvID0gY2xhc3NJbmZvLT5wYXJlbnRDbGFzcykgewotICAg ICAgICBjb25zdCBIYXNoVGFibGUqIHRhYmxlID0gY2xhc3NJbmZvLT5wcm9wSGFzaFRhYmxlKGV4 ZWMpOworICAgICAgICBjb25zdCBIYXNoVGFibGUqIHRhYmxlID0gY2xhc3NJbmZvLT5wcm9wSGFz aFRhYmxlKHZtKTsKICAgICAgICAgaWYgKCF0YWJsZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICB0YWJsZS0+aW5pdGlhbGl6ZUlmTmVlZGVkKGV4ZWMpOworICAgICAgICB0YWJsZS0+ aW5pdGlhbGl6ZUlmTmVlZGVkKHZtKTsKICAgICAgICAgQVNTRVJUKHRhYmxlLT50YWJsZSk7CiAK ICAgICAgICAgaW50IGhhc2hTaXplTWFzayA9IHRhYmxlLT5jb21wYWN0U2l6ZSAtIDE7CkBAIC0x NTQ5LDkgKzE1NDksOSBAQCB2b2lkIEpTT2JqZWN0OjpnZXRPd25Qcm9wZXJ0eU5hbWVzKEpTT2Jq ZWN0KiBvYmplY3QsIEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYQogCiB2b2lkIEpTT2JqZWN0 OjpnZXRPd25Ob25JbmRleFByb3BlcnR5TmFtZXMoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRl KiBleGVjLCBQcm9wZXJ0eU5hbWVBcnJheSYgcHJvcGVydHlOYW1lcywgRW51bWVyYXRpb25Nb2Rl IG1vZGUpCiB7Ci0gICAgZ2V0Q2xhc3NQcm9wZXJ0eU5hbWVzKGV4ZWMsIG9iamVjdC0+Y2xhc3NJ bmZvKCksIHByb3BlcnR5TmFtZXMsIG1vZGUsIG9iamVjdC0+c3RhdGljRnVuY3Rpb25zUmVpZmll ZCgpKTsKLQogICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CisgICAgZ2V0Q2xhc3NQcm9wZXJ0eU5h bWVzKHZtLCBvYmplY3QtPmNsYXNzSW5mbygpLCBwcm9wZXJ0eU5hbWVzLCBtb2RlLCBvYmplY3Qt PnN0YXRpY0Z1bmN0aW9uc1JlaWZpZWQoKSk7CisKICAgICBib29sIGNhbkNhY2hlUHJvcGVydGll c0Zyb21TdHJ1Y3R1cmUgPSAhcHJvcGVydHlOYW1lcy5zaXplKCk7CiAgICAgb2JqZWN0LT5zdHJ1 Y3R1cmUodm0pLT5nZXRQcm9wZXJ0eU5hbWVzRnJvbVN0cnVjdHVyZSh2bSwgcHJvcGVydHlOYW1l cywgbW9kZSk7CiAKQEAgLTE2MjEsNyArMTYyMSw3IEBAIHZvaWQgSlNPYmplY3Q6OnJlaWZ5U3Rh dGljRnVuY3Rpb25zRm9yRGVsZXRlKEV4ZWNTdGF0ZSogZXhlYykKICAgICAgICAgc2V0U3RydWN0 dXJlKHZtLCBTdHJ1Y3R1cmU6OnRvVW5jYWNoZWFibGVEaWN0aW9uYXJ5VHJhbnNpdGlvbih2bSwg c3RydWN0dXJlKHZtKSkpOwogCiAgICAgZm9yIChjb25zdCBDbGFzc0luZm8qIGluZm8gPSBjbGFz c0luZm8oKTsgaW5mbzsgaW5mbyA9IGluZm8tPnBhcmVudENsYXNzKSB7Ci0gICAgICAgIGNvbnN0 IEhhc2hUYWJsZSogaGFzaFRhYmxlID0gaW5mby0+cHJvcEhhc2hUYWJsZShnbG9iYWxPYmplY3Qo KS0+Z2xvYmFsRXhlYygpKTsKKyAgICAgICAgY29uc3QgSGFzaFRhYmxlKiBoYXNoVGFibGUgPSBp bmZvLT5wcm9wSGFzaFRhYmxlKHZtKTsKICAgICAgICAgaWYgKCFoYXNoVGFibGUpCiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgUHJvcGVydHlTbG90IHNsb3QodGhpcyk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Mb29rdXAuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCmluZGV4IGRiYTM4OWUuLjQ4MGI4NzEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCkBAIC0xMzQsMTIgKzEzNCw2IEBAIG5h bWVzcGFjZSBKU0MgewogICAgICAgICAgICAgICAgIGNyZWF0ZVRhYmxlKHZtKTsKICAgICAgICAg fQogCi0gICAgICAgIEFMV0FZU19JTkxJTkUgdm9pZCBpbml0aWFsaXplSWZOZWVkZWQoRXhlY1N0 YXRlKiBleGVjKSBjb25zdAotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIXRhYmxlKQotICAg ICAgICAgICAgICAgIGNyZWF0ZVRhYmxlKGV4ZWMtPnZtKCkpOwotICAgICAgICB9Ci0KICAgICAg ICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZWxldGVUYWJsZSgpIGNvbnN0OwogCiAgICAgICAg IC8vIEZpbmQgYW4gZW50cnkgaW4gdGhlIHRhYmxlLCBhbmQgcmV0dXJuIHRoZSBlbnRyeS4KQEAg LTE0OSwxMiArMTQzLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgICAgICByZXR1cm4gZW50 cnkoaWRlbnRpZmllcik7CiAgICAgICAgIH0KIAotICAgICAgICBBTFdBWVNfSU5MSU5FIGNvbnN0 IEhhc2hFbnRyeSogZW50cnkoRXhlY1N0YXRlKiBleGVjLCBQcm9wZXJ0eU5hbWUgaWRlbnRpZmll cikgY29uc3QKLSAgICAgICAgewotICAgICAgICAgICAgaW5pdGlhbGl6ZUlmTmVlZGVkKGV4ZWMp OwotICAgICAgICAgICAgcmV0dXJuIGVudHJ5KGlkZW50aWZpZXIpOwotICAgICAgICB9Ci0KICAg ICAgICAgY2xhc3MgQ29uc3RJdGVyYXRvciB7CiAgICAgICAgIHB1YmxpYzoKICAgICAgICAgICAg IENvbnN0SXRlcmF0b3IoY29uc3QgSGFzaFRhYmxlKiB0YWJsZSwgaW50IHBvc2l0aW9uKQpAQCAt MjUwLDcgKzIzOCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHRlbXBsYXRlIDxjbGFzcyBUaGlz SW1wLCBjbGFzcyBQYXJlbnRJbXA+CiAgICAgaW5saW5lIGJvb2wgZ2V0U3RhdGljUHJvcGVydHlT bG90KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSGFzaFRhYmxlJiB0YWJsZSwgVGhpc0ltcCogdGhp c09iaiwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQogICAg IHsKLSAgICAgICAgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMsIHBy b3BlcnR5TmFtZSk7CisgICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS5lbnRy eShleGVjLT52bSgpLCBwcm9wZXJ0eU5hbWUpOwogCiAgICAgICAgIGlmICghZW50cnkpIC8vIG5v dCBmb3VuZCwgZm9yd2FyZCB0byBwYXJlbnQKICAgICAgICAgICAgIHJldHVybiBQYXJlbnRJbXA6 OmdldE93blByb3BlcnR5U2xvdCh0aGlzT2JqLCBleGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwpA QCAtMjczLDcgKzI2MSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBpZiAoUGFyZW50SW1w OjpnZXRPd25Qcm9wZXJ0eVNsb3QodGhpc09iaiwgZXhlYywgcHJvcGVydHlOYW1lLCBzbG90KSkK ICAgICAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50 cnkgPSB0YWJsZS5lbnRyeShleGVjLCBwcm9wZXJ0eU5hbWUpOworICAgICAgICBjb25zdCBIYXNo RW50cnkqIGVudHJ5ID0gdGFibGUuZW50cnkoZXhlYy0+dm0oKSwgcHJvcGVydHlOYW1lKTsKICAg ICAgICAgaWYgKCFlbnRyeSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMjg3LDcg KzI3NSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHRlbXBsYXRlIDxjbGFzcyBUaGlzSW1wLCBj bGFzcyBQYXJlbnRJbXA+CiAgICAgaW5saW5lIGJvb2wgZ2V0U3RhdGljVmFsdWVTbG90KEV4ZWNT dGF0ZSogZXhlYywgY29uc3QgSGFzaFRhYmxlJiB0YWJsZSwgVGhpc0ltcCogdGhpc09iaiwgUHJv cGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQogICAgIHsKLSAgICAg ICAgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMsIHByb3BlcnR5TmFt ZSk7CisgICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS5lbnRyeShleGVjLT52 bSgpLCBwcm9wZXJ0eU5hbWUpOwogCiAgICAgICAgIGlmICghZW50cnkpIC8vIG5vdCBmb3VuZCwg Zm9yd2FyZCB0byBwYXJlbnQKICAgICAgICAgICAgIHJldHVybiBQYXJlbnRJbXA6OmdldE93blBy b3BlcnR5U2xvdCh0aGlzT2JqLCBleGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwpAQCAtMzE4LDcg KzMwNiw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAqLwogICAgIGlubGluZSBib29sIGxvb2t1 cFB1dChFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEpTT2JqZWN0 KiBiYXNlLCBKU1ZhbHVlIHZhbHVlLCBjb25zdCBIYXNoVGFibGUmIHRhYmxlLCBQdXRQcm9wZXJ0 eVNsb3QmIHNsb3QpCiAgICAgewotICAgICAgICBjb25zdCBIYXNoRW50cnkqIGVudHJ5ID0gdGFi bGUuZW50cnkoZXhlYywgcHJvcGVydHlOYW1lKTsKKyAgICAgICAgY29uc3QgSGFzaEVudHJ5KiBl bnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMtPnZtKCksIHByb3BlcnR5TmFtZSk7CiAKICAgICAgICAg aWYgKCFlbnRyeSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2OTU3 ZmZkLi5lN2IxNGY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDItMjggIEFu ZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB1bm5lY2Vz c2FyeSBIYXNoVGFibGUgcmVsYXRlZCBmdW5jdGlvbnMgdGhhdCB0YWtlIEV4ZWNTdGF0ZS4KKyAg ICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTUzMT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5o OgorICAgICAgICAoV2ViQ29yZTo6Z2V0U3RhdGljVmFsdWVTbG90RW50cnlXaXRob3V0Q2FjaGlu Zyk6CisKIDIwMTQtMDItMjggIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAg ICAgIENyYXNoIGF0IGViYXkuY29tIHdoZW4gdmlld2luZyBhdWN0aW9uIGl0ZW1zIGF0IGNvbS5h cHBsZS5XZWJDb3JlOiBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6Z2V0RXh0ZW5zaW9ucyAr IDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcu aCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCmluZGV4IGM4ZGU0 MWIuLmMyMTRiNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9N QmluZGluZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5o CkBAIC02MTMsNyArNjEzLDcgQEAgaW5saW5lIGNvbnN0IEpTQzo6SGFzaEVudHJ5KiBnZXRTdGF0 aWNWYWx1ZVNsb3RFbnRyeVdpdGhvdXRDYWNoaW5nKEpTQzo6RXhlY1N0YXQKICAgICBjb25zdCBK U0M6Okhhc2hUYWJsZSogdGFibGUgPSBUaGlzSW1wOjppbmZvKCktPnByb3BIYXNoVGFibGUoZXhl Yyk7CiAgICAgaWYgKCF0YWJsZSkKICAgICAgICAgcmV0dXJuIGdldFN0YXRpY1ZhbHVlU2xvdEVu dHJ5V2l0aG91dENhY2hpbmc8dHlwZW5hbWUgVGhpc0ltcDo6QmFzZT4oZXhlYywgcHJvcGVydHlO YW1lKTsKLSAgICBjb25zdCBKU0M6Okhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS0+ZW50cnkoZXhl YywgcHJvcGVydHlOYW1lKTsKKyAgICBjb25zdCBKU0M6Okhhc2hFbnRyeSogZW50cnkgPSB0YWJs ZS0+ZW50cnkoZXhlYy0+dm0oKSwgcHJvcGVydHlOYW1lKTsKICAgICBpZiAoIWVudHJ5KSAvLyBu b3QgZm91bmQsIGZvcndhcmQgdG8gcGFyZW50CiAgICAgICAgIHJldHVybiBnZXRTdGF0aWNWYWx1 ZVNsb3RFbnRyeVdpdGhvdXRDYWNoaW5nPHR5cGVuYW1lIFRoaXNJbXA6OkJhc2U+KGV4ZWMsIHBy b3BlcnR5TmFtZSk7CiAgICAgcmV0dXJuIGVudHJ5Owo= 225534 2014-02-28 20:55:02 -0800 2014-02-28 21:08:20 -0800 Patch bug-129531-3.diff text/plain 5364 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAppbmRleCBlMjM0MzA0 Li42MDAwNTcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09i amVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3Bw CkBAIC0xNjI3LDcgKzE2MjcsNyBAQCB2b2lkIEpTT2JqZWN0OjpyZWlmeVN0YXRpY0Z1bmN0aW9u c0ZvckRlbGV0ZShFeGVjU3RhdGUqIGV4ZWMpCiAgICAgICAgIFByb3BlcnR5U2xvdCBzbG90KHRo aXMpOwogICAgICAgICBmb3IgKEhhc2hUYWJsZTo6Q29uc3RJdGVyYXRvciBpdGVyID0gaGFzaFRh YmxlLT5iZWdpbih2bSk7IGl0ZXIgIT0gaGFzaFRhYmxlLT5lbmQodm0pOyArK2l0ZXIpIHsKICAg ICAgICAgICAgIGlmIChpdGVyLT5hdHRyaWJ1dGVzKCkgJiBCdWlsdGluT3JGdW5jdGlvbikKLSAg ICAgICAgICAgICAgICBzZXRVcFN0YXRpY0Z1bmN0aW9uU2xvdChnbG9iYWxPYmplY3QoKS0+Z2xv YmFsRXhlYygpLCAqaXRlciwgdGhpcywgSWRlbnRpZmllcigmdm0sIGl0ZXItPmtleSgpKSwgc2xv dCk7CisgICAgICAgICAgICAgICAgc2V0VXBTdGF0aWNGdW5jdGlvblNsb3Qodm0sICppdGVyLCB0 aGlzLCBJZGVudGlmaWVyKCZ2bSwgaXRlci0+a2V5KCkpLCBzbG90KTsKICAgICAgICAgfQogICAg IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3Qu aCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKaW5kZXggNzE2ZDRk YS4uNjEwNTFhNSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNP YmplY3QuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCkBA IC05Myw3ICs5Myw3IEBAIGNsYXNzIEpTT2JqZWN0IDogcHVibGljIEpTQ2VsbCB7CiAgICAgZnJp ZW5kIGNsYXNzIEpTQ2VsbDsKICAgICBmcmllbmQgY2xhc3MgSlNGaW5hbE9iamVjdDsKICAgICBm cmllbmQgY2xhc3MgTWFya2VkQmxvY2s7Ci0gICAgSlNfRVhQT1JUX1BSSVZBVEUgZnJpZW5kIGJv b2wgc2V0VXBTdGF0aWNGdW5jdGlvblNsb3QoRXhlY1N0YXRlKiwgY29uc3QgSGFzaEVudHJ5Kiwg SlNPYmplY3QqLCBQcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYpOworICAgIEpTX0VYUE9SVF9Q UklWQVRFIGZyaWVuZCBib29sIHNldFVwU3RhdGljRnVuY3Rpb25TbG90KFZNJiwgY29uc3QgSGFz aEVudHJ5KiwgSlNPYmplY3QqLCBQcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYpOwogCiAgICAg ZW51bSBQdXRNb2RlIHsKICAgICAgICAgUHV0TW9kZVB1dCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9Mb29rdXAuY3BwCmluZGV4IDE5N2Q4NDcuLjk5NWI0MjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5jcHAKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmNwcApAQCAtNjUsMTEgKzY1LDEwIEBAIHZvaWQgSGFz aFRhYmxlOjpkZWxldGVUYWJsZSgpIGNvbnN0CiAgICAgfQogfQogCi1ib29sIHNldFVwU3RhdGlj RnVuY3Rpb25TbG90KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSwgSlNP YmplY3QqIHRoaXNPYmosIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYg c2xvdCkKK2Jvb2wgc2V0VXBTdGF0aWNGdW5jdGlvblNsb3QoVk0mIHZtLCBjb25zdCBIYXNoRW50 cnkqIGVudHJ5LCBKU09iamVjdCogdGhpc09iaiwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwg UHJvcGVydHlTbG90JiBzbG90KQogewogICAgIEFTU0VSVCh0aGlzT2JqLT5nbG9iYWxPYmplY3Qo KSk7CiAgICAgQVNTRVJUKGVudHJ5LT5hdHRyaWJ1dGVzKCkgJiBCdWlsdGluT3JGdW5jdGlvbik7 Ci0gICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKICAgICB1bnNpZ25lZCBhdHRyaWJ1dGVzOwogICAg IFByb3BlcnR5T2Zmc2V0IG9mZnNldCA9IHRoaXNPYmotPmdldERpcmVjdE9mZnNldCh2bSwgcHJv cGVydHlOYW1lLCBhdHRyaWJ1dGVzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvTG9va3VwLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Mb29r dXAuaAppbmRleCA0ODBiODcxLi42NWY5MGNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9Mb29rdXAuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9Mb29rdXAuaApAQCAtMjI3LDcgKzIyNyw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBK U19FWFBPUlRfUFJJVkFURSB2b2lkIGNyZWF0ZVRhYmxlKFZNJikgY29uc3Q7CiAgICAgfTsKIAot ICAgIEpTX0VYUE9SVF9QUklWQVRFIGJvb2wgc2V0VXBTdGF0aWNGdW5jdGlvblNsb3QoRXhlY1N0 YXRlKiwgY29uc3QgSGFzaEVudHJ5KiwgSlNPYmplY3QqIHRoaXNPYmplY3QsIFByb3BlcnR5TmFt ZSwgUHJvcGVydHlTbG90Jik7CisgICAgSlNfRVhQT1JUX1BSSVZBVEUgYm9vbCBzZXRVcFN0YXRp Y0Z1bmN0aW9uU2xvdChWTSYsIGNvbnN0IEhhc2hFbnRyeSosIEpTT2JqZWN0KiB0aGlzT2JqZWN0 LCBQcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYpOwogCiAgICAgLyoqCiAgICAgICogVGhpcyBt ZXRob2QgZG9lcyBpdCBhbGwgKGxvb2tpbmcgaW4gdGhlIGhhc2h0YWJsZSwgY2hlY2tpbmcgZm9y IGZ1bmN0aW9uCkBAIC0yMzgsMTMgKzIzOCwxNCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICB0ZW1w bGF0ZSA8Y2xhc3MgVGhpc0ltcCwgY2xhc3MgUGFyZW50SW1wPgogICAgIGlubGluZSBib29sIGdl dFN0YXRpY1Byb3BlcnR5U2xvdChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEhhc2hUYWJsZSYgdGFi bGUsIFRoaXNJbXAqIHRoaXNPYmosIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIFByb3BlcnR5 U2xvdCYgc2xvdCkKICAgICB7Ci0gICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSB0YWJs ZS5lbnRyeShleGVjLT52bSgpLCBwcm9wZXJ0eU5hbWUpOworICAgICAgICBWTSYgdm0gPSBleGVj LT52bSgpOworICAgICAgICBjb25zdCBIYXNoRW50cnkqIGVudHJ5ID0gdGFibGUuZW50cnkodm0s IHByb3BlcnR5TmFtZSk7CiAKICAgICAgICAgaWYgKCFlbnRyeSkgLy8gbm90IGZvdW5kLCBmb3J3 YXJkIHRvIHBhcmVudAogICAgICAgICAgICAgcmV0dXJuIFBhcmVudEltcDo6Z2V0T3duUHJvcGVy dHlTbG90KHRoaXNPYmosIGV4ZWMsIHByb3BlcnR5TmFtZSwgc2xvdCk7CiAKICAgICAgICAgaWYg KGVudHJ5LT5hdHRyaWJ1dGVzKCkgJiBCdWlsdGluT3JGdW5jdGlvbikKLSAgICAgICAgICAgIHJl dHVybiBzZXRVcFN0YXRpY0Z1bmN0aW9uU2xvdChleGVjLCBlbnRyeSwgdGhpc09iaiwgcHJvcGVy dHlOYW1lLCBzbG90KTsKKyAgICAgICAgICAgIHJldHVybiBzZXRVcFN0YXRpY0Z1bmN0aW9uU2xv dCh2bSwgZW50cnksIHRoaXNPYmosIHByb3BlcnR5TmFtZSwgc2xvdCk7CiAKICAgICAgICAgc2xv dC5zZXRDYWNoZWFibGVDdXN0b20odGhpc09iaiwgZW50cnktPmF0dHJpYnV0ZXMoKSwgZW50cnkt PnByb3BlcnR5R2V0dGVyKCkpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTI2MSwxMSArMjYy LDEyIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBpZiAoUGFyZW50SW1wOjpnZXRPd25Qcm9w ZXJ0eVNsb3QodGhpc09iaiwgZXhlYywgcHJvcGVydHlOYW1lLCBzbG90KSkKICAgICAgICAgICAg IHJldHVybiB0cnVlOwogCi0gICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS5l bnRyeShleGVjLT52bSgpLCBwcm9wZXJ0eU5hbWUpOworICAgICAgICBWTSYgdm0gPSBleGVjLT52 bSgpOworICAgICAgICBjb25zdCBIYXNoRW50cnkqIGVudHJ5ID0gdGFibGUuZW50cnkodm0sIHBy b3BlcnR5TmFtZSk7CiAgICAgICAgIGlmICghZW50cnkpCiAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICAgICAgcmV0dXJuIHNldFVwU3RhdGljRnVuY3Rpb25TbG90KGV4ZWMsIGVudHJ5 LCB0aGlzT2JqLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOworICAgICAgICByZXR1cm4gc2V0VXBTdGF0 aWNGdW5jdGlvblNsb3Qodm0sIGVudHJ5LCB0aGlzT2JqLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwog ICAgIH0KIAogICAgIC8qKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNET01CaW5kaW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcu aAppbmRleCBjMjE0YjRkLi43YzNhYmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU0RPTUJpbmRpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0RPTUJpbmRpbmcuaApAQCAtNjEwLDEwICs2MTAsMTEgQEAgaW5saW5lIEF0b21pY1N0cmluZyBw cm9wZXJ0eU5hbWVUb0F0b21pY1N0cmluZyhKU0M6OlByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUp CiB0ZW1wbGF0ZSA8Y2xhc3MgVGhpc0ltcD4KIGlubGluZSBjb25zdCBKU0M6Okhhc2hFbnRyeSog Z2V0U3RhdGljVmFsdWVTbG90RW50cnlXaXRob3V0Q2FjaGluZyhKU0M6OkV4ZWNTdGF0ZSogZXhl YywgSlNDOjpQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKQogewotICAgIGNvbnN0IEpTQzo6SGFz aFRhYmxlKiB0YWJsZSA9IFRoaXNJbXA6OmluZm8oKS0+cHJvcEhhc2hUYWJsZShleGVjKTsKKyAg ICBWTSYgdm0gPSBleGVjLT52bSgpOworICAgIGNvbnN0IEpTQzo6SGFzaFRhYmxlKiB0YWJsZSA9 IFRoaXNJbXA6OmluZm8oKS0+cHJvcEhhc2hUYWJsZSh2bSk7CiAgICAgaWYgKCF0YWJsZSkKICAg ICAgICAgcmV0dXJuIGdldFN0YXRpY1ZhbHVlU2xvdEVudHJ5V2l0aG91dENhY2hpbmc8dHlwZW5h bWUgVGhpc0ltcDo6QmFzZT4oZXhlYywgcHJvcGVydHlOYW1lKTsKLSAgICBjb25zdCBKU0M6Okhh c2hFbnRyeSogZW50cnkgPSB0YWJsZS0+ZW50cnkoZXhlYy0+dm0oKSwgcHJvcGVydHlOYW1lKTsK KyAgICBjb25zdCBKU0M6Okhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS0+ZW50cnkodm0sIHByb3Bl cnR5TmFtZSk7CiAgICAgaWYgKCFlbnRyeSkgLy8gbm90IGZvdW5kLCBmb3J3YXJkIHRvIHBhcmVu dAogICAgICAgICByZXR1cm4gZ2V0U3RhdGljVmFsdWVTbG90RW50cnlXaXRob3V0Q2FjaGluZzx0 eXBlbmFtZSBUaGlzSW1wOjpCYXNlPihleGVjLCBwcm9wZXJ0eU5hbWUpOwogICAgIHJldHVybiBl bnRyeTsK 225536 2014-02-28 21:08:20 -0800 2014-02-28 21:50:32 -0800 Patch bug-129531-4.diff text/plain 8817 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDAwNWJlMWEuLmIyMjJlYTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE0LTAyLTI4ICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KIAorICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgSGFzaFRh YmxlIHJlbGF0ZWQgZnVuY3Rpb25zIHRoYXQgdGFrZSBFeGVjU3RhdGUuCisgICAgICAgIDxodHRw czovL3dlYmtpdC5vcmcvYi8xMjk1MzE+CisKKyAgICAgICAgUmVtb3ZlIHRoZSBFeGVjU3RhdGUg dmVyc2lvbnMgb2YgdGhlc2UgZnVuY3Rpb25zOgorCisgICAgICAgICAgICAtIENsYXNzSW5mbzo6 cHJvcEhhc2hUYWJsZSgpCisgICAgICAgICAgICAtIEhhc2hUYWJsZTo6aW5pdGlhbGl6ZUlmTmVl ZGVkKCkKKyAgICAgICAgICAgIC0gSGFzaFRhYmxlOjplbnRyeSgpCisKKyAgICAgICAgLi4uYW5k IG1ha2UgY2FsbGVycyBwYXNzIHRoZSBWTSBkaXJlY3RseSBpbnN0ZWFkLgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcnVudGltZS9DbGFzc0luZm8u aDoKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6Z2V0Q2xh c3NQcm9wZXJ0eU5hbWVzKToKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OmdldE93bk5vbkluZGV4 UHJvcGVydHlOYW1lcyk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpyZWlmeVN0YXRpY0Z1bmN0 aW9uc0ZvckRlbGV0ZSk6CisgICAgICAgICogcnVudGltZS9Mb29rdXAuaDoKKyAgICAgICAgKEpT Qzo6Z2V0U3RhdGljUHJvcGVydHlTbG90KToKKyAgICAgICAgKEpTQzo6Z2V0U3RhdGljRnVuY3Rp b25TbG90KToKKyAgICAgICAgKEpTQzo6Z2V0U3RhdGljVmFsdWVTbG90KToKKyAgICAgICAgKEpT Qzo6bG9va3VwUHV0KToKKworMjAxNC0wMi0yOCAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBs ZS5jb20+CisKICAgICAgICAgSlNPYmplY3Q6OmZpbmRQcm9wZXJ0eUhhc2hFbnRyeSgpIHNob3Vs ZCB0YWtlIFZNIGluc3RlYWQgb2YgRXhlY1N0YXRlLgogICAgICAgICA8aHR0cHM6Ly93ZWJraXQu b3JnL2IvMTI5NTI5PgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9DbGFzc0luZm8uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NsYXNzSW5mby5o CmluZGV4IDhmZjc1ZjQuLjhiZDkwZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0NsYXNzSW5mby5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0NsYXNzSW5mby5oCkBAIC0xNTQsMTQgKzE1NCw2IEBAIHN0cnVjdCBDbGFzc0luZm8gewogICAg IC8vIFN0YXRpYyBoYXNoLXRhYmxlIG9mIHByb3BlcnRpZXMuCiAgICAgLy8gRm9yIGNsYXNzZXMg dGhhdCBjYW4gYmUgdXNlZCBmcm9tIG11bHRpcGxlIHRocmVhZHMsIGl0IGlzIGFjY2Vzc2VkIHZp YSBhIGdldHRlciBmdW5jdGlvbgogICAgIC8vIHRoYXQgd291bGQgdHlwaWNhbGx5IHJldHVybiBh IHBvaW50ZXIgdG8gYSB0aHJlYWQtc3BlY2lmaWMgdmFsdWUuCi0gICAgY29uc3QgSGFzaFRhYmxl KiBwcm9wSGFzaFRhYmxlKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKLSAgICB7Ci0gICAgICAgIGlm IChjbGFzc1Byb3BIYXNoVGFibGVHZXR0ZXJGdW5jdGlvbikKLSAgICAgICAgICAgIHJldHVybiAm Y2xhc3NQcm9wSGFzaFRhYmxlR2V0dGVyRnVuY3Rpb24oZXhlYy0+dm0oKSk7Ci0KLSAgICAgICAg cmV0dXJuIHN0YXRpY1Byb3BIYXNoVGFibGU7Ci0gICAgfQotCiAgICAgY29uc3QgSGFzaFRhYmxl KiBwcm9wSGFzaFRhYmxlKFZNJiB2bSkgY29uc3QKICAgICB7CiAgICAgICAgIGlmIChjbGFzc1By b3BIYXNoVGFibGVHZXR0ZXJGdW5jdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTT2JqZWN0LmNwcAppbmRleCBiMGE3MDZlLi5lMjM0MzA0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCkBAIC03MywxNCArNzMsMTQgQEAgY29uc3QgQ2xh c3NJbmZvIEpTT2JqZWN0OjpzX2luZm8gPSB7ICJPYmplY3QiLCAwLCAwLCAwLCBDUkVBVEVfTUVU SE9EX1RBQkxFKEpTT2IKIAogY29uc3QgQ2xhc3NJbmZvIEpTRmluYWxPYmplY3Q6OnNfaW5mbyA9 IHsgIk9iamVjdCIsICZCYXNlOjpzX2luZm8sIDAsIDAsIENSRUFURV9NRVRIT0RfVEFCTEUoSlNG aW5hbE9iamVjdCkgfTsKIAotc3RhdGljIGlubGluZSB2b2lkIGdldENsYXNzUHJvcGVydHlOYW1l cyhFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IENsYXNzSW5mbyogY2xhc3NJbmZvLCBQcm9wZXJ0eU5h bWVBcnJheSYgcHJvcGVydHlOYW1lcywgRW51bWVyYXRpb25Nb2RlIG1vZGUsIGJvb2wgZGlkUmVp ZnkpCitzdGF0aWMgaW5saW5lIHZvaWQgZ2V0Q2xhc3NQcm9wZXJ0eU5hbWVzKFZNJiB2bSwgY29u c3QgQ2xhc3NJbmZvKiBjbGFzc0luZm8sIFByb3BlcnR5TmFtZUFycmF5JiBwcm9wZXJ0eU5hbWVz LCBFbnVtZXJhdGlvbk1vZGUgbW9kZSwgYm9vbCBkaWRSZWlmeSkKIHsKICAgICAvLyBBZGQgcHJv cGVydGllcyBmcm9tIHRoZSBzdGF0aWMgaGFzaHRhYmxlcyBvZiBwcm9wZXJ0aWVzCiAgICAgZm9y ICg7IGNsYXNzSW5mbzsgY2xhc3NJbmZvID0gY2xhc3NJbmZvLT5wYXJlbnRDbGFzcykgewotICAg ICAgICBjb25zdCBIYXNoVGFibGUqIHRhYmxlID0gY2xhc3NJbmZvLT5wcm9wSGFzaFRhYmxlKGV4 ZWMpOworICAgICAgICBjb25zdCBIYXNoVGFibGUqIHRhYmxlID0gY2xhc3NJbmZvLT5wcm9wSGFz aFRhYmxlKHZtKTsKICAgICAgICAgaWYgKCF0YWJsZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICB0YWJsZS0+aW5pdGlhbGl6ZUlmTmVlZGVkKGV4ZWMpOworICAgICAgICB0YWJsZS0+ aW5pdGlhbGl6ZUlmTmVlZGVkKHZtKTsKICAgICAgICAgQVNTRVJUKHRhYmxlLT50YWJsZSk7CiAK ICAgICAgICAgaW50IGhhc2hTaXplTWFzayA9IHRhYmxlLT5jb21wYWN0U2l6ZSAtIDE7CkBAIC0x NTQ5LDkgKzE1NDksOSBAQCB2b2lkIEpTT2JqZWN0OjpnZXRPd25Qcm9wZXJ0eU5hbWVzKEpTT2Jq ZWN0KiBvYmplY3QsIEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYQogCiB2b2lkIEpTT2JqZWN0 OjpnZXRPd25Ob25JbmRleFByb3BlcnR5TmFtZXMoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRl KiBleGVjLCBQcm9wZXJ0eU5hbWVBcnJheSYgcHJvcGVydHlOYW1lcywgRW51bWVyYXRpb25Nb2Rl IG1vZGUpCiB7Ci0gICAgZ2V0Q2xhc3NQcm9wZXJ0eU5hbWVzKGV4ZWMsIG9iamVjdC0+Y2xhc3NJ bmZvKCksIHByb3BlcnR5TmFtZXMsIG1vZGUsIG9iamVjdC0+c3RhdGljRnVuY3Rpb25zUmVpZmll ZCgpKTsKLQogICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CisgICAgZ2V0Q2xhc3NQcm9wZXJ0eU5h bWVzKHZtLCBvYmplY3QtPmNsYXNzSW5mbygpLCBwcm9wZXJ0eU5hbWVzLCBtb2RlLCBvYmplY3Qt PnN0YXRpY0Z1bmN0aW9uc1JlaWZpZWQoKSk7CisKICAgICBib29sIGNhbkNhY2hlUHJvcGVydGll c0Zyb21TdHJ1Y3R1cmUgPSAhcHJvcGVydHlOYW1lcy5zaXplKCk7CiAgICAgb2JqZWN0LT5zdHJ1 Y3R1cmUodm0pLT5nZXRQcm9wZXJ0eU5hbWVzRnJvbVN0cnVjdHVyZSh2bSwgcHJvcGVydHlOYW1l cywgbW9kZSk7CiAKQEAgLTE2MjEsNyArMTYyMSw3IEBAIHZvaWQgSlNPYmplY3Q6OnJlaWZ5U3Rh dGljRnVuY3Rpb25zRm9yRGVsZXRlKEV4ZWNTdGF0ZSogZXhlYykKICAgICAgICAgc2V0U3RydWN0 dXJlKHZtLCBTdHJ1Y3R1cmU6OnRvVW5jYWNoZWFibGVEaWN0aW9uYXJ5VHJhbnNpdGlvbih2bSwg c3RydWN0dXJlKHZtKSkpOwogCiAgICAgZm9yIChjb25zdCBDbGFzc0luZm8qIGluZm8gPSBjbGFz c0luZm8oKTsgaW5mbzsgaW5mbyA9IGluZm8tPnBhcmVudENsYXNzKSB7Ci0gICAgICAgIGNvbnN0 IEhhc2hUYWJsZSogaGFzaFRhYmxlID0gaW5mby0+cHJvcEhhc2hUYWJsZShnbG9iYWxPYmplY3Qo KS0+Z2xvYmFsRXhlYygpKTsKKyAgICAgICAgY29uc3QgSGFzaFRhYmxlKiBoYXNoVGFibGUgPSBp bmZvLT5wcm9wSGFzaFRhYmxlKHZtKTsKICAgICAgICAgaWYgKCFoYXNoVGFibGUpCiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgUHJvcGVydHlTbG90IHNsb3QodGhpcyk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Mb29rdXAuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCmluZGV4IGRiYTM4OWUuLjQ4MGI4NzEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCkBAIC0xMzQsMTIgKzEzNCw2IEBAIG5h bWVzcGFjZSBKU0MgewogICAgICAgICAgICAgICAgIGNyZWF0ZVRhYmxlKHZtKTsKICAgICAgICAg fQogCi0gICAgICAgIEFMV0FZU19JTkxJTkUgdm9pZCBpbml0aWFsaXplSWZOZWVkZWQoRXhlY1N0 YXRlKiBleGVjKSBjb25zdAotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIXRhYmxlKQotICAg ICAgICAgICAgICAgIGNyZWF0ZVRhYmxlKGV4ZWMtPnZtKCkpOwotICAgICAgICB9Ci0KICAgICAg ICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZWxldGVUYWJsZSgpIGNvbnN0OwogCiAgICAgICAg IC8vIEZpbmQgYW4gZW50cnkgaW4gdGhlIHRhYmxlLCBhbmQgcmV0dXJuIHRoZSBlbnRyeS4KQEAg LTE0OSwxMiArMTQzLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgICAgICByZXR1cm4gZW50 cnkoaWRlbnRpZmllcik7CiAgICAgICAgIH0KIAotICAgICAgICBBTFdBWVNfSU5MSU5FIGNvbnN0 IEhhc2hFbnRyeSogZW50cnkoRXhlY1N0YXRlKiBleGVjLCBQcm9wZXJ0eU5hbWUgaWRlbnRpZmll cikgY29uc3QKLSAgICAgICAgewotICAgICAgICAgICAgaW5pdGlhbGl6ZUlmTmVlZGVkKGV4ZWMp OwotICAgICAgICAgICAgcmV0dXJuIGVudHJ5KGlkZW50aWZpZXIpOwotICAgICAgICB9Ci0KICAg ICAgICAgY2xhc3MgQ29uc3RJdGVyYXRvciB7CiAgICAgICAgIHB1YmxpYzoKICAgICAgICAgICAg IENvbnN0SXRlcmF0b3IoY29uc3QgSGFzaFRhYmxlKiB0YWJsZSwgaW50IHBvc2l0aW9uKQpAQCAt MjUwLDcgKzIzOCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHRlbXBsYXRlIDxjbGFzcyBUaGlz SW1wLCBjbGFzcyBQYXJlbnRJbXA+CiAgICAgaW5saW5lIGJvb2wgZ2V0U3RhdGljUHJvcGVydHlT bG90KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSGFzaFRhYmxlJiB0YWJsZSwgVGhpc0ltcCogdGhp c09iaiwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQogICAg IHsKLSAgICAgICAgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMsIHBy b3BlcnR5TmFtZSk7CisgICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS5lbnRy eShleGVjLT52bSgpLCBwcm9wZXJ0eU5hbWUpOwogCiAgICAgICAgIGlmICghZW50cnkpIC8vIG5v dCBmb3VuZCwgZm9yd2FyZCB0byBwYXJlbnQKICAgICAgICAgICAgIHJldHVybiBQYXJlbnRJbXA6 OmdldE93blByb3BlcnR5U2xvdCh0aGlzT2JqLCBleGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwpA QCAtMjczLDcgKzI2MSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBpZiAoUGFyZW50SW1w OjpnZXRPd25Qcm9wZXJ0eVNsb3QodGhpc09iaiwgZXhlYywgcHJvcGVydHlOYW1lLCBzbG90KSkK ICAgICAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50 cnkgPSB0YWJsZS5lbnRyeShleGVjLCBwcm9wZXJ0eU5hbWUpOworICAgICAgICBjb25zdCBIYXNo RW50cnkqIGVudHJ5ID0gdGFibGUuZW50cnkoZXhlYy0+dm0oKSwgcHJvcGVydHlOYW1lKTsKICAg ICAgICAgaWYgKCFlbnRyeSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMjg3LDcg KzI3NSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHRlbXBsYXRlIDxjbGFzcyBUaGlzSW1wLCBj bGFzcyBQYXJlbnRJbXA+CiAgICAgaW5saW5lIGJvb2wgZ2V0U3RhdGljVmFsdWVTbG90KEV4ZWNT dGF0ZSogZXhlYywgY29uc3QgSGFzaFRhYmxlJiB0YWJsZSwgVGhpc0ltcCogdGhpc09iaiwgUHJv cGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQogICAgIHsKLSAgICAg ICAgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMsIHByb3BlcnR5TmFt ZSk7CisgICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS5lbnRyeShleGVjLT52 bSgpLCBwcm9wZXJ0eU5hbWUpOwogCiAgICAgICAgIGlmICghZW50cnkpIC8vIG5vdCBmb3VuZCwg Zm9yd2FyZCB0byBwYXJlbnQKICAgICAgICAgICAgIHJldHVybiBQYXJlbnRJbXA6OmdldE93blBy b3BlcnR5U2xvdCh0aGlzT2JqLCBleGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwpAQCAtMzE4LDcg KzMwNiw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAqLwogICAgIGlubGluZSBib29sIGxvb2t1 cFB1dChFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEpTT2JqZWN0 KiBiYXNlLCBKU1ZhbHVlIHZhbHVlLCBjb25zdCBIYXNoVGFibGUmIHRhYmxlLCBQdXRQcm9wZXJ0 eVNsb3QmIHNsb3QpCiAgICAgewotICAgICAgICBjb25zdCBIYXNoRW50cnkqIGVudHJ5ID0gdGFi bGUuZW50cnkoZXhlYywgcHJvcGVydHlOYW1lKTsKKyAgICAgICAgY29uc3QgSGFzaEVudHJ5KiBl bnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMtPnZtKCksIHByb3BlcnR5TmFtZSk7CiAKICAgICAgICAg aWYgKCFlbnRyeSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MjVk MWU1Li4zOWEyNzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDItMjggIEFu ZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB1bm5lY2Vz c2FyeSBIYXNoVGFibGUgcmVsYXRlZCBmdW5jdGlvbnMgdGhhdCB0YWtlIEV4ZWNTdGF0ZS4KKyAg ICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTUzMT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5o OgorICAgICAgICAoV2ViQ29yZTo6Z2V0U3RhdGljVmFsdWVTbG90RW50cnlXaXRob3V0Q2FjaGlu Zyk6CisKIDIwMTQtMDItMjggIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAg ICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpIGhpdCB1bmRlciBwbGF0Zm9ybVVzZXJQcmVmZXJyZWRM YW5ndWFnZXMoKSB3aXRoIFdlYktpdDEgYW5kIFdlYktpdDIgaW4gdGhlIHNhbWUgcHJvY2Vzcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmggYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaAppbmRleCBjOGRlNDFiLi43 YzNhYmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRp bmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaApAQCAt NjEwLDEwICs2MTAsMTEgQEAgaW5saW5lIEF0b21pY1N0cmluZyBwcm9wZXJ0eU5hbWVUb0F0b21p Y1N0cmluZyhKU0M6OlByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpCiB0ZW1wbGF0ZSA8Y2xhc3Mg VGhpc0ltcD4KIGlubGluZSBjb25zdCBKU0M6Okhhc2hFbnRyeSogZ2V0U3RhdGljVmFsdWVTbG90 RW50cnlXaXRob3V0Q2FjaGluZyhKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNDOjpQcm9wZXJ0eU5h bWUgcHJvcGVydHlOYW1lKQogewotICAgIGNvbnN0IEpTQzo6SGFzaFRhYmxlKiB0YWJsZSA9IFRo aXNJbXA6OmluZm8oKS0+cHJvcEhhc2hUYWJsZShleGVjKTsKKyAgICBWTSYgdm0gPSBleGVjLT52 bSgpOworICAgIGNvbnN0IEpTQzo6SGFzaFRhYmxlKiB0YWJsZSA9IFRoaXNJbXA6OmluZm8oKS0+ cHJvcEhhc2hUYWJsZSh2bSk7CiAgICAgaWYgKCF0YWJsZSkKICAgICAgICAgcmV0dXJuIGdldFN0 YXRpY1ZhbHVlU2xvdEVudHJ5V2l0aG91dENhY2hpbmc8dHlwZW5hbWUgVGhpc0ltcDo6QmFzZT4o ZXhlYywgcHJvcGVydHlOYW1lKTsKLSAgICBjb25zdCBKU0M6Okhhc2hFbnRyeSogZW50cnkgPSB0 YWJsZS0+ZW50cnkoZXhlYywgcHJvcGVydHlOYW1lKTsKKyAgICBjb25zdCBKU0M6Okhhc2hFbnRy eSogZW50cnkgPSB0YWJsZS0+ZW50cnkodm0sIHByb3BlcnR5TmFtZSk7CiAgICAgaWYgKCFlbnRy eSkgLy8gbm90IGZvdW5kLCBmb3J3YXJkIHRvIHBhcmVudAogICAgICAgICByZXR1cm4gZ2V0U3Rh dGljVmFsdWVTbG90RW50cnlXaXRob3V0Q2FjaGluZzx0eXBlbmFtZSBUaGlzSW1wOjpCYXNlPihl eGVjLCBwcm9wZXJ0eU5hbWUpOwogICAgIHJldHVybiBlbnRyeTsK 225538 2014-02-28 21:50:32 -0800 2014-02-28 21:58:08 -0800 Patch bug-129531-5.diff text/plain 8822 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDAwNWJlMWEuLmIyMjJlYTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE0LTAyLTI4ICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KIAorICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgSGFzaFRh YmxlIHJlbGF0ZWQgZnVuY3Rpb25zIHRoYXQgdGFrZSBFeGVjU3RhdGUuCisgICAgICAgIDxodHRw czovL3dlYmtpdC5vcmcvYi8xMjk1MzE+CisKKyAgICAgICAgUmVtb3ZlIHRoZSBFeGVjU3RhdGUg dmVyc2lvbnMgb2YgdGhlc2UgZnVuY3Rpb25zOgorCisgICAgICAgICAgICAtIENsYXNzSW5mbzo6 cHJvcEhhc2hUYWJsZSgpCisgICAgICAgICAgICAtIEhhc2hUYWJsZTo6aW5pdGlhbGl6ZUlmTmVl ZGVkKCkKKyAgICAgICAgICAgIC0gSGFzaFRhYmxlOjplbnRyeSgpCisKKyAgICAgICAgLi4uYW5k IG1ha2UgY2FsbGVycyBwYXNzIHRoZSBWTSBkaXJlY3RseSBpbnN0ZWFkLgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcnVudGltZS9DbGFzc0luZm8u aDoKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6Z2V0Q2xh c3NQcm9wZXJ0eU5hbWVzKToKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OmdldE93bk5vbkluZGV4 UHJvcGVydHlOYW1lcyk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpyZWlmeVN0YXRpY0Z1bmN0 aW9uc0ZvckRlbGV0ZSk6CisgICAgICAgICogcnVudGltZS9Mb29rdXAuaDoKKyAgICAgICAgKEpT Qzo6Z2V0U3RhdGljUHJvcGVydHlTbG90KToKKyAgICAgICAgKEpTQzo6Z2V0U3RhdGljRnVuY3Rp b25TbG90KToKKyAgICAgICAgKEpTQzo6Z2V0U3RhdGljVmFsdWVTbG90KToKKyAgICAgICAgKEpT Qzo6bG9va3VwUHV0KToKKworMjAxNC0wMi0yOCAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBs ZS5jb20+CisKICAgICAgICAgSlNPYmplY3Q6OmZpbmRQcm9wZXJ0eUhhc2hFbnRyeSgpIHNob3Vs ZCB0YWtlIFZNIGluc3RlYWQgb2YgRXhlY1N0YXRlLgogICAgICAgICA8aHR0cHM6Ly93ZWJraXQu b3JnL2IvMTI5NTI5PgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9DbGFzc0luZm8uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NsYXNzSW5mby5o CmluZGV4IDhmZjc1ZjQuLjhiZDkwZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0NsYXNzSW5mby5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0NsYXNzSW5mby5oCkBAIC0xNTQsMTQgKzE1NCw2IEBAIHN0cnVjdCBDbGFzc0luZm8gewogICAg IC8vIFN0YXRpYyBoYXNoLXRhYmxlIG9mIHByb3BlcnRpZXMuCiAgICAgLy8gRm9yIGNsYXNzZXMg dGhhdCBjYW4gYmUgdXNlZCBmcm9tIG11bHRpcGxlIHRocmVhZHMsIGl0IGlzIGFjY2Vzc2VkIHZp YSBhIGdldHRlciBmdW5jdGlvbgogICAgIC8vIHRoYXQgd291bGQgdHlwaWNhbGx5IHJldHVybiBh IHBvaW50ZXIgdG8gYSB0aHJlYWQtc3BlY2lmaWMgdmFsdWUuCi0gICAgY29uc3QgSGFzaFRhYmxl KiBwcm9wSGFzaFRhYmxlKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKLSAgICB7Ci0gICAgICAgIGlm IChjbGFzc1Byb3BIYXNoVGFibGVHZXR0ZXJGdW5jdGlvbikKLSAgICAgICAgICAgIHJldHVybiAm Y2xhc3NQcm9wSGFzaFRhYmxlR2V0dGVyRnVuY3Rpb24oZXhlYy0+dm0oKSk7Ci0KLSAgICAgICAg cmV0dXJuIHN0YXRpY1Byb3BIYXNoVGFibGU7Ci0gICAgfQotCiAgICAgY29uc3QgSGFzaFRhYmxl KiBwcm9wSGFzaFRhYmxlKFZNJiB2bSkgY29uc3QKICAgICB7CiAgICAgICAgIGlmIChjbGFzc1By b3BIYXNoVGFibGVHZXR0ZXJGdW5jdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTT2JqZWN0LmNwcAppbmRleCBiMGE3MDZlLi5lMjM0MzA0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCkBAIC03MywxNCArNzMsMTQgQEAgY29uc3QgQ2xh c3NJbmZvIEpTT2JqZWN0OjpzX2luZm8gPSB7ICJPYmplY3QiLCAwLCAwLCAwLCBDUkVBVEVfTUVU SE9EX1RBQkxFKEpTT2IKIAogY29uc3QgQ2xhc3NJbmZvIEpTRmluYWxPYmplY3Q6OnNfaW5mbyA9 IHsgIk9iamVjdCIsICZCYXNlOjpzX2luZm8sIDAsIDAsIENSRUFURV9NRVRIT0RfVEFCTEUoSlNG aW5hbE9iamVjdCkgfTsKIAotc3RhdGljIGlubGluZSB2b2lkIGdldENsYXNzUHJvcGVydHlOYW1l cyhFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IENsYXNzSW5mbyogY2xhc3NJbmZvLCBQcm9wZXJ0eU5h bWVBcnJheSYgcHJvcGVydHlOYW1lcywgRW51bWVyYXRpb25Nb2RlIG1vZGUsIGJvb2wgZGlkUmVp ZnkpCitzdGF0aWMgaW5saW5lIHZvaWQgZ2V0Q2xhc3NQcm9wZXJ0eU5hbWVzKFZNJiB2bSwgY29u c3QgQ2xhc3NJbmZvKiBjbGFzc0luZm8sIFByb3BlcnR5TmFtZUFycmF5JiBwcm9wZXJ0eU5hbWVz LCBFbnVtZXJhdGlvbk1vZGUgbW9kZSwgYm9vbCBkaWRSZWlmeSkKIHsKICAgICAvLyBBZGQgcHJv cGVydGllcyBmcm9tIHRoZSBzdGF0aWMgaGFzaHRhYmxlcyBvZiBwcm9wZXJ0aWVzCiAgICAgZm9y ICg7IGNsYXNzSW5mbzsgY2xhc3NJbmZvID0gY2xhc3NJbmZvLT5wYXJlbnRDbGFzcykgewotICAg ICAgICBjb25zdCBIYXNoVGFibGUqIHRhYmxlID0gY2xhc3NJbmZvLT5wcm9wSGFzaFRhYmxlKGV4 ZWMpOworICAgICAgICBjb25zdCBIYXNoVGFibGUqIHRhYmxlID0gY2xhc3NJbmZvLT5wcm9wSGFz aFRhYmxlKHZtKTsKICAgICAgICAgaWYgKCF0YWJsZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICB0YWJsZS0+aW5pdGlhbGl6ZUlmTmVlZGVkKGV4ZWMpOworICAgICAgICB0YWJsZS0+ aW5pdGlhbGl6ZUlmTmVlZGVkKHZtKTsKICAgICAgICAgQVNTRVJUKHRhYmxlLT50YWJsZSk7CiAK ICAgICAgICAgaW50IGhhc2hTaXplTWFzayA9IHRhYmxlLT5jb21wYWN0U2l6ZSAtIDE7CkBAIC0x NTQ5LDkgKzE1NDksOSBAQCB2b2lkIEpTT2JqZWN0OjpnZXRPd25Qcm9wZXJ0eU5hbWVzKEpTT2Jq ZWN0KiBvYmplY3QsIEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYQogCiB2b2lkIEpTT2JqZWN0 OjpnZXRPd25Ob25JbmRleFByb3BlcnR5TmFtZXMoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRl KiBleGVjLCBQcm9wZXJ0eU5hbWVBcnJheSYgcHJvcGVydHlOYW1lcywgRW51bWVyYXRpb25Nb2Rl IG1vZGUpCiB7Ci0gICAgZ2V0Q2xhc3NQcm9wZXJ0eU5hbWVzKGV4ZWMsIG9iamVjdC0+Y2xhc3NJ bmZvKCksIHByb3BlcnR5TmFtZXMsIG1vZGUsIG9iamVjdC0+c3RhdGljRnVuY3Rpb25zUmVpZmll ZCgpKTsKLQogICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CisgICAgZ2V0Q2xhc3NQcm9wZXJ0eU5h bWVzKHZtLCBvYmplY3QtPmNsYXNzSW5mbygpLCBwcm9wZXJ0eU5hbWVzLCBtb2RlLCBvYmplY3Qt PnN0YXRpY0Z1bmN0aW9uc1JlaWZpZWQoKSk7CisKICAgICBib29sIGNhbkNhY2hlUHJvcGVydGll c0Zyb21TdHJ1Y3R1cmUgPSAhcHJvcGVydHlOYW1lcy5zaXplKCk7CiAgICAgb2JqZWN0LT5zdHJ1 Y3R1cmUodm0pLT5nZXRQcm9wZXJ0eU5hbWVzRnJvbVN0cnVjdHVyZSh2bSwgcHJvcGVydHlOYW1l cywgbW9kZSk7CiAKQEAgLTE2MjEsNyArMTYyMSw3IEBAIHZvaWQgSlNPYmplY3Q6OnJlaWZ5U3Rh dGljRnVuY3Rpb25zRm9yRGVsZXRlKEV4ZWNTdGF0ZSogZXhlYykKICAgICAgICAgc2V0U3RydWN0 dXJlKHZtLCBTdHJ1Y3R1cmU6OnRvVW5jYWNoZWFibGVEaWN0aW9uYXJ5VHJhbnNpdGlvbih2bSwg c3RydWN0dXJlKHZtKSkpOwogCiAgICAgZm9yIChjb25zdCBDbGFzc0luZm8qIGluZm8gPSBjbGFz c0luZm8oKTsgaW5mbzsgaW5mbyA9IGluZm8tPnBhcmVudENsYXNzKSB7Ci0gICAgICAgIGNvbnN0 IEhhc2hUYWJsZSogaGFzaFRhYmxlID0gaW5mby0+cHJvcEhhc2hUYWJsZShnbG9iYWxPYmplY3Qo KS0+Z2xvYmFsRXhlYygpKTsKKyAgICAgICAgY29uc3QgSGFzaFRhYmxlKiBoYXNoVGFibGUgPSBp bmZvLT5wcm9wSGFzaFRhYmxlKHZtKTsKICAgICAgICAgaWYgKCFoYXNoVGFibGUpCiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgUHJvcGVydHlTbG90IHNsb3QodGhpcyk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Mb29rdXAuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCmluZGV4IGRiYTM4OWUuLjQ4MGI4NzEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCkBAIC0xMzQsMTIgKzEzNCw2IEBAIG5h bWVzcGFjZSBKU0MgewogICAgICAgICAgICAgICAgIGNyZWF0ZVRhYmxlKHZtKTsKICAgICAgICAg fQogCi0gICAgICAgIEFMV0FZU19JTkxJTkUgdm9pZCBpbml0aWFsaXplSWZOZWVkZWQoRXhlY1N0 YXRlKiBleGVjKSBjb25zdAotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIXRhYmxlKQotICAg ICAgICAgICAgICAgIGNyZWF0ZVRhYmxlKGV4ZWMtPnZtKCkpOwotICAgICAgICB9Ci0KICAgICAg ICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZWxldGVUYWJsZSgpIGNvbnN0OwogCiAgICAgICAg IC8vIEZpbmQgYW4gZW50cnkgaW4gdGhlIHRhYmxlLCBhbmQgcmV0dXJuIHRoZSBlbnRyeS4KQEAg LTE0OSwxMiArMTQzLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgICAgICByZXR1cm4gZW50 cnkoaWRlbnRpZmllcik7CiAgICAgICAgIH0KIAotICAgICAgICBBTFdBWVNfSU5MSU5FIGNvbnN0 IEhhc2hFbnRyeSogZW50cnkoRXhlY1N0YXRlKiBleGVjLCBQcm9wZXJ0eU5hbWUgaWRlbnRpZmll cikgY29uc3QKLSAgICAgICAgewotICAgICAgICAgICAgaW5pdGlhbGl6ZUlmTmVlZGVkKGV4ZWMp OwotICAgICAgICAgICAgcmV0dXJuIGVudHJ5KGlkZW50aWZpZXIpOwotICAgICAgICB9Ci0KICAg ICAgICAgY2xhc3MgQ29uc3RJdGVyYXRvciB7CiAgICAgICAgIHB1YmxpYzoKICAgICAgICAgICAg IENvbnN0SXRlcmF0b3IoY29uc3QgSGFzaFRhYmxlKiB0YWJsZSwgaW50IHBvc2l0aW9uKQpAQCAt MjUwLDcgKzIzOCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHRlbXBsYXRlIDxjbGFzcyBUaGlz SW1wLCBjbGFzcyBQYXJlbnRJbXA+CiAgICAgaW5saW5lIGJvb2wgZ2V0U3RhdGljUHJvcGVydHlT bG90KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSGFzaFRhYmxlJiB0YWJsZSwgVGhpc0ltcCogdGhp c09iaiwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQogICAg IHsKLSAgICAgICAgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMsIHBy b3BlcnR5TmFtZSk7CisgICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS5lbnRy eShleGVjLT52bSgpLCBwcm9wZXJ0eU5hbWUpOwogCiAgICAgICAgIGlmICghZW50cnkpIC8vIG5v dCBmb3VuZCwgZm9yd2FyZCB0byBwYXJlbnQKICAgICAgICAgICAgIHJldHVybiBQYXJlbnRJbXA6 OmdldE93blByb3BlcnR5U2xvdCh0aGlzT2JqLCBleGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwpA QCAtMjczLDcgKzI2MSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBpZiAoUGFyZW50SW1w OjpnZXRPd25Qcm9wZXJ0eVNsb3QodGhpc09iaiwgZXhlYywgcHJvcGVydHlOYW1lLCBzbG90KSkK ICAgICAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50 cnkgPSB0YWJsZS5lbnRyeShleGVjLCBwcm9wZXJ0eU5hbWUpOworICAgICAgICBjb25zdCBIYXNo RW50cnkqIGVudHJ5ID0gdGFibGUuZW50cnkoZXhlYy0+dm0oKSwgcHJvcGVydHlOYW1lKTsKICAg ICAgICAgaWYgKCFlbnRyeSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMjg3LDcg KzI3NSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHRlbXBsYXRlIDxjbGFzcyBUaGlzSW1wLCBj bGFzcyBQYXJlbnRJbXA+CiAgICAgaW5saW5lIGJvb2wgZ2V0U3RhdGljVmFsdWVTbG90KEV4ZWNT dGF0ZSogZXhlYywgY29uc3QgSGFzaFRhYmxlJiB0YWJsZSwgVGhpc0ltcCogdGhpc09iaiwgUHJv cGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQogICAgIHsKLSAgICAg ICAgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMsIHByb3BlcnR5TmFt ZSk7CisgICAgICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSB0YWJsZS5lbnRyeShleGVjLT52 bSgpLCBwcm9wZXJ0eU5hbWUpOwogCiAgICAgICAgIGlmICghZW50cnkpIC8vIG5vdCBmb3VuZCwg Zm9yd2FyZCB0byBwYXJlbnQKICAgICAgICAgICAgIHJldHVybiBQYXJlbnRJbXA6OmdldE93blBy b3BlcnR5U2xvdCh0aGlzT2JqLCBleGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwpAQCAtMzE4LDcg KzMwNiw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAqLwogICAgIGlubGluZSBib29sIGxvb2t1 cFB1dChFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEpTT2JqZWN0 KiBiYXNlLCBKU1ZhbHVlIHZhbHVlLCBjb25zdCBIYXNoVGFibGUmIHRhYmxlLCBQdXRQcm9wZXJ0 eVNsb3QmIHNsb3QpCiAgICAgewotICAgICAgICBjb25zdCBIYXNoRW50cnkqIGVudHJ5ID0gdGFi bGUuZW50cnkoZXhlYywgcHJvcGVydHlOYW1lKTsKKyAgICAgICAgY29uc3QgSGFzaEVudHJ5KiBl bnRyeSA9IHRhYmxlLmVudHJ5KGV4ZWMtPnZtKCksIHByb3BlcnR5TmFtZSk7CiAKICAgICAgICAg aWYgKCFlbnRyeSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MjVk MWU1Li4zOWEyNzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDItMjggIEFu ZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB1bm5lY2Vz c2FyeSBIYXNoVGFibGUgcmVsYXRlZCBmdW5jdGlvbnMgdGhhdCB0YWtlIEV4ZWNTdGF0ZS4KKyAg ICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTUzMT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5o OgorICAgICAgICAoV2ViQ29yZTo6Z2V0U3RhdGljVmFsdWVTbG90RW50cnlXaXRob3V0Q2FjaGlu Zyk6CisKIDIwMTQtMDItMjggIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAg ICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpIGhpdCB1bmRlciBwbGF0Zm9ybVVzZXJQcmVmZXJyZWRM YW5ndWFnZXMoKSB3aXRoIFdlYktpdDEgYW5kIFdlYktpdDIgaW4gdGhlIHNhbWUgcHJvY2Vzcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmggYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaAppbmRleCBjOGRlNDFiLi5l Njc2ZGQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRp bmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaApAQCAt NjEwLDEwICs2MTAsMTEgQEAgaW5saW5lIEF0b21pY1N0cmluZyBwcm9wZXJ0eU5hbWVUb0F0b21p Y1N0cmluZyhKU0M6OlByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpCiB0ZW1wbGF0ZSA8Y2xhc3Mg VGhpc0ltcD4KIGlubGluZSBjb25zdCBKU0M6Okhhc2hFbnRyeSogZ2V0U3RhdGljVmFsdWVTbG90 RW50cnlXaXRob3V0Q2FjaGluZyhKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNDOjpQcm9wZXJ0eU5h bWUgcHJvcGVydHlOYW1lKQogewotICAgIGNvbnN0IEpTQzo6SGFzaFRhYmxlKiB0YWJsZSA9IFRo aXNJbXA6OmluZm8oKS0+cHJvcEhhc2hUYWJsZShleGVjKTsKKyAgICBKU0M6OlZNJiB2bSA9IGV4 ZWMtPnZtKCk7CisgICAgY29uc3QgSlNDOjpIYXNoVGFibGUqIHRhYmxlID0gVGhpc0ltcDo6aW5m bygpLT5wcm9wSGFzaFRhYmxlKHZtKTsKICAgICBpZiAoIXRhYmxlKQogICAgICAgICByZXR1cm4g Z2V0U3RhdGljVmFsdWVTbG90RW50cnlXaXRob3V0Q2FjaGluZzx0eXBlbmFtZSBUaGlzSW1wOjpC YXNlPihleGVjLCBwcm9wZXJ0eU5hbWUpOwotICAgIGNvbnN0IEpTQzo6SGFzaEVudHJ5KiBlbnRy eSA9IHRhYmxlLT5lbnRyeShleGVjLCBwcm9wZXJ0eU5hbWUpOworICAgIGNvbnN0IEpTQzo6SGFz aEVudHJ5KiBlbnRyeSA9IHRhYmxlLT5lbnRyeSh2bSwgcHJvcGVydHlOYW1lKTsKICAgICBpZiAo IWVudHJ5KSAvLyBub3QgZm91bmQsIGZvcndhcmQgdG8gcGFyZW50CiAgICAgICAgIHJldHVybiBn ZXRTdGF0aWNWYWx1ZVNsb3RFbnRyeVdpdGhvdXRDYWNoaW5nPHR5cGVuYW1lIFRoaXNJbXA6OkJh c2U+KGV4ZWMsIHByb3BlcnR5TmFtZSk7CiAgICAgcmV0dXJuIGVudHJ5Owo=