107303 2013-01-18 10:45:33 -0800 Web Inspector: Native Memory Instrumentation: provide edge names and class names for WTF containers and strings 2013-02-01 07:34:25 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 107254 107278 1 loislo loislo apavlov benjamin keishi loislo ojan.autocc pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 810818 0 loislo 2013-01-18 10:45:33 -0800 I think ValueType[] would be good class name for the containers internal data buffers. I can eval the actual class name for ValueType but it will gives us nothing new because the same class name is a part of the container class name. Like WebCore::HashMap<String> Also this class name may significantly increase the footprint of the binary. 810832 1 183504 loislo 2013-01-18 10:52:02 -0800 Created attachment 183504 Patch 811382 2 183620 loislo 2013-01-19 04:21:28 -0800 Created attachment 183620 Patch 822763 3 loislo 2013-02-01 07:34:25 -0800 Committed r141591: <http://trac.webkit.org/changeset/141591> 183504 2013-01-18 10:52:02 -0800 2013-01-19 04:21:20 -0800 Patch bug-107303-20130118224901.patch text/plain 9703 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDE4MDA0Nzc4NmI0MGFmMGJiZTcyODBk ZGIyNmQxZjUxNGNlZGUxMzIuLjFmNDUxMTgwYTlkNTUyZDUyNGRkODQ4NmViZjdlY2QwZWQ0NjM3 ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTMtMDEtMTggIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5hdGl2ZSBNZW1v cnkgSW5zdHJ1bWVudGF0aW9uOiBwcm92aWRlIGVkZ2UgbmFtZXMgYW5kIGNsYXNzIG5hbWVzIGZv ciBXVEYgY29udGFpbmVycyBhbmQgc3RyaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MzAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisgICAgICAgIEknZCBsaWtlIHRvIHVzZSBWYWx1ZVR5cGVbXSBhcyBjbGFzc05h bWUgZm9yIHRoZSBjb250YWluZXIgZGF0YSBtZW1iZXJzCisgICAgICAgIGJlY2F1c2UgY2xhc3Mg bmFtZXMgb2YgdGVtcGxhdGUgcGFyYW1ldGVycyBhbHJlYWR5IHByZXNlbnQgaW4gdGhlIGNvbnRh aW5lciBjbGFzcyBuYW1lcy4KKworICAgICAgICAqIHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25B cnJheUJ1ZmZlclZpZXcuaDoKKyAgICAgICAgKFdURjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAg ICAgICAqIHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoQ291bnRlZFNldC5oOgorICAgICAg ICAoV1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1l bnRhdGlvbkhhc2hNYXAuaDoKKyAgICAgICAgKFdURjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAg ICAgICAqIHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoU2V0Lmg6CisgICAgICAgIChXVEY6 OnJlcG9ydE1lbW9yeVVzYWdlKToKKyAgICAgICAgKiB3dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9u TGlzdEhhc2hTZXQuaDoKKyAgICAgICAgKFdURjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAgICAg ICAqIHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25TZXF1ZW5jZS5oOgorICAgICAgICAqIHd0Zi9N ZW1vcnlJbnN0cnVtZW50YXRpb25TdHJpbmcuaDoKKyAgICAgICAgKFdURjo6cmVwb3J0TWVtb3J5 VXNhZ2UpOgorICAgICAgICAqIHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25WZWN0b3IuaDoKKyAg ICAgICAgKFdURjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorCiAyMDEzLTAxLTE4ICBEYXZpZCBLaWx6 ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IFdURjo6Y29weUxDaGFyc0Zy b21VQ2hhclNvdXJjZSgpIHRvIGNvbXBpbGUgd2l0aCAtV3Nob3J0ZW4tNjQtdG8tMzIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkFycmF5QnVmZmVyVmll dy5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uQXJyYXlCdWZmZXJWaWV3 LmgKaW5kZXggNTJkZTVlMzE4MzMwZTQyNTg0ZjRiMWU4YWE2YjgzZDEwNGMwZjdlZC4uNDVkNDNh ZGI1MDc3MmQ3ZWYxZTk0NTM0MGEwYzZlNDAzZmMwMWIzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uQXJyYXlCdWZmZXJWaWV3LmgKKysrIGIvU291cmNl L1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uQXJyYXlCdWZmZXJWaWV3LmgKQEAgLTM5LDEz ICszOSwxMyBAQCBuYW1lc3BhY2UgV1RGIHsKIGlubGluZSB2b2lkIHJlcG9ydE1lbW9yeVVzYWdl KGNvbnN0IEFycmF5QnVmZmVyVmlldyogYXJyYXlCdWZmZXJWaWV3LCBNZW1vcnlPYmplY3RJbmZv KiBtZW1vcnlPYmplY3RJbmZvKQogewogICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9i amVjdEluZm8sIGFycmF5QnVmZmVyVmlldyk7Ci0gICAgaW5mby5hZGRNZW1iZXIoYXJyYXlCdWZm ZXJWaWV3LT5idWZmZXIoKS5nZXQoKSk7CisgICAgaW5mby5hZGRNZW1iZXIoYXJyYXlCdWZmZXJW aWV3LT5idWZmZXIoKS5nZXQoKSwgImJ1ZmZlciIpOwogfQogCiBpbmxpbmUgdm9pZCByZXBvcnRN ZW1vcnlVc2FnZShjb25zdCBBcnJheUJ1ZmZlciogYXJyYXlCdWZmZXIsIE1lbW9yeU9iamVjdElu Zm8qIG1lbW9yeU9iamVjdEluZm8pCiB7CiAgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5 T2JqZWN0SW5mbywgYXJyYXlCdWZmZXIpOwotICAgIGluZm8uYWRkUmF3QnVmZmVyKGFycmF5QnVm ZmVyLT5kYXRhKCksIGFycmF5QnVmZmVyLT5ieXRlTGVuZ3RoKCkpOworICAgIGluZm8uYWRkUmF3 QnVmZmVyKGFycmF5QnVmZmVyLT5kYXRhKCksIGFycmF5QnVmZmVyLT5ieXRlTGVuZ3RoKCksICJi eXRlW10iLCAiZGF0YSIpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1v cnlJbnN0cnVtZW50YXRpb25IYXNoQ291bnRlZFNldC5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5 SW5zdHJ1bWVudGF0aW9uSGFzaENvdW50ZWRTZXQuaAppbmRleCAxMTg4MTU3YTlkMjJmMjNkMzE2 NDY4ZDY5NGJlY2Y5MzA5ODIxZThjLi4yYmJiYjBmMmY4OTg0ZWMxNDM2MTZhMjVjZDg2OTAyZTkx NTFmZTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25I YXNoQ291bnRlZFNldC5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlv bkhhc2hDb3VudGVkU2V0LmgKQEAgLTQyLDcgKzQyLDcgQEAgdm9pZCByZXBvcnRNZW1vcnlVc2Fn ZShjb25zdCBIYXNoQ291bnRlZFNldDxWYWx1ZUFyZywgSGFzaEFyZywgVHJhaXRzQXJnPiogaGFz aFMKICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCBoYXNoU2V0KTsK IAogICAgIHR5cGVkZWYgSGFzaE1hcDxWYWx1ZUFyZywgdW5zaWduZWQsIEhhc2hBcmcsIFRyYWl0 c0FyZz4gSGFzaE1hcFR5cGU7Ci0gICAgaW5mby5hZGRQcml2YXRlQnVmZmVyKHNpemVvZih0eXBl bmFtZSBIYXNoTWFwVHlwZTo6VmFsdWVUeXBlKSAqIGhhc2hTZXQtPmNhcGFjaXR5KCkpOworICAg IGluZm8uYWRkUHJpdmF0ZUJ1ZmZlcihzaXplb2YodHlwZW5hbWUgSGFzaE1hcFR5cGU6OlZhbHVl VHlwZSkgKiBoYXNoU2V0LT5jYXBhY2l0eSgpLCAiVmFsdWVUeXBlW10iLCAiZGF0YSIpOwogICAg IFNlcXVlbmNlTWVtb3J5SW5zdHJ1bWVudGF0aW9uVHJhaXRzPFZhbHVlQXJnPjo6cmVwb3J0TWVt b3J5VXNhZ2UoaGFzaFNldC0+YmVnaW4oKS5rZXlzKCksIGhhc2hTZXQtPmVuZCgpLmtleXMoKSwg aW5mbyk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRh dGlvbkhhc2hNYXAuaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hN YXAuaAppbmRleCA0OGYzOTJjZDk0N2U5YmFhNzc4NjUyODExMWIzZjJlMDA0YzdjNDM3Li5hYWFh ZjJhNmI4OWM2Mzk1NTYyNGM4ZWY4OTE1OGZkNTIwYTNiMDA3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoTWFwLmgKKysrIGIvU291cmNlL1dURi93 dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaE1hcC5oCkBAIC00MSw3ICs0MSw3IEBAIHZvaWQg cmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgSGFzaE1hcDxLZXlBcmcsIE1hcHBlZEFyZywgSGFzaEFy ZywgS2V5VHJhaXRzQXJnLCBNCiB7CiAgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2Jq ZWN0SW5mbywgaGFzaE1hcCk7CiAgICAgdHlwZWRlZiBIYXNoTWFwPEtleUFyZywgTWFwcGVkQXJn LCBIYXNoQXJnLCBLZXlUcmFpdHNBcmcsIE1hcHBlZFRyYWl0c0FyZz4gSGFzaE1hcFR5cGU7Ci0g ICAgaW5mby5hZGRQcml2YXRlQnVmZmVyKHNpemVvZih0eXBlbmFtZSBIYXNoTWFwVHlwZTo6VmFs dWVUeXBlKSAqIGhhc2hNYXAtPmNhcGFjaXR5KCkpOworICAgIGluZm8uYWRkUHJpdmF0ZUJ1ZmZl cihzaXplb2YodHlwZW5hbWUgSGFzaE1hcFR5cGU6OlZhbHVlVHlwZSkgKiBoYXNoTWFwLT5jYXBh Y2l0eSgpLCAiVmFsdWVUeXBlW10iLCAiZGF0YSIpOwogCiAgICAgU2VxdWVuY2VNZW1vcnlJbnN0 cnVtZW50YXRpb25UcmFpdHM8S2V5QXJnPjo6cmVwb3J0TWVtb3J5VXNhZ2UoaGFzaE1hcC0+YmVn aW4oKS5rZXlzKCksIGhhc2hNYXAtPmVuZCgpLmtleXMoKSwgaW5mbyk7CiAgICAgU2VxdWVuY2VN ZW1vcnlJbnN0cnVtZW50YXRpb25UcmFpdHM8TWFwcGVkQXJnPjo6cmVwb3J0TWVtb3J5VXNhZ2Uo aGFzaE1hcC0+YmVnaW4oKS52YWx1ZXMoKSwgaGFzaE1hcC0+ZW5kKCkudmFsdWVzKCksIGluZm8p OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFNl dC5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFNldC5oCmluZGV4 IGQ4MTY0N2FiMjM0YTI3ZmUxNjc0YTczNWRlYjZhNGM3ZTFjNjI5ZTUuLjdkOTg2YjE4ZjUzMzlj NjVmYTdkNzVhMTgzYTVjYzg0MTc1MzdkYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01l bW9yeUluc3RydW1lbnRhdGlvbkhhc2hTZXQuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJ bnN0cnVtZW50YXRpb25IYXNoU2V0LmgKQEAgLTQwLDcgKzQwLDcgQEAgdGVtcGxhdGU8dHlwZW5h bWUgVmFsdWVBcmcsIHR5cGVuYW1lIEhhc2hBcmcsIHR5cGVuYW1lIFRyYWl0c0FyZz4KIHZvaWQg cmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgSGFzaFNldDxWYWx1ZUFyZywgSGFzaEFyZywgVHJhaXRz QXJnPiogaGFzaFNldCwgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykKIHsKICAg ICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCBoYXNoU2V0KTsKLSAgICBp bmZvLmFkZFByaXZhdGVCdWZmZXIoc2l6ZW9mKHR5cGVuYW1lIEhhc2hUYWJsZTxWYWx1ZUFyZywg VmFsdWVBcmcsIElkZW50aXR5RXh0cmFjdG9yLCBIYXNoQXJnLCBUcmFpdHNBcmcsIFRyYWl0c0Fy Zz46OlZhbHVlVHlwZSkgKiBoYXNoU2V0LT5jYXBhY2l0eSgpKTsKKyAgICBpbmZvLmFkZFByaXZh dGVCdWZmZXIoc2l6ZW9mKHR5cGVuYW1lIEhhc2hUYWJsZTxWYWx1ZUFyZywgVmFsdWVBcmcsIElk ZW50aXR5RXh0cmFjdG9yLCBIYXNoQXJnLCBUcmFpdHNBcmcsIFRyYWl0c0FyZz46OlZhbHVlVHlw ZSkgKiBoYXNoU2V0LT5jYXBhY2l0eSgpLCAiVmFsdWVUeXBlW10iLCAiZGF0YSIpOwogICAgIFNl cXVlbmNlTWVtb3J5SW5zdHJ1bWVudGF0aW9uVHJhaXRzPFZhbHVlQXJnPjo6cmVwb3J0TWVtb3J5 VXNhZ2UoaGFzaFNldC0+YmVnaW4oKSwgaGFzaFNldC0+ZW5kKCksIGluZm8pOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25MaXN0SGFzaFNldC5o IGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uTGlzdEhhc2hTZXQuaAppbmRl eCA5Y2FlOGExZjNmNDRlOWRkNmI5MTdiMTBkODUyNjAzZmM1ZmQ2Njk2Li41ZDJiOTZkZjU2MWZj YmIzYjMxNmM5ODYyNjRlYzUyYmRiMTMxZTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9N ZW1vcnlJbnN0cnVtZW50YXRpb25MaXN0SGFzaFNldC5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01l bW9yeUluc3RydW1lbnRhdGlvbkxpc3RIYXNoU2V0LmgKQEAgLTQwLDcgKzQwLDcgQEAgdGVtcGxh dGU8dHlwZW5hbWUgVmFsdWVBcmcsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUgSGFz aEFyZz4KIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgTGlzdEhhc2hTZXQ8VmFsdWVBcmcs IGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPiogc2V0LCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlP YmplY3RJbmZvKQogewogICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8s IHNldCk7Ci0gICAgaW5mby5hZGRQcml2YXRlQnVmZmVyKHNldC0+c2l6ZUluQnl0ZXMoKSAtIHNp emVvZigqc2V0KSk7CisgICAgaW5mby5hZGRQcml2YXRlQnVmZmVyKHNldC0+c2l6ZUluQnl0ZXMo KSAtIHNpemVvZigqc2V0KSwgIlZhbHVlVHlwZVtdIiwgImRhdGEiKTsKICAgICBTZXF1ZW5jZU1l bW9yeUluc3RydW1lbnRhdGlvblRyYWl0czxWYWx1ZUFyZz46OnJlcG9ydE1lbW9yeVVzYWdlKHNl dC0+YmVnaW4oKSwgc2V0LT5lbmQoKSwgaW5mbyk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X VEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmggYi9Tb3VyY2UvV1RGL3d0Zi9N ZW1vcnlJbnN0cnVtZW50YXRpb25TZXF1ZW5jZS5oCmluZGV4IGY3NzFmOTc3MTBlNzNmOWJmNzk5 NzY1ZDk4NWEyYTQ5YTM2ZjkzZjMuLmUzZjczOTQ1OWY3MzUzMTEzZTIxYjU1ZmEyODJmZDk5YmQ2 NzMwNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblNl cXVlbmNlLmgKKysrIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uU2VxdWVu Y2UuaApAQCAtNTgsNyArNTgsNyBAQCBzdHJ1Y3QgU2VxdWVuY2VNZW1vcnlJbnN0cnVtZW50YXRp b25UcmFpdHM8Tm90Q29udmVydGlibGVUb0ludGVnZXI8VmFsdWVUeXBlPiA+CiAgICAgc3RhdGlj IHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoSSBpdGVyYXRvciwgSSBlbmQsIE1lbW9yeUNsYXNzSW5m byYgaW5mbykKICAgICB7CiAgICAgICAgIHdoaWxlIChpdGVyYXRvciAhPSBlbmQpIHsKLSAgICAg ICAgICAgIGluZm8uYWRkTWVtYmVyKCppdGVyYXRvcik7CisgICAgICAgICAgICBpbmZvLmFkZE1l bWJlcigqaXRlcmF0b3IsICJpdGVtIik7CiAgICAgICAgICAgICArK2l0ZXJhdG9yOwogICAgICAg ICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0 aW9uU3RyaW5nLmggYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25TdHJpbmcu aAppbmRleCBhMjNiYWEzZGFmYWYxZmNlY2E4NTVhNWJlMjYzY2RkNzM3NzljYWY1Li5kMjQ5MmM4 ODI1MGJkNzUxODRkODc0Y2ZlMGVjYjFkZDM3NjFjYjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RG L3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25TdHJpbmcuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9N ZW1vcnlJbnN0cnVtZW50YXRpb25TdHJpbmcuaApAQCAtNTQsMjYgKzU0LDI2IEBAIGlubGluZSB2 b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IFN0cmluZ0ltcGwqIHN0cmluZ0ltcGwsIE1lbW9y eU9iamVjdEluZm8qIG1lCiAgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5m bywgc3RyaW5nSW1wbCwgMCwgc2VsZlNpemUpOwogCiAgICAgaWYgKFN0cmluZ0ltcGwqIGJhc2VT dHJpbmcgPSBzdHJpbmdJbXBsLT5iYXNlU3RyaW5nKCkpCi0gICAgICAgIGluZm8uYWRkTWVtYmVy KGJhc2VTdHJpbmcpOworICAgICAgICBpbmZvLmFkZE1lbWJlcihiYXNlU3RyaW5nLCAiYmFzZVN0 cmluZyIpOwogICAgIGVsc2UgewogICAgICAgICBpZiAoc3RyaW5nSW1wbC0+aGFzT3duZWRCdWZm ZXIoKSkKLSAgICAgICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKGJ1ZmZlciwgYnVmZmVyU2l6ZSk7 CisgICAgICAgICAgICBpbmZvLmFkZFJhd0J1ZmZlcihidWZmZXIsIGJ1ZmZlclNpemUsICJjaGFy W10iLCAib3duZWRCdWZmZXIiKTsKIAogICAgICAgICBpZiAoc3RyaW5nSW1wbC0+aGFzMTZCaXRT aGFkb3coKSkKLSAgICAgICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKHN0cmluZ0ltcGwtPmNoYXJh Y3RlcnMoKSwgbGVuZ3RoICogc2l6ZW9mKFVDaGFyKSk7CisgICAgICAgICAgICBpbmZvLmFkZFJh d0J1ZmZlcihzdHJpbmdJbXBsLT5jaGFyYWN0ZXJzKCksIGxlbmd0aCAqIHNpemVvZihVQ2hhciks ICJVQ2hhcltdIiwgIjE2Yml0U2hhZG93Iik7CiAgICAgfQogfQogCiBpbmxpbmUgdm9pZCByZXBv cnRNZW1vcnlVc2FnZShjb25zdCBTdHJpbmcqIHN0cmluZywgTWVtb3J5T2JqZWN0SW5mbyogbWVt b3J5T2JqZWN0SW5mbykKIHsKICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJ bmZvLCBzdHJpbmcpOwotICAgIGluZm8uYWRkTWVtYmVyKHN0cmluZy0+aW1wbCgpKTsKKyAgICBp bmZvLmFkZE1lbWJlcihzdHJpbmctPmltcGwoKSwgInN0cmluZ0ltcGwiKTsKIH0KIAogaW5saW5l IHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgQXRvbWljU3RyaW5nKiBhdG9taWNTdHJpbmcs IE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCiB7CiAgICAgTWVtb3J5Q2xhc3NJ bmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgYXRvbWljU3RyaW5nKTsKLSAgICBpbmZvLmFkZE1l bWJlcihhdG9taWNTdHJpbmctPnN0cmluZygpKTsKKyAgICBpbmZvLmFkZE1lbWJlcihhdG9taWNT dHJpbmctPnN0cmluZygpLCAic3RyaW5nIik7CiB9CiAKIGlubGluZSB2b2lkIHJlcG9ydE1lbW9y eVVzYWdlKGNvbnN0IENTdHJpbmdCdWZmZXIqIGNTdHJpbmdCdWZmZXIsIE1lbW9yeU9iamVjdElu Zm8qIG1lbW9yeU9iamVjdEluZm8pCkBAIC04NCw3ICs4NCw3IEBAIGlubGluZSB2b2lkIHJlcG9y dE1lbW9yeVVzYWdlKGNvbnN0IENTdHJpbmdCdWZmZXIqIGNTdHJpbmdCdWZmZXIsIE1lbW9yeU9i amVjdEluCiBpbmxpbmUgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25zdCBDU3RyaW5nKiBjU3Ry aW5nLCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKQogewogICAgIE1lbW9yeUNs YXNzSW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8sIGNTdHJpbmcpOwotICAgIGluZm8uYWRkTWVt YmVyKGNTdHJpbmctPmJ1ZmZlcigpKTsKKyAgICBpbmZvLmFkZE1lbWJlcihjU3RyaW5nLT5idWZm ZXIoKSwgImJ1ZmZlciIpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1v cnlJbnN0cnVtZW50YXRpb25WZWN0b3IuaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1l bnRhdGlvblZlY3Rvci5oCmluZGV4IGNhZTg0N2M5ZWQ5NzhlY2I3MTBhMTdlYTU1ZDE0MzNkYmUx OTUzZGYuLmUzNDllZGY4M2MyYWE1MmI0OTVmODlkOTUyMGU4MTkwOTY1NGRiZDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblZlY3Rvci5oCisrKyBiL1Nv dXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblZlY3Rvci5oCkBAIC00MSw3ICs0MSw3 IEBAIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgVmVjdG9yPFQsIGlubGluZUNhcGFjaXR5 PiogdmVjdG9yLCBNZW1vcnlPYmplY3RJbmZvCiB7CiAgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8o bWVtb3J5T2JqZWN0SW5mbywgdmVjdG9yKTsKICAgICBpZiAoaW5saW5lQ2FwYWNpdHkgPCB2ZWN0 b3ItPmNhcGFjaXR5KCkpCi0gICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKHZlY3Rvci0+ZGF0YSgp LCB2ZWN0b3ItPmNhcGFjaXR5KCkgKiBzaXplb2YoVCkpOworICAgICAgICBpbmZvLmFkZFJhd0J1 ZmZlcih2ZWN0b3ItPmRhdGEoKSwgdmVjdG9yLT5jYXBhY2l0eSgpICogc2l6ZW9mKFQpLCAiVmFs dWVUeXBlW10iLCAiZGF0YSIpOwogICAgIFNlcXVlbmNlTWVtb3J5SW5zdHJ1bWVudGF0aW9uVHJh aXRzPFQ+OjpyZXBvcnRNZW1vcnlVc2FnZSh2ZWN0b3ItPmJlZ2luKCksIHZlY3Rvci0+ZW5kKCks IGluZm8pOwogfQogCg== 183620 2013-01-19 04:21:28 -0800 2013-02-01 03:17:30 -0800 Patch bug-107303-20130119161825.patch text/plain 9684 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDAyMTg3MjAxODhmMjc5ZTQ0M2JmMTYz NDE2Y2E2NzNkNmQ1MjE0YWEuLjQ4ZWVjNjIzMjJkNjAwYWNiYTk1OGFiMTA2YmJiOWZhMDg5NDAx ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTMtMDEtMTggIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5hdGl2ZSBNZW1v cnkgSW5zdHJ1bWVudGF0aW9uOiBwcm92aWRlIGVkZ2UgbmFtZXMgYW5kIGNsYXNzIG5hbWVzIGZv ciBXVEYgY29udGFpbmVycyBhbmQgc3RyaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MzAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgSSdkIGxpa2UgdG8gdXNlIFZhbHVlVHlwZVtdIGFzIGNsYXNz TmFtZSBmb3IgdGhlIGNvbnRhaW5lciBkYXRhIG1lbWJlcnMKKyAgICAgICAgYmVjYXVzZSBjbGFz cyBuYW1lcyBvZiB0ZW1wbGF0ZSBwYXJhbWV0ZXJzIGFscmVhZHkgcHJlc2VudCBpbiB0aGUgY29u dGFpbmVyIGNsYXNzIG5hbWVzLgorCisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlv bkFycmF5QnVmZmVyVmlldy5oOgorICAgICAgICAoV1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6Cisg ICAgICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hDb3VudGVkU2V0Lmg6CisgICAg ICAgIChXVEY6OnJlcG9ydE1lbW9yeVVzYWdlKToKKyAgICAgICAgKiB3dGYvTWVtb3J5SW5zdHJ1 bWVudGF0aW9uSGFzaE1hcC5oOgorICAgICAgICAoV1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6Cisg ICAgICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hTZXQuaDoKKyAgICAgICAgKFdU Rjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAgICAgICAqIHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRp b25MaXN0SGFzaFNldC5oOgorICAgICAgICAoV1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAg ICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmg6CisgICAgICAgICogd3Rm L01lbW9yeUluc3RydW1lbnRhdGlvblN0cmluZy5oOgorICAgICAgICAoV1RGOjpyZXBvcnRNZW1v cnlVc2FnZSk6CisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblZlY3Rvci5oOgor ICAgICAgICAoV1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisKIDIwMTMtMDEtMTggIExhc3psbyBH b21ib3MgIDxsLmdvbWJvc0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW5uZWNlc3Nh cnkgUExBVEZPUk0oKSB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5z dHJ1bWVudGF0aW9uQXJyYXlCdWZmZXJWaWV3LmggYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0 cnVtZW50YXRpb25BcnJheUJ1ZmZlclZpZXcuaAppbmRleCA1MmRlNWUzMTgzMzBlNDI1ODRmNGIx ZThhYTZiODNkMTA0YzBmN2VkLi40NWQ0M2FkYjUwNzcyZDdlZjFlOTQ1MzQwYTBjNmU0MDNmYzAx YjNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25BcnJh eUJ1ZmZlclZpZXcuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25B cnJheUJ1ZmZlclZpZXcuaApAQCAtMzksMTMgKzM5LDEzIEBAIG5hbWVzcGFjZSBXVEYgewogaW5s aW5lIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgQXJyYXlCdWZmZXJWaWV3KiBhcnJheUJ1 ZmZlclZpZXcsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCiB7CiAgICAgTWVt b3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgYXJyYXlCdWZmZXJWaWV3KTsKLSAg ICBpbmZvLmFkZE1lbWJlcihhcnJheUJ1ZmZlclZpZXctPmJ1ZmZlcigpLmdldCgpKTsKKyAgICBp bmZvLmFkZE1lbWJlcihhcnJheUJ1ZmZlclZpZXctPmJ1ZmZlcigpLmdldCgpLCAiYnVmZmVyIik7 CiB9CiAKIGlubGluZSB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IEFycmF5QnVmZmVyKiBh cnJheUJ1ZmZlciwgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykKIHsKICAgICBN ZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCBhcnJheUJ1ZmZlcik7Ci0gICAg aW5mby5hZGRSYXdCdWZmZXIoYXJyYXlCdWZmZXItPmRhdGEoKSwgYXJyYXlCdWZmZXItPmJ5dGVM ZW5ndGgoKSk7CisgICAgaW5mby5hZGRSYXdCdWZmZXIoYXJyYXlCdWZmZXItPmRhdGEoKSwgYXJy YXlCdWZmZXItPmJ5dGVMZW5ndGgoKSwgImJ5dGVbXSIsICJkYXRhIik7CiB9CiAKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hDb3VudGVkU2V0 LmggYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoQ291bnRlZFNldC5o CmluZGV4IDExODgxNTdhOWQyMmYyM2QzMTY0NjhkNjk0YmVjZjkzMDk4MjFlOGMuLmY3OTMxOGQz ZmI1ZjNkYzY1MjA5N2ZlZmIzZWUwYjhhMmM1MjkwNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv d3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hDb3VudGVkU2V0LmgKKysrIGIvU291cmNlL1dU Ri93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaENvdW50ZWRTZXQuaApAQCAtNDIsNyArNDIs NyBAQCB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IEhhc2hDb3VudGVkU2V0PFZhbHVlQXJn LCBIYXNoQXJnLCBUcmFpdHNBcmc+KiBoYXNoUwogICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1l bW9yeU9iamVjdEluZm8sIGhhc2hTZXQpOwogCiAgICAgdHlwZWRlZiBIYXNoTWFwPFZhbHVlQXJn LCB1bnNpZ25lZCwgSGFzaEFyZywgVHJhaXRzQXJnPiBIYXNoTWFwVHlwZTsKLSAgICBpbmZvLmFk ZFByaXZhdGVCdWZmZXIoc2l6ZW9mKHR5cGVuYW1lIEhhc2hNYXBUeXBlOjpWYWx1ZVR5cGUpICog aGFzaFNldC0+Y2FwYWNpdHkoKSk7CisgICAgaW5mby5hZGRQcml2YXRlQnVmZmVyKHNpemVvZih0 eXBlbmFtZSBIYXNoTWFwVHlwZTo6VmFsdWVUeXBlKSAqIGhhc2hTZXQtPmNhcGFjaXR5KCksIDAs ICJWYWx1ZVR5cGVbXSIsICJkYXRhIik7CiAgICAgU2VxdWVuY2VNZW1vcnlJbnN0cnVtZW50YXRp b25UcmFpdHM8VmFsdWVBcmc+OjpyZXBvcnRNZW1vcnlVc2FnZShoYXNoU2V0LT5iZWdpbigpLmtl eXMoKSwgaGFzaFNldC0+ZW5kKCkua2V5cygpLCBpbmZvKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaE1hcC5oIGIvU291cmNlL1dURi93 dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaE1hcC5oCmluZGV4IDQ4ZjM5MmNkOTQ3ZTliYWE3 Nzg2NTI4MTExYjNmMmUwMDRjN2M0MzcuLmRjZGI3NTVkMTI2YmI1MjVmNWJhM2JkNmJjNDgxYTI0 OTBhYThhYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlv bkhhc2hNYXAuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNo TWFwLmgKQEAgLTQxLDcgKzQxLDcgQEAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25zdCBIYXNo TWFwPEtleUFyZywgTWFwcGVkQXJnLCBIYXNoQXJnLCBLZXlUcmFpdHNBcmcsIE0KIHsKICAgICBN ZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCBoYXNoTWFwKTsKICAgICB0eXBl ZGVmIEhhc2hNYXA8S2V5QXJnLCBNYXBwZWRBcmcsIEhhc2hBcmcsIEtleVRyYWl0c0FyZywgTWFw cGVkVHJhaXRzQXJnPiBIYXNoTWFwVHlwZTsKLSAgICBpbmZvLmFkZFByaXZhdGVCdWZmZXIoc2l6 ZW9mKHR5cGVuYW1lIEhhc2hNYXBUeXBlOjpWYWx1ZVR5cGUpICogaGFzaE1hcC0+Y2FwYWNpdHko KSk7CisgICAgaW5mby5hZGRQcml2YXRlQnVmZmVyKHNpemVvZih0eXBlbmFtZSBIYXNoTWFwVHlw ZTo6VmFsdWVUeXBlKSAqIGhhc2hNYXAtPmNhcGFjaXR5KCksIDAsICJWYWx1ZVR5cGVbXSIsICJk YXRhIik7CiAKICAgICBTZXF1ZW5jZU1lbW9yeUluc3RydW1lbnRhdGlvblRyYWl0czxLZXlBcmc+ OjpyZXBvcnRNZW1vcnlVc2FnZShoYXNoTWFwLT5iZWdpbigpLmtleXMoKSwgaGFzaE1hcC0+ZW5k KCkua2V5cygpLCBpbmZvKTsKICAgICBTZXF1ZW5jZU1lbW9yeUluc3RydW1lbnRhdGlvblRyYWl0 czxNYXBwZWRBcmc+OjpyZXBvcnRNZW1vcnlVc2FnZShoYXNoTWFwLT5iZWdpbigpLnZhbHVlcygp LCBoYXNoTWFwLT5lbmQoKS52YWx1ZXMoKSwgaW5mbyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RG L3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoU2V0LmggYi9Tb3VyY2UvV1RGL3d0Zi9NZW1v cnlJbnN0cnVtZW50YXRpb25IYXNoU2V0LmgKaW5kZXggZDgxNjQ3YWIyMzRhMjdmZTE2NzRhNzM1 ZGViNmE0YzdlMWM2MjllNS4uNjgwNjQ5NDQ1OWQ5MzA0MzAyNzM3YTZlNTY4N2Y5YjUxZDIyZjRk YyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFNl dC5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hTZXQuaApA QCAtNDAsNyArNDAsNyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBWYWx1ZUFyZywgdHlwZW5hbWUgSGFz aEFyZywgdHlwZW5hbWUgVHJhaXRzQXJnPgogdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25zdCBI YXNoU2V0PFZhbHVlQXJnLCBIYXNoQXJnLCBUcmFpdHNBcmc+KiBoYXNoU2V0LCBNZW1vcnlPYmpl Y3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKQogewogICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1l bW9yeU9iamVjdEluZm8sIGhhc2hTZXQpOwotICAgIGluZm8uYWRkUHJpdmF0ZUJ1ZmZlcihzaXpl b2YodHlwZW5hbWUgSGFzaFRhYmxlPFZhbHVlQXJnLCBWYWx1ZUFyZywgSWRlbnRpdHlFeHRyYWN0 b3IsIEhhc2hBcmcsIFRyYWl0c0FyZywgVHJhaXRzQXJnPjo6VmFsdWVUeXBlKSAqIGhhc2hTZXQt PmNhcGFjaXR5KCkpOworICAgIGluZm8uYWRkUHJpdmF0ZUJ1ZmZlcihzaXplb2YodHlwZW5hbWUg SGFzaFRhYmxlPFZhbHVlQXJnLCBWYWx1ZUFyZywgSWRlbnRpdHlFeHRyYWN0b3IsIEhhc2hBcmcs IFRyYWl0c0FyZywgVHJhaXRzQXJnPjo6VmFsdWVUeXBlKSAqIGhhc2hTZXQtPmNhcGFjaXR5KCks IDAsICJWYWx1ZVR5cGVbXSIsICJkYXRhIik7CiAgICAgU2VxdWVuY2VNZW1vcnlJbnN0cnVtZW50 YXRpb25UcmFpdHM8VmFsdWVBcmc+OjpyZXBvcnRNZW1vcnlVc2FnZShoYXNoU2V0LT5iZWdpbigp LCBoYXNoU2V0LT5lbmQoKSwgaW5mbyk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3Rm L01lbW9yeUluc3RydW1lbnRhdGlvbkxpc3RIYXNoU2V0LmggYi9Tb3VyY2UvV1RGL3d0Zi9NZW1v cnlJbnN0cnVtZW50YXRpb25MaXN0SGFzaFNldC5oCmluZGV4IDljYWU4YTFmM2Y0NGU5ZGQ2Yjkx N2IxMGQ4NTI2MDNmYzVmZDY2OTYuLjVkYTJlZDI3ODJkMmFkMTU5ZGRhNWY3NWU4YzY1YWVkZjkx ZjNlN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkxp c3RIYXNoU2V0LmgKKysrIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uTGlz dEhhc2hTZXQuaApAQCAtNDAsNyArNDAsNyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBWYWx1ZUFyZywg c2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBIYXNoQXJnPgogdm9pZCByZXBvcnRNZW1v cnlVc2FnZShjb25zdCBMaXN0SGFzaFNldDxWYWx1ZUFyZywgaW5saW5lQ2FwYWNpdHksIEhhc2hB cmc+KiBzZXQsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCiB7CiAgICAgTWVt b3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgc2V0KTsKLSAgICBpbmZvLmFkZFBy aXZhdGVCdWZmZXIoc2V0LT5zaXplSW5CeXRlcygpIC0gc2l6ZW9mKCpzZXQpKTsKKyAgICBpbmZv LmFkZFByaXZhdGVCdWZmZXIoc2V0LT5zaXplSW5CeXRlcygpIC0gc2l6ZW9mKCpzZXQpLCAwLCAi VmFsdWVUeXBlW10iLCAiZGF0YSIpOwogICAgIFNlcXVlbmNlTWVtb3J5SW5zdHJ1bWVudGF0aW9u VHJhaXRzPFZhbHVlQXJnPjo6cmVwb3J0TWVtb3J5VXNhZ2Uoc2V0LT5iZWdpbigpLCBzZXQtPmVu ZCgpLCBpbmZvKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1 bWVudGF0aW9uU2VxdWVuY2UuaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlv blNlcXVlbmNlLmgKaW5kZXggZjc3MWY5NzcxMGU3M2Y5YmY3OTk3NjVkOTg1YTJhNDlhMzZmOTNm My4uZTNmNzM5NDU5ZjczNTMxMTNlMjFiNTVmYTI4MmZkOTliZDY3MzA3NSAxMDA2NDQKLS0tIGEv U291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uU2VxdWVuY2UuaAorKysgYi9Tb3Vy Y2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25TZXF1ZW5jZS5oCkBAIC01OCw3ICs1OCw3 IEBAIHN0cnVjdCBTZXF1ZW5jZU1lbW9yeUluc3RydW1lbnRhdGlvblRyYWl0czxOb3RDb252ZXJ0 aWJsZVRvSW50ZWdlcjxWYWx1ZVR5cGU+ID4KICAgICBzdGF0aWMgdm9pZCByZXBvcnRNZW1vcnlV c2FnZShJIGl0ZXJhdG9yLCBJIGVuZCwgTWVtb3J5Q2xhc3NJbmZvJiBpbmZvKQogICAgIHsKICAg ICAgICAgd2hpbGUgKGl0ZXJhdG9yICE9IGVuZCkgewotICAgICAgICAgICAgaW5mby5hZGRNZW1i ZXIoKml0ZXJhdG9yKTsKKyAgICAgICAgICAgIGluZm8uYWRkTWVtYmVyKCppdGVyYXRvciwgIml0 ZW0iKTsKICAgICAgICAgICAgICsraXRlcmF0b3I7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25TdHJpbmcuaCBiL1NvdXJj ZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblN0cmluZy5oCmluZGV4IGEyM2JhYTNkYWZh ZjFmY2VjYTg1NWE1YmUyNjNjZGQ3Mzc3OWNhZjUuLmQyNDkyYzg4MjUwYmQ3NTE4NGQ4NzRjZmUw ZWNiMWRkMzc2MWNiNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1l bnRhdGlvblN0cmluZy5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlv blN0cmluZy5oCkBAIC01NCwyNiArNTQsMjYgQEAgaW5saW5lIHZvaWQgcmVwb3J0TWVtb3J5VXNh Z2UoY29uc3QgU3RyaW5nSW1wbCogc3RyaW5nSW1wbCwgTWVtb3J5T2JqZWN0SW5mbyogbWUKICAg ICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCBzdHJpbmdJbXBsLCAwLCBz ZWxmU2l6ZSk7CiAKICAgICBpZiAoU3RyaW5nSW1wbCogYmFzZVN0cmluZyA9IHN0cmluZ0ltcGwt PmJhc2VTdHJpbmcoKSkKLSAgICAgICAgaW5mby5hZGRNZW1iZXIoYmFzZVN0cmluZyk7CisgICAg ICAgIGluZm8uYWRkTWVtYmVyKGJhc2VTdHJpbmcsICJiYXNlU3RyaW5nIik7CiAgICAgZWxzZSB7 CiAgICAgICAgIGlmIChzdHJpbmdJbXBsLT5oYXNPd25lZEJ1ZmZlcigpKQotICAgICAgICAgICAg aW5mby5hZGRSYXdCdWZmZXIoYnVmZmVyLCBidWZmZXJTaXplKTsKKyAgICAgICAgICAgIGluZm8u YWRkUmF3QnVmZmVyKGJ1ZmZlciwgYnVmZmVyU2l6ZSwgImNoYXJbXSIsICJvd25lZEJ1ZmZlciIp OwogCiAgICAgICAgIGlmIChzdHJpbmdJbXBsLT5oYXMxNkJpdFNoYWRvdygpKQotICAgICAgICAg ICAgaW5mby5hZGRSYXdCdWZmZXIoc3RyaW5nSW1wbC0+Y2hhcmFjdGVycygpLCBsZW5ndGggKiBz aXplb2YoVUNoYXIpKTsKKyAgICAgICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKHN0cmluZ0ltcGwt PmNoYXJhY3RlcnMoKSwgbGVuZ3RoICogc2l6ZW9mKFVDaGFyKSwgIlVDaGFyW10iLCAiMTZiaXRT aGFkb3ciKTsKICAgICB9CiB9CiAKIGlubGluZSB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0 IFN0cmluZyogc3RyaW5nLCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKQogewog ICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8sIHN0cmluZyk7Ci0gICAg aW5mby5hZGRNZW1iZXIoc3RyaW5nLT5pbXBsKCkpOworICAgIGluZm8uYWRkTWVtYmVyKHN0cmlu Zy0+aW1wbCgpLCAic3RyaW5nSW1wbCIpOwogfQogCiBpbmxpbmUgdm9pZCByZXBvcnRNZW1vcnlV c2FnZShjb25zdCBBdG9taWNTdHJpbmcqIGF0b21pY1N0cmluZywgTWVtb3J5T2JqZWN0SW5mbyog bWVtb3J5T2JqZWN0SW5mbykKIHsKICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmpl Y3RJbmZvLCBhdG9taWNTdHJpbmcpOwotICAgIGluZm8uYWRkTWVtYmVyKGF0b21pY1N0cmluZy0+ c3RyaW5nKCkpOworICAgIGluZm8uYWRkTWVtYmVyKGF0b21pY1N0cmluZy0+c3RyaW5nKCksICJz dHJpbmciKTsKIH0KIAogaW5saW5lIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgQ1N0cmlu Z0J1ZmZlciogY1N0cmluZ0J1ZmZlciwgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5m bykKQEAgLTg0LDcgKzg0LDcgQEAgaW5saW5lIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoY29uc3Qg Q1N0cmluZ0J1ZmZlciogY1N0cmluZ0J1ZmZlciwgTWVtb3J5T2JqZWN0SW4KIGlubGluZSB2b2lk IHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IENTdHJpbmcqIGNTdHJpbmcsIE1lbW9yeU9iamVjdElu Zm8qIG1lbW9yeU9iamVjdEluZm8pCiB7CiAgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5 T2JqZWN0SW5mbywgY1N0cmluZyk7Ci0gICAgaW5mby5hZGRNZW1iZXIoY1N0cmluZy0+YnVmZmVy KCkpOworICAgIGluZm8uYWRkTWVtYmVyKGNTdHJpbmctPmJ1ZmZlcigpLCAiYnVmZmVyIik7CiB9 CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblZl Y3Rvci5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uVmVjdG9yLmgKaW5k ZXggY2FlODQ3YzllZDk3OGVjYjcxMGExN2VhNTVkMTQzM2RiZTE5NTNkZi4uZTM0OWVkZjgzYzJh YTUyYjQ5NWY4OWQ5NTIwZTgxOTA5NjU0ZGJkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uVmVjdG9yLmgKKysrIGIvU291cmNlL1dURi93dGYvTWVtb3J5 SW5zdHJ1bWVudGF0aW9uVmVjdG9yLmgKQEAgLTQxLDcgKzQxLDcgQEAgdm9pZCByZXBvcnRNZW1v cnlVc2FnZShjb25zdCBWZWN0b3I8VCwgaW5saW5lQ2FwYWNpdHk+KiB2ZWN0b3IsIE1lbW9yeU9i amVjdEluZm8KIHsKICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCB2 ZWN0b3IpOwogICAgIGlmIChpbmxpbmVDYXBhY2l0eSA8IHZlY3Rvci0+Y2FwYWNpdHkoKSkKLSAg ICAgICAgaW5mby5hZGRSYXdCdWZmZXIodmVjdG9yLT5kYXRhKCksIHZlY3Rvci0+Y2FwYWNpdHko KSAqIHNpemVvZihUKSk7CisgICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKHZlY3Rvci0+ZGF0YSgp LCB2ZWN0b3ItPmNhcGFjaXR5KCkgKiBzaXplb2YoVCksICJWYWx1ZVR5cGVbXSIsICJkYXRhIik7 CiAgICAgU2VxdWVuY2VNZW1vcnlJbnN0cnVtZW50YXRpb25UcmFpdHM8VD46OnJlcG9ydE1lbW9y eVVzYWdlKHZlY3Rvci0+YmVnaW4oKSwgdmVjdG9yLT5lbmQoKSwgaW5mbyk7CiB9CiAK