19585 2008-06-16 09:51:19 -0700 Call frames for eval program code are incorrectly labeled "(anonymous function)" 2008-06-17 15:36:17 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 timothy timothy oldest_to_newest 83478 0 timothy 2008-06-16 09:51:19 -0700 Call frames for eval program code are incorrectly labeled "(anonymous function)" and should be labeled "(program)". Also the first call frame can also be labeled incorrectly for event listeners or callback functions that are anonymous functions. 83479 1 timothy 2008-06-16 09:51:32 -0700 I have a fix for this. 83502 2 21735 timothy 2008-06-16 11:33:26 -0700 Created attachment 21735 Proposed patch 83598 3 21735 timothy 2008-06-17 09:52:36 -0700 Comment on attachment 21735 Proposed patch Geoff Garen reviewed this in person. 83650 4 timothy 2008-06-17 15:36:17 -0700 Landed in r34634. 21735 2008-06-16 11:33:26 -0700 2008-06-17 09:52:36 -0700 Proposed patch 0004-Use-accurate-call-frame-title-s-based-on-the-call-fr.patch text/plain 15665 timothy RnJvbSAyMjFlZGRhNWNhZGU2YzM0YTFiMWE0NWI3ZGZlMzE3ODM0MzgwMTQzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBNb24sIDE2IEp1biAyMDA4IDExOjI2OjA5IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gVXNl IGFjY3VyYXRlIGNhbGwgZnJhbWUgdGl0bGUncyBiYXNlZCBvbiB0aGUgY2FsbCBmcmFtZSB0eXBl LgogQWRkZWQgYSB0eXBlIHRvIERlYnVnZ2VyQ2FsbEZyYW1lIHNvIHRoZSB1bmRlciBpbnRlcmZh Y2UgY2FuCiBkaXN0aW5ndWlzaCBhbm9ueW1vdXMgZnVuY3Rpb25zIGFuZCBwcm9ncmFtIGNhbGwg ZnJhbWVzLgoKSmF2YVNjcmlwdENvcmU6CgoyMDA4LTA2LTE2ICBUaW1vdGh5IEhhdGNoZXIgIDx0 aW1vdGh5QGFwcGxlLmNvbT4KCiAgICAgICAgQWRkZWQgYSB0eXBlIHRvIERlYnVnZ2VyQ2FsbEZy YW1lIHNvIHRoZSB1bmRlciBpbnRlcmZhY2UgY2FuCiAgICAgICAgZGlzdGluZ3Vpc2ggYW5vbnlt b3VzIGZ1bmN0aW9ucyBhbmQgcHJvZ3JhbSBjYWxsIGZyYW1lcy4KCiAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTg1CgogICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICAqIEphdmFTY3JpcHRDb3JlLmV4cDogRXhwb3J0IHRo ZSBEZWJ1Z2dlckNhbGxGcmFtZTo6dHlwZSBzeW1ib2wuCiAgICAgICAgKiBranMvRGVidWdnZXJD YWxsRnJhbWUuY3BwOgogICAgICAgIChLSlM6OkRlYnVnZ2VyQ2FsbEZyYW1lOjp0eXBlKTogQWRk ZWQuCiAgICAgICAgKiBranMvRGVidWdnZXJDYWxsRnJhbWUuaDoKCldlYkNvcmU6CgoyMDA4LTA2 LTE2ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KCiAgICAgICAgVXNlIGFj Y3VyYXRlIGNhbGwgZnJhbWUgdGl0bGUncyBiYXNlZCBvbiB0aGUgY2FsbCBmcmFtZSB0eXBlLgoK ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1ODUKCiAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgICogRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzOiBVcGRhdGVkIHN0cmluZ3MuCiAgICAgICAgKiBiaW5kaW5n cy9qcy9KU0phdmFTY3JpcHRDYWxsRnJhbWVDdXN0b20uY3BwOgogICAgICAgIChXZWJDb3JlOjpK U0phdmFTY3JpcHRDYWxsRnJhbWU6OmV2YWx1YXRlKTogUmVtb3ZlZCB0aGUgaXNWYWxpZCgpCiAg ICAgICAgY2hlY2sgc2luY2UgdGhlIGV2YWx1YXRlKCkgZnVuY3Rpb25kb2VzIHRoZSBjaGVjayBh bHJlYWR5LgogICAgICAgIChXZWJDb3JlOjpKU0phdmFTY3JpcHRDYWxsRnJhbWU6OnRoaXNPYmpl Y3QpOiBSZW1vdmVkIHRoZSBpc1ZhbGlkKCkKICAgICAgICBjaGVjaywgc2luY2UgdGhpc09iamVj dCgpIGRvZXMgdGhlIGNoZWNrIGFuZCByZXR1cm5zIG51bGwgaWYgaW52YWxpZC4KICAgICAgICAo V2ViQ29yZTo6SlNKYXZhU2NyaXB0Q2FsbEZyYW1lOjp0eXBlKTogUmV0dXJuIGEgc3RyaW5nCiAg ICAgICAgYmFzZWQgb24gdGhlIGVudW0gdmFsdWUgb2YgdGhlIHR5cGUuCiAgICAgICAgKFdlYkNv cmU6OkpTSmF2YVNjcmlwdENhbGxGcmFtZTo6c2NvcGVDaGFpbik6IFJlbW92ZWQgdGhlIGlzVmFs aWQoKQogICAgICAgIGNoZWNrLCBzaW5jZSBzY29wZUNoYWluKCkgZG9lcyB0aGUgY2hlY2sgYW5k IHJldHVybnMgbnVsbCBpZiBpbnZhbGlkLgogICAgICAgIFNvIGp1c3QgbnVsbCBjaGVjayBzY29w ZUNoYWluKCkuCiAgICAgICAgKiBwYWdlL0phdmFTY3JpcHRDYWxsRnJhbWUuY3BwOgogICAgICAg IChXZWJDb3JlOjpKYXZhU2NyaXB0Q2FsbEZyYW1lOjp0eXBlKTogUmV0dXJuIHRoZSBEZWJ1Z2dl ckNhbGxGcmFtZTo6VHlwZS4KICAgICAgICBSZXR1cm4gRGVidWdnZXJDYWxsRnJhbWU6OlVua25v d25UeXBlIGlmIHRoZSBjYWxsIGZyYW1lIGlzIGludmFsaWQuCiAgICAgICAgKiBwYWdlL0phdmFT Y3JpcHRDYWxsRnJhbWUuaDoKICAgICAgICAqIHBhZ2UvSmF2YVNjcmlwdENhbGxGcmFtZS5pZGw6 IEFkZCB0aGUgdHlwZSBwcm9wZXJ0eS4KICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL0NhbGxTdGFj a1NpZGViYXJQYW5lLmpzOgogICAgICAgIChXZWJJbnNwZWN0b3IuQ2FsbFN0YWNrU2lkZWJhclBh bmUucHJvdG90eXBlLnVwZGF0ZSk6IENoZWNrIHRoZSB0eXBlCiAgICAgICAgb2YgdGhlIGNhbGwg ZnJhbWUgdG8gY3JlYXRlIHRoZSBjb3JyZWN0IHRpdGxlLiBVc2VzIHRoZSBzb3VyY2VJRE1hcAog ICAgICAgIHRvIGRlY2lkZSBpZiBwcm9ncmFtIGNhbGwgZnJhbWVzIGFyZSBhbm9ueW1vdXMgKG1l YW5pbmcgbm8gc291cmNlIFVSTC4pCiAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9TY3JpcHRzUGFu ZWwuanM6CiAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLmRlYnVn Z2VyUGF1c2VkKTogUGFzcyB0aGUgX3NvdXJjZUlETWFwCiAgICAgICAgdG8gdGhlIENhbGwgU3Rh Y2sgcGFuZSB1cGRhdGUgZnVuY3Rpb24uCiAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlLl9hZGRTY3JpcHRUb0ZpbGVzTWVudSk6IFVzZSB0aGUKICAgICAgICAiKGFu b255bW91cyBwcm9ncmFtKSIgdGl0bGUgZm9yIHRoZSBmaWxlIG1lbnUgdG8gbWF0Y2ggdGhlIGNh bGwgZnJhbWVzLgotLS0KIEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgICAxNCArKysrKysrKwogSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUu ZXhwICAgICAgICAgICAgICAgICAgfCAgICAxICsKIEphdmFTY3JpcHRDb3JlL2tqcy9EZWJ1Z2dl ckNhbGxGcmFtZS5jcHAgICAgICAgICAgIHwgICAxNiArKysrKysrKysKIEphdmFTY3JpcHRDb3Jl L2tqcy9EZWJ1Z2dlckNhbGxGcmFtZS5oICAgICAgICAgICAgIHwgICAgNyArKysrCiBXZWJDb3Jl L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMzQgKysrKysr KysrKysrKysrKysrKysKIFdlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz ICAgICAgICAgIHwgIEJpbiAxNTIxNCAtPiAxNTQ1NCBieXRlcwogLi4uL2JpbmRpbmdzL2pzL0pT SmF2YVNjcmlwdENhbGxGcmFtZUN1c3RvbS5jcHAgICAgfCAgIDIyICsrKysrKysrKy0tLS0KIFdl YkNvcmUvcGFnZS9KYXZhU2NyaXB0Q2FsbEZyYW1lLmNwcCAgICAgICAgICAgICAgIHwgICAgOCAr KysrKwogV2ViQ29yZS9wYWdlL0phdmFTY3JpcHRDYWxsRnJhbWUuaCAgICAgICAgICAgICAgICAg fCAgICAxICsKIFdlYkNvcmUvcGFnZS9KYXZhU2NyaXB0Q2FsbEZyYW1lLmlkbCAgICAgICAgICAg ICAgIHwgICAgMSArCiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0NhbGxTdGFja1NpZGViYXJQYW5l LmpzICAgICB8ICAgMjYgKysrKysrKysrKystLS0KIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvU2Ny aXB0c1BhbmVsLmpzICAgICAgICAgICAgIHwgICAgNCArLQogMTIgZmlsZXMgY2hhbmdlZCwgMTE5 IGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAzNWNhMDA1Li45 NTMwMGRmIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMDYtMTYgIFRpbW90aHkg SGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZGVkIGEgdHlwZSB0byBE ZWJ1Z2dlckNhbGxGcmFtZSBzbyB0aGUgdW5kZXIgaW50ZXJmYWNlIGNhbgorICAgICAgICBkaXN0 aW5ndWlzaCBhbm9ueW1vdXMgZnVuY3Rpb25zIGFuZCBwcm9ncmFtIGNhbGwgZnJhbWVzLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU4NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogSmF2YVNjcmlw dENvcmUuZXhwOiBFeHBvcnQgdGhlIERlYnVnZ2VyQ2FsbEZyYW1lOjp0eXBlIHN5bWJvbC4KKyAg ICAgICAgKiBranMvRGVidWdnZXJDYWxsRnJhbWUuY3BwOgorICAgICAgICAoS0pTOjpEZWJ1Z2dl ckNhbGxGcmFtZTo6dHlwZSk6IEFkZGVkLgorICAgICAgICAqIGtqcy9EZWJ1Z2dlckNhbGxGcmFt ZS5oOgorCiAyMDA4LTA2LTE1ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAg ICAgICAtIG5ldyBuYW1lcyBmb3IgbW9yZSBKYXZhU2NyaXB0Q29yZSBmaWxlcwpkaWZmIC0tZ2l0 IGEvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwIGIvSmF2YVNjcmlwdENvcmUvSmF2 YVNjcmlwdENvcmUuZXhwCmluZGV4IDcyZTRlOTkuLjA2OTExOTQgMTAwNjQ0Ci0tLSBhL0phdmFT Y3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cAorKysgYi9KYXZhU2NyaXB0Q29yZS9KYXZhU2Ny aXB0Q29yZS5leHAKQEAgLTI0NSw2ICsyNDUsNyBAQCBfX1pOSzNLSlMxNEpTR2xvYmFsT2JqZWN0 MTR0b0dsb2JhbE9iamVjdEVQTlNfOUV4ZWNTdGF0ZUUKIF9fWk5LM0tKUzE2SW50ZXJuYWxGdW5j dGlvbjIxaW1wbGVtZW50c0hhc0luc3RhbmNlRXYKIF9fWk5LM0tKUzE2SlNWYXJpYWJsZU9iamVj dDE2aXNWYXJpYWJsZU9iamVjdEV2CiBfX1pOSzNLSlMxNkpTVmFyaWFibGVPYmplY3QyMWdldFBy b3BlcnR5QXR0cmlidXRlc0VQTlNfOUV4ZWNTdGF0ZUVSS05TXzEwSWRlbnRpZmllckVSagorX19a TkszS0pTMTdEZWJ1Z2dlckNhbGxGcmFtZTR0eXBlRXYKIF9fWk5LM0tKUzE3RGVidWdnZXJDYWxs RnJhbWUxMHRoaXNPYmplY3RFdgogX19aTkszS0pTMTdEZWJ1Z2dlckNhbGxGcmFtZTEyZnVuY3Rp b25OYW1lRXYKIF9fWk5LM0tKUzE3RGVidWdnZXJDYWxsRnJhbWU4ZXZhbHVhdGVFUktOU183VVN0 cmluZ0VSUE5TXzdKU1ZhbHVlRQpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUva2pzL0RlYnVn Z2VyQ2FsbEZyYW1lLmNwcCBiL0phdmFTY3JpcHRDb3JlL2tqcy9EZWJ1Z2dlckNhbGxGcmFtZS5j cHAKaW5kZXggNWVlMDYwZi4uNDA2MGUwNCAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUva2pz L0RlYnVnZ2VyQ2FsbEZyYW1lLmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9ranMvRGVidWdnZXJD YWxsRnJhbWUuY3BwCkBAIC01Miw2ICs1MiwyMiBAQCBjb25zdCBVU3RyaW5nKiBEZWJ1Z2dlckNh bGxGcmFtZTo6ZnVuY3Rpb25OYW1lKCkgY29uc3QKICAgICByZXR1cm4gJmZ1bmN0aW9uLT5mdW5j dGlvbk5hbWUoKS51c3RyaW5nKCk7CiB9CiAKK0RlYnVnZ2VyQ2FsbEZyYW1lOjpUeXBlIERlYnVn Z2VyQ2FsbEZyYW1lOjp0eXBlKCkgY29uc3QKK3sKKyAgICBpZiAobV9yZWdpc3Rlck9mZnNldCA9 PSAwKQorICAgICAgICByZXR1cm4gUHJvZ3JhbVR5cGU7CisKKyAgICBpbnQgY2FsbEZyYW1lT2Zm c2V0ID0gbV9yZWdpc3Rlck9mZnNldCAtIG1fY29kZUJsb2NrLT5udW1Mb2NhbHMgLSBNYWNoaW5l OjpDYWxsRnJhbWVIZWFkZXJTaXplOworICAgIGlmIChjYWxsRnJhbWVPZmZzZXQgPCAwKQorICAg ICAgICByZXR1cm4gVW5rbm93blR5cGU7CisKKyAgICBSZWdpc3RlciogY2FsbEZyYW1lID0gKm1f cmVnaXN0ZXJCYXNlICsgY2FsbEZyYW1lT2Zmc2V0OworICAgIGlmIChjYWxsRnJhbWVbTWFjaGlu ZTo6Q2FsbGVlXS51LmpzT2JqZWN0KQorICAgICAgICByZXR1cm4gRnVuY3Rpb25UeXBlOworCisg ICAgcmV0dXJuIFByb2dyYW1UeXBlOworfQorCiBKU09iamVjdCogRGVidWdnZXJDYWxsRnJhbWU6 OnRoaXNPYmplY3QoKSBjb25zdAogewogICAgIGlmICghbV9jb2RlQmxvY2spCmRpZmYgLS1naXQg YS9KYXZhU2NyaXB0Q29yZS9ranMvRGVidWdnZXJDYWxsRnJhbWUuaCBiL0phdmFTY3JpcHRDb3Jl L2tqcy9EZWJ1Z2dlckNhbGxGcmFtZS5oCmluZGV4IDE1NzM0MWIuLmU0MmJiYzMgMTAwNjQ0Ci0t LSBhL0phdmFTY3JpcHRDb3JlL2tqcy9EZWJ1Z2dlckNhbGxGcmFtZS5oCisrKyBiL0phdmFTY3Jp cHRDb3JlL2tqcy9EZWJ1Z2dlckNhbGxGcmFtZS5oCkBAIC00Miw2ICs0MiwxMiBAQCBuYW1lc3Bh Y2UgS0pTIHsKICAgICAKICAgICBjbGFzcyBEZWJ1Z2dlckNhbGxGcmFtZSB7CiAgICAgcHVibGlj OgorICAgICAgICB0eXBlZGVmIGVudW0geworICAgICAgICAgICAgVW5rbm93blR5cGUsCisgICAg ICAgICAgICBQcm9ncmFtVHlwZSwKKyAgICAgICAgICAgIEZ1bmN0aW9uVHlwZQorICAgICAgICB9 IFR5cGU7CisKICAgICAgICAgRGVidWdnZXJDYWxsRnJhbWUoTWFjaGluZSogbWFjaGluZSwgSlNH bG9iYWxPYmplY3QqIGR5bmFtaWNHbG9iYWxPYmplY3QsIGNvbnN0IENvZGVCbG9jayogY29kZUJs b2NrLCBTY29wZUNoYWluTm9kZSogc2NvcGVDaGFpbiwgSlNWYWx1ZSogZXhjZXB0aW9uLCBSZWdp c3RlcioqIHJlZ2lzdGVyQmFzZSwgaW50IHJlZ2lzdGVyT2Zmc2V0KQogICAgICAgICAgICAgOiBt X21hY2hpbmUobWFjaGluZSkKICAgICAgICAgICAgICwgbV9keW5hbWljR2xvYmFsT2JqZWN0KGR5 bmFtaWNHbG9iYWxPYmplY3QpCkBAIC01Niw2ICs2Miw3IEBAIG5hbWVzcGFjZSBLSlMgewogICAg ICAgICBKU0dsb2JhbE9iamVjdCogZHluYW1pY0dsb2JhbE9iamVjdCgpIGNvbnN0IHsgcmV0dXJu IG1fZHluYW1pY0dsb2JhbE9iamVjdDsgfQogICAgICAgICBjb25zdCBTY29wZUNoYWluTm9kZSog c2NvcGVDaGFpbigpIGNvbnN0IHsgcmV0dXJuIG1fc2NvcGVDaGFpbjsgfQogICAgICAgICBjb25z dCBVU3RyaW5nKiBmdW5jdGlvbk5hbWUoKSBjb25zdDsKKyAgICAgICAgRGVidWdnZXJDYWxsRnJh bWU6OlR5cGUgdHlwZSgpIGNvbnN0OwogICAgICAgICBKU09iamVjdCogdGhpc09iamVjdCgpIGNv bnN0OwogICAgICAgICBKU1ZhbHVlKiBldmFsdWF0ZShjb25zdCBVU3RyaW5nJiwgSlNWYWx1ZSom IGV4Y2VwdGlvbikgY29uc3Q7CiAgICAgICAgIEpTVmFsdWUqIGV4Y2VwdGlvbigpIGNvbnN0IHsg cmV0dXJuIG1fZXhjZXB0aW9uOyB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDAxMzk0YzkuLmZiMmMwN2IgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzkgQEAKIDIw MDgtMDYtMTYgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCisgICAgICAg IFVzZSBhY2N1cmF0ZSBjYWxsIGZyYW1lIHRpdGxlJ3MgYmFzZWQgb24gdGhlIGNhbGwgZnJhbWUg dHlwZS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk1ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczogVXBkYXRlZCBzdHJpbmdzLgorICAg ICAgICAqIGJpbmRpbmdzL2pzL0pTSmF2YVNjcmlwdENhbGxGcmFtZUN1c3RvbS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpKU0phdmFTY3JpcHRDYWxsRnJhbWU6OmV2YWx1YXRlKTogUmVtb3ZlZCB0 aGUgaXNWYWxpZCgpCisgICAgICAgIGNoZWNrIHNpbmNlIHRoZSBldmFsdWF0ZSgpIGZ1bmN0aW9u ZG9lcyB0aGUgY2hlY2sgYWxyZWFkeS4KKyAgICAgICAgKFdlYkNvcmU6OkpTSmF2YVNjcmlwdENh bGxGcmFtZTo6dGhpc09iamVjdCk6IFJlbW92ZWQgdGhlIGlzVmFsaWQoKQorICAgICAgICBjaGVj aywgc2luY2UgdGhpc09iamVjdCgpIGRvZXMgdGhlIGNoZWNrIGFuZCByZXR1cm5zIG51bGwgaWYg aW52YWxpZC4KKyAgICAgICAgKFdlYkNvcmU6OkpTSmF2YVNjcmlwdENhbGxGcmFtZTo6dHlwZSk6 IFJldHVybiBhIHN0cmluZworICAgICAgICBiYXNlZCBvbiB0aGUgZW51bSB2YWx1ZSBvZiB0aGUg dHlwZS4KKyAgICAgICAgKFdlYkNvcmU6OkpTSmF2YVNjcmlwdENhbGxGcmFtZTo6c2NvcGVDaGFp bik6IFJlbW92ZWQgdGhlIGlzVmFsaWQoKQorICAgICAgICBjaGVjaywgc2luY2Ugc2NvcGVDaGFp bigpIGRvZXMgdGhlIGNoZWNrIGFuZCByZXR1cm5zIG51bGwgaWYgaW52YWxpZC4KKyAgICAgICAg U28ganVzdCBudWxsIGNoZWNrIHNjb3BlQ2hhaW4oKS4KKyAgICAgICAgKiBwYWdlL0phdmFTY3Jp cHRDYWxsRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SmF2YVNjcmlwdENhbGxGcmFtZTo6 dHlwZSk6IFJldHVybiB0aGUgRGVidWdnZXJDYWxsRnJhbWU6OlR5cGUuCisgICAgICAgIFJldHVy biBEZWJ1Z2dlckNhbGxGcmFtZTo6VW5rbm93blR5cGUgaWYgdGhlIGNhbGwgZnJhbWUgaXMgaW52 YWxpZC4KKyAgICAgICAgKiBwYWdlL0phdmFTY3JpcHRDYWxsRnJhbWUuaDoKKyAgICAgICAgKiBw YWdlL0phdmFTY3JpcHRDYWxsRnJhbWUuaWRsOiBBZGQgdGhlIHR5cGUgcHJvcGVydHkuCisgICAg ICAgICogcGFnZS9pbnNwZWN0b3IvQ2FsbFN0YWNrU2lkZWJhclBhbmUuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ2FsbFN0YWNrU2lkZWJhclBhbmUucHJvdG90eXBlLnVwZGF0ZSk6IENoZWNr IHRoZSB0eXBlCisgICAgICAgIG9mIHRoZSBjYWxsIGZyYW1lIHRvIGNyZWF0ZSB0aGUgY29ycmVj dCB0aXRsZS4gVXNlcyB0aGUgc291cmNlSURNYXAKKyAgICAgICAgdG8gZGVjaWRlIGlmIHByb2dy YW0gY2FsbCBmcmFtZXMgYXJlIGFub255bW91cyAobWVhbmluZyBubyBzb3VyY2UgVVJMLikKKyAg ICAgICAgKiBwYWdlL2luc3BlY3Rvci9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5kZWJ1Z2dlclBhdXNlZCk6IFBhc3MgdGhlIF9z b3VyY2VJRE1hcAorICAgICAgICB0byB0aGUgQ2FsbCBTdGFjayBwYW5lIHVwZGF0ZSBmdW5jdGlv bi4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9hZGRTY3Jp cHRUb0ZpbGVzTWVudSk6IFVzZSB0aGUKKyAgICAgICAgIihhbm9ueW1vdXMgcHJvZ3JhbSkiIHRp dGxlIGZvciB0aGUgZmlsZSBtZW51IHRvIG1hdGNoIHRoZSBjYWxsIGZyYW1lcy4KKworMjAwOC0w Ni0xNiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CisKICAgICAgICAgUmVt ZW1iZXIgdGhlIGV4cGFuZGVkIHN0YXRlIG9mIG9iamVjdHMgaW4gdGhlIFNjb3BlIFZhcmlhYmxl cyBwYW5lIHdoZW4gc3RlcHBpbmcuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTU4NAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL0VuZ2xpc2gubHByb2ov bG9jYWxpemVkU3RyaW5ncy5qcyBiL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJp bmdzLmpzCmluZGV4IDU4MGJmMWQwMzBhNWRhZmExODJhOGY0MzJjMjY4Y2NjMTE2ZDRiYzEuLmFj ZGVkNjk4YjBhY2ZiMThlYWE0OGI4ZDUwOTFmMGE4ZmJjNTdlYTcgMTAwNjQ0CkdJVCBiaW5hcnkg cGF0Y2gKZGVsdGEgMTQ4CnpjbWFEP2NDVFc/NFVXbGU5M3MzMDNgR3EyNEN6MkprcylfLURUZ1lX TkZ0fWNIaXtZc08kSEB+U094X0tUT2R8cQp2JnxwQjNvZVdleipAQEdTeDBFNHxBc2RNRThPajsq Q05DNWJvP09OdWZKSmxfaHUtRTFvYzlhPzUoXzEpCgpkZWx0YSA2Ngp6Y21jYXRAdmR5YzRHIVVT aDglYGBoOXJoV0FnI2NWM31tTkZwMiNJRWliYjN1YiNmcT17XlR2M2V3IVAoP2ltNkEKRGh9MDZV CgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0phdmFTY3JpcHRDYWxsRnJhbWVD dXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0phdmFTY3JpcHRDYWxsRnJhbWVDdXN0 b20uY3BwCmluZGV4IGJjNTI1OWIuLmJhNDNhMjYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNKYXZhU2NyaXB0Q2FsbEZyYW1lQ3VzdG9tLmNwcAorKysgYi9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTSmF2YVNjcmlwdENhbGxGcmFtZUN1c3RvbS5jcHAKQEAgLTM1LDkgKzM1LDYgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogCiBKU1ZhbHVlKiBKU0phdmFTY3JpcHRDYWxsRnJhbWU6OmV2 YWx1YXRlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgTGlzdCYgYXJncykKIHsKLSAgICBpZiAoIWlt cGwoKS0+aXNWYWxpZCgpKQotICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKLQogICAgIEpT VmFsdWUqIGV4Y2VwdGlvbiA9IDA7CiAgICAgSlNWYWx1ZSogcmVzdWx0ID0gaW1wbCgpLT5ldmFs dWF0ZShhcmdzWzBdLT50b1N0cmluZyhleGVjKSwgZXhjZXB0aW9uKTsKIApAQCAtNDksMTQgKzQ2 LDI1IEBAIEpTVmFsdWUqIEpTSmF2YVNjcmlwdENhbGxGcmFtZTo6ZXZhbHVhdGUoRXhlY1N0YXRl KiBleGVjLCBjb25zdCBMaXN0JiBhcmdzKQogCiBKU1ZhbHVlKiBKU0phdmFTY3JpcHRDYWxsRnJh bWU6OnRoaXNPYmplY3QoRXhlY1N0YXRlKiBleGVjKSBjb25zdAogewotICAgIGlmICghaW1wbCgp LT5pc1ZhbGlkKCkgfHwgIWltcGwoKS0+dGhpc09iamVjdCgpKQotICAgICAgICByZXR1cm4ganNO dWxsKCk7Ci0gICAgcmV0dXJuIGltcGwoKS0+dGhpc09iamVjdCgpOworICAgIHJldHVybiBpbXBs KCktPnRoaXNPYmplY3QoKSA/IGltcGwoKS0+dGhpc09iamVjdCgpIDoganNOdWxsKCk7Cit9CisK K0pTVmFsdWUqIEpTSmF2YVNjcmlwdENhbGxGcmFtZTo6dHlwZShFeGVjU3RhdGUqIGV4ZWMpIGNv bnN0Cit7CisgICAgc3dpdGNoIChpbXBsKCktPnR5cGUoKSkgeworICAgICAgICBkZWZhdWx0Ogor ICAgICAgICBjYXNlIERlYnVnZ2VyQ2FsbEZyYW1lOjpVbmtub3duVHlwZToKKyAgICAgICAgICAg IHJldHVybiBqc1N0cmluZygidW5rbm93biIpOworICAgICAgICBjYXNlIERlYnVnZ2VyQ2FsbEZy YW1lOjpGdW5jdGlvblR5cGU6CisgICAgICAgICAgICByZXR1cm4ganNTdHJpbmcoImZ1bmN0aW9u Iik7CisgICAgICAgIGNhc2UgRGVidWdnZXJDYWxsRnJhbWU6OlByb2dyYW1UeXBlOgorICAgICAg ICAgICAgcmV0dXJuIGpzU3RyaW5nKCJwcm9ncmFtIik7CisgICAgfQogfQogCiBKU1ZhbHVlKiBK U0phdmFTY3JpcHRDYWxsRnJhbWU6OnNjb3BlQ2hhaW4oRXhlY1N0YXRlKiBleGVjKSBjb25zdAog ewotICAgIGlmICghaW1wbCgpLT5pc1ZhbGlkKCkpCisgICAgaWYgKCFpbXBsKCktPnNjb3BlQ2hh aW4oKSkKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCiAgICAgY29uc3QgU2NvcGVDaGFpbk5v ZGUqIHNjb3BlQ2hhaW4gPSBpbXBsKCktPnNjb3BlQ2hhaW4oKTsKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGFnZS9KYXZhU2NyaXB0Q2FsbEZyYW1lLmNwcCBiL1dlYkNvcmUvcGFnZS9KYXZhU2NyaXB0 Q2FsbEZyYW1lLmNwcAppbmRleCAwNTYxZGI2Li41NjZjMGVlIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BhZ2UvSmF2YVNjcmlwdENhbGxGcmFtZS5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0phdmFTY3Jp cHRDYWxsRnJhbWUuY3BwCkBAIC03MCw2ICs3MCwxNCBAQCBTdHJpbmcgSmF2YVNjcmlwdENhbGxG cmFtZTo6ZnVuY3Rpb25OYW1lKCkgY29uc3QKICAgICByZXR1cm4gKmZ1bmN0aW9uTmFtZTsKIH0K IAorRGVidWdnZXJDYWxsRnJhbWU6OlR5cGUgSmF2YVNjcmlwdENhbGxGcmFtZTo6dHlwZSgpIGNv bnN0Cit7CisgICAgQVNTRVJUKG1faXNWYWxpZCk7CisgICAgaWYgKCFtX2lzVmFsaWQpCisgICAg ICAgIHJldHVybiBEZWJ1Z2dlckNhbGxGcmFtZTo6VW5rbm93blR5cGU7CisgICAgcmV0dXJuIG1f ZGVidWdnZXJDYWxsRnJhbWUudHlwZSgpOworfQorCiBKU09iamVjdCogSmF2YVNjcmlwdENhbGxG cmFtZTo6dGhpc09iamVjdCgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKG1faXNWYWxpZCk7CmRpZmYg LS1naXQgYS9XZWJDb3JlL3BhZ2UvSmF2YVNjcmlwdENhbGxGcmFtZS5oIGIvV2ViQ29yZS9wYWdl L0phdmFTY3JpcHRDYWxsRnJhbWUuaAppbmRleCBkYzI0NTZiLi5iYzQ0YzkxIDEwMDY0NAotLS0g YS9XZWJDb3JlL3BhZ2UvSmF2YVNjcmlwdENhbGxGcmFtZS5oCisrKyBiL1dlYkNvcmUvcGFnZS9K YXZhU2NyaXB0Q2FsbEZyYW1lLmgKQEAgLTU3LDYgKzU3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICB9CiAKICAgICAgICAgU3RyaW5nIGZ1bmN0aW9uTmFtZSgpIGNvbnN0OworICAg ICAgICBLSlM6OkRlYnVnZ2VyQ2FsbEZyYW1lOjpUeXBlIHR5cGUoKSBjb25zdDsKICAgICAgICAg Y29uc3QgS0pTOjpTY29wZUNoYWluTm9kZSogc2NvcGVDaGFpbigpIGNvbnN0OwogCiAgICAgICAg IEtKUzo6SlNPYmplY3QqIHRoaXNPYmplY3QoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGFnZS9KYXZhU2NyaXB0Q2FsbEZyYW1lLmlkbCBiL1dlYkNvcmUvcGFnZS9KYXZhU2NyaXB0Q2Fs bEZyYW1lLmlkbAppbmRleCAxZjIxZjdkLi5kNTg3NjFiIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bh Z2UvSmF2YVNjcmlwdENhbGxGcmFtZS5pZGwKKysrIGIvV2ViQ29yZS9wYWdlL0phdmFTY3JpcHRD YWxsRnJhbWUuaWRsCkBAIC0zNCw2ICszNCw3IEBAIG1vZHVsZSBpbnNwZWN0b3IgewogICAgICAg ICByZWFkb25seSBhdHRyaWJ1dGUgW0N1c3RvbUdldHRlcl0gQXJyYXkgc2NvcGVDaGFpbjsKICAg ICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIFtDdXN0b21HZXR0ZXJdIE9iamVjdCB0aGlzT2JqZWN0 OwogICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIGZ1bmN0aW9uTmFtZTsKKyAg ICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIFtDdXN0b21HZXR0ZXJdIERPTVN0cmluZyB0eXBlOwog ICAgIH07CiAKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvQ2FsbFN0YWNr U2lkZWJhclBhbmUuanMgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0NhbGxTdGFja1NpZGViYXJQ YW5lLmpzCmluZGV4IDYxODc2MjAuLjI5ZTQ2M2QgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9p bnNwZWN0b3IvQ2FsbFN0YWNrU2lkZWJhclBhbmUuanMKKysrIGIvV2ViQ29yZS9wYWdlL2luc3Bl Y3Rvci9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qcwpAQCAtMjksNyArMjksNyBAQCBXZWJJbnNwZWN0 b3IuQ2FsbFN0YWNrU2lkZWJhclBhbmUgPSBmdW5jdGlvbigpCiB9CiAKIFdlYkluc3BlY3Rvci5D YWxsU3RhY2tTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7Ci0gICAgdXBkYXRlOiBmdW5jdGlvbihj YWxsRnJhbWUpCisgICAgdXBkYXRlOiBmdW5jdGlvbihjYWxsRnJhbWUsIHNvdXJjZUlETWFwKQog ICAgIHsKICAgICAgICAgdGhpcy5ib2R5RWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwogCkBAIC00 NCwxMiArNDQsMjYgQEAgV2ViSW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCisgICAgICAgIHZhciB0aXRs ZTsKICAgICAgICAgZG8gewotICAgICAgICAgICAgdmFyIHRpdGxlID0gY2FsbEZyYW1lLmZ1bmN0 aW9uTmFtZTsKLSAgICAgICAgICAgIGlmICghdGl0bGUgJiYgY2FsbEZyYW1lLmNhbGxlcikKLSAg ICAgICAgICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKGFub255bW91cyBm dW5jdGlvbikiKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKCF0aXRsZSkKLSAgICAgICAgICAgICAg ICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKGdsb2JhbCBjb2RlKSIpOworICAgICAg ICAgICAgaWYgKHNvdXJjZUlETWFwKQorICAgICAgICAgICAgICAgIHZhciBzY3JpcHRPclJlc291 cmNlID0gc291cmNlSURNYXBbY2FsbEZyYW1lLnNvdXJjZUlkZW50aWZpZXJdOworCisgICAgICAg ICAgICBzd2l0Y2ggKGNhbGxGcmFtZS50eXBlKSB7CisgICAgICAgICAgICBjYXNlICJmdW5jdGlv biI6CisgICAgICAgICAgICAgICAgdGl0bGUgPSBjYWxsRnJhbWUuZnVuY3Rpb25OYW1lIHx8IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiKGFub255bW91cyBmdW5jdGlvbikiKTsKKyAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgInByb2dyYW0iOgorICAgICAgICAgICAgICAg IGlmIChzY3JpcHRPclJlc291cmNlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlwdCkKKyAg ICAgICAgICAgICAgICAgICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihhbm9ueW1v dXMgcHJvZ3JhbSkiKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAg IHRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIocHJvZ3JhbSkiKTsKKyAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBjYXNlICJ1bmtu b3duIjoKKyAgICAgICAgICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHVu a25vd24gZnVuY3Rpb24pIik7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIHZhciBwbGFjYXJkID0gbmV3IFdlYkluc3BlY3Rvci5QbGFjYXJkKHRp dGxlKTsKICAgICAgICAgICAgIHBsYWNhcmQuY2FsbEZyYW1lID0gY2FsbEZyYW1lOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9TY3JpcHRzUGFuZWwuanMgYi9XZWJDb3JlL3Bh Z2UvaW5zcGVjdG9yL1NjcmlwdHNQYW5lbC5qcwppbmRleCAzZGU5NDg0Li5hODNjM2NjIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1NjcmlwdHNQYW5lbC5qcworKysgYi9XZWJD b3JlL3BhZ2UvaW5zcGVjdG9yL1NjcmlwdHNQYW5lbC5qcwpAQCAtMzAzLDcgKzMwMyw3IEBAIFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBjYWxs U3RhY2tQYW5lID0gdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrOwogICAgICAgICB2YXIgY3Vy cmVudEZyYW1lID0gSW5zcGVjdG9yQ29udHJvbGxlci5jdXJyZW50Q2FsbEZyYW1lKCk7Ci0gICAg ICAgIGNhbGxTdGFja1BhbmUudXBkYXRlKGN1cnJlbnRGcmFtZSk7CisgICAgICAgIGNhbGxTdGFj a1BhbmUudXBkYXRlKGN1cnJlbnRGcmFtZSwgdGhpcy5fc291cmNlSURNYXApOwogICAgICAgICBj YWxsU3RhY2tQYW5lLnNlbGVjdGVkQ2FsbEZyYW1lID0gY3VycmVudEZyYW1lOwogCiAgICAgICAg IFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwgPSB0aGlzOwpAQCAtNDk3LDcgKzQ5Nyw3IEBAIFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAvLyBGSVhNRTog QXBwZW5kIGluIHNvbWUgbWVhbmluZ2Z1bCBvcmRlci4KICAgICAgICAgdmFyIG9wdGlvbiA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9wdGlvbiIpOwogICAgICAgICBvcHRpb24ucmVwcmVzZW50 ZWRPYmplY3QgPSAoc2NyaXB0LnJlc291cmNlIHx8IHNjcmlwdCk7Ci0gICAgICAgIG9wdGlvbi50 ZXh0ID0gKHNjcmlwdC5zb3VyY2VVUkwgPyBXZWJJbnNwZWN0b3IuZGlzcGxheU5hbWVGb3JVUkwo c2NyaXB0LnNvdXJjZVVSTCkgOiAiKGV2YWwgc2NyaXB0KSIpOworICAgICAgICBvcHRpb24udGV4 dCA9IChzY3JpcHQuc291cmNlVVJMID8gV2ViSW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9yVVJMKHNj cmlwdC5zb3VyY2VVUkwpIDogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIoYW5vbnltb3VzIHByb2dy YW0pIikpOwogICAgICAgICBzZWxlY3QuYXBwZW5kQ2hpbGQob3B0aW9uKTsKIAogICAgICAgICBz Y3JpcHQuZmlsZXNTZWxlY3RPcHRpb24gPSBvcHRpb247Ci0tIAoxLjUuNC40Cgo=