46501 2010-09-24 12:56:54 -0700 Variable declarations inside a catch scope don't get propogated to the parent scope 2010-09-24 13:55:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 284637 0 oliver 2010-09-24 12:56:54 -0700 Variable declarations inside a catch scope don't get propogated to the parent scope 284660 1 68739 oliver 2010-09-24 13:38:13 -0700 Created attachment 68739 Patch 284662 2 68739 ggaren 2010-09-24 13:42:30 -0700 Comment on attachment 68739 Patch r=me 284672 3 oliver 2010-09-24 13:55:10 -0700 Committed r68288 68739 2010-09-24 13:38:13 -0700 2010-09-24 13:42:30 -0700 Patch bug-46501-20100924133811.patch text/plain 5891 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAzYjgwMjk4MjQ1MzkwYWQxYWVkZjgxZWExMTZjM2UzZjJhNmIzNDVhLi5l NzEzZjM4MWI3NTkzZDQ5NGM5MDMwMTBjNWZjZmZkMWZiMTliZjAwIDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMzAgQEAKIDIwMTAtMDktMjQgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4K IAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBWYXJpYWJs ZSBkZWNsYXJhdGlvbnMgaW5zaWRlIGEgY2F0Y2ggc2NvcGUgZG9uJ3QgZ2V0IHByb3BvZ2F0ZWQg dG8gdGhlIHBhcmVudCBzY29wZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDY1MDEKKworICAgICAgICBBZGQgbG9naWMgdG8gbWFrZSB2YXJpYWJsZSBk ZWNsYXJhdGlvbiBsb29rIGZvciBhIHNjb3BlIGZvciB0aGUKKyAgICAgICAgbmV3IHZhcmlhYmxl LiAgVGhpcyBhbGxvd3MgdXMgdG8gY3JlYXRlIGEgc2NvcGUgKGVnLiBmb3IgY2F0Y2gpCisgICAg ICAgIGFuZCB0aGVuIHNlYWwgaXQsIHNvIHRoYXQgYWRkaXRpb25hbCB2YXJpYWJsZSBkZWNsYXJh dGlvbnMKKyAgICAgICAgY29udGFpbmVkIGFyZSBwcm9wb2dhdGVkIHRvIHRoZSBjb3JyZWN0IHRh cmdldC4gIFN0cmFuZ2VseSB0aGlzCisgICAgICAgIGNvbWVzIG91dCBhcyBhIHBlcmZvcm1hbmNl IHdpbiwgYnV0IEkgdGhpbmsgaXQncyBtb3N0bHkgY2FjaGUKKyAgICAgICAgZWZmZWN0cy4KKwor ICAgICAgICAqIHBhcnNlci9KU1BhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkpTUGFyc2VyOjpT Y29wZTo6U2NvcGUpOgorICAgICAgICAoSlNDOjpKU1BhcnNlcjo6U2NvcGU6OnByZXZlbnROZXdE ZWNscyk6CisgICAgICAgIChKU0M6OkpTUGFyc2VyOjpTY29wZTo6YWxsb3dzTmV3RGVjbHMpOgor ICAgICAgICAoSlNDOjpKU1BhcnNlcjo6ZGVjbGFyZVZhcmlhYmxlKToKKyAgICAgICAgKEpTQzo6 SlNQYXJzZXI6OnBhcnNlVmFyRGVjbGFyYXRpb25MaXN0KToKKyAgICAgICAgKEpTQzo6SlNQYXJz ZXI6OnBhcnNlQ29uc3REZWNsYXJhdGlvbkxpc3QpOgorICAgICAgICAoSlNDOjpKU1BhcnNlcjo6 cGFyc2VUcnlTdGF0ZW1lbnQpOgorICAgICAgICAoSlNDOjpKU1BhcnNlcjo6cGFyc2VGb3JtYWxQ YXJhbWV0ZXJzKToKKyAgICAgICAgKEpTQzo6SlNQYXJzZXI6OnBhcnNlRnVuY3Rpb25EZWNsYXJh dGlvbik6CisKKzIwMTAtMDktMjQgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKwog ICAgICAgICBSZXZpZXdlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KIAogICAgICAgICBSRUdSRVNT SU9OKHI2ODIyMyk6IEl0IGJyb2tlIDItMyB0ZXN0cyBvbiBib3RzIChSZXF1ZXN0ZWQgYnkgT3Nz eSBvbiAjd2Via2l0KS4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3BhcnNlci9KU1BhcnNl ci5jcHAgYi9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvSlNQYXJzZXIuY3BwCmluZGV4IDU0MGRjM2Jl YWU2NjU3MzY5NjQ0NzExMjE4OGVkNjJhNjQ5NDc4NTIuLjBlNTI2YWM3N2ZkZGQ3NGJjYmM2MGE3 MDBlMWY3NTdmZGVmYWEwZWMgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3BhcnNlci9KU1Bh cnNlci5jcHAKKysrIGIvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0pTUGFyc2VyLmNwcApAQCAtMjA0 LDYgKzIwNCw3IEBAIHByaXZhdGU6CiAgICAgICAgIFNjb3BlKCkKICAgICAgICAgICAgIDogbV91 c2VzRXZhbChmYWxzZSkKICAgICAgICAgICAgICwgbV9uZWVkc0Z1bGxBY3RpdmF0aW9uKGZhbHNl KQorICAgICAgICAgICAgLCBtX2FsbG93c05ld0RlY2xzKHRydWUpCiAgICAgICAgIHsKICAgICAg ICAgfQogICAgICAgICAKQEAgLTIxMiw2ICsyMTMsOSBAQCBwcml2YXRlOgogICAgICAgICAgICAg bV9kZWNsYXJlZFZhcmlhYmxlcy5hZGQoaWRlbnQtPnVzdHJpbmcoKS5pbXBsKCkpOwogICAgICAg ICB9CiAgICAgICAgIAorICAgICAgICB2b2lkIHByZXZlbnROZXdEZWNscygpIHsgbV9hbGxvd3NO ZXdEZWNscyA9IGZhbHNlOyB9CisgICAgICAgIGJvb2wgYWxsb3dzTmV3RGVjbHMoKSBjb25zdCB7 IHJldHVybiBtX2FsbG93c05ld0RlY2xzOyB9CisKICAgICAgICAgdm9pZCB1c2VWYXJpYWJsZShj b25zdCBJZGVudGlmaWVyKiBpZGVudCwgYm9vbCBpc0V2YWwpCiAgICAgICAgIHsKICAgICAgICAg ICAgIG1fdXNlc0V2YWwgfD0gaXNFdmFsOwpAQCAtMjQ5LDYgKzI1Myw3IEBAIHByaXZhdGU6CiAg ICAgcHJpdmF0ZToKICAgICAgICAgYm9vbCBtX3VzZXNFdmFsOwogICAgICAgICBib29sIG1fbmVl ZHNGdWxsQWN0aXZhdGlvbjsKKyAgICAgICAgYm9vbCBtX2FsbG93c05ld0RlY2xzOwogICAgICAg ICBJZGVudGlmaWVyU2V0IG1fZGVjbGFyZWRWYXJpYWJsZXM7CiAgICAgICAgIElkZW50aWZpZXJT ZXQgbV91c2VkVmFyaWFibGVzOwogICAgICAgICBJZGVudGlmaWVyU2V0IG1fY2xvc2VkVmFyaWFi bGVzOwpAQCAtMjg3LDYgKzI5MiwxNyBAQCBwcml2YXRlOgogICAgICAgICBtX3Njb3BlU3RhY2tb bV9zY29wZVN0YWNrLnNpemUoKSAtIDJdLmNvbGxlY3RGcmVlVmFyaWFibGVzKCZtX3Njb3BlU3Rh Y2subGFzdCgpLCBzaG91bGRUcmFja0Nsb3NlZFZhcmlhYmxlcyk7CiAgICAgICAgIG1fc2NvcGVT dGFjay5yZW1vdmVMYXN0KCk7CiAgICAgfQorICAgIAorICAgIHZvaWQgZGVjbGFyZVZhcmlhYmxl KGNvbnN0IElkZW50aWZpZXIqIGlkZW50KQorICAgIHsKKyAgICAgICAgdW5zaWduZWQgaSA9IG1f c2NvcGVTdGFjay5zaXplKCkgLSAxOworICAgICAgICBBU1NFUlQoaSA8IG1fc2NvcGVTdGFjay5z aXplKCkpOworICAgICAgICB3aGlsZSAoIW1fc2NvcGVTdGFja1tpXS5hbGxvd3NOZXdEZWNscygp KSB7CisgICAgICAgICAgICBpLS07CisgICAgICAgICAgICBBU1NFUlQoaSA8IG1fc2NvcGVTdGFj ay5zaXplKCkpOworICAgICAgICB9CisgICAgICAgIG1fc2NvcGVTdGFja1tpXS5kZWNsYXJlVmFy aWFibGUoaWRlbnQpOworICAgIH0KIAogICAgIFNjb3BlU3RhY2sgbV9zY29wZVN0YWNrOwogfTsK QEAgLTQyNSw3ICs0NDEsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHBy ZXNzaW9uIEpTUGFyc2VyOjpwYXJzZVZhckRlY2xhcmF0aW9uTGlzdChUcgogICAgICAgICBsYXN0 SWRlbnQgPSBuYW1lOwogICAgICAgICBuZXh0KCk7CiAgICAgICAgIGJvb2wgaGFzSW5pdGlhbGl6 ZXIgPSBtYXRjaChFUVVBTCk7Ci0gICAgICAgIGN1cnJlbnRTY29wZSgpLT5kZWNsYXJlVmFyaWFi bGUobmFtZSk7CisgICAgICAgIGRlY2xhcmVWYXJpYWJsZShuYW1lKTsKICAgICAgICAgY29udGV4 dC5hZGRWYXIobmFtZSwgKGhhc0luaXRpYWxpemVyIHx8ICghbV9hbGxvd3NJbiAmJiBtYXRjaChJ TlRPS0VOKSkpID8gRGVjbGFyYXRpb25TdGFja3M6Okhhc0luaXRpYWxpemVyIDogMCk7CiAgICAg ICAgIGlmIChoYXNJbml0aWFsaXplcikgewogICAgICAgICAgICAgaW50IHZhckRpdm90ID0gdG9r ZW5TdGFydCgpICsgMTsKQEAgLTQ1Nyw3ICs0NzMsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1 aWxkZXI+IFRyZWVDb25zdERlY2xMaXN0IEpTUGFyc2VyOjpwYXJzZUNvbnN0RGVjbGFyYXRpb25M aQogICAgICAgICBjb25zdCBJZGVudGlmaWVyKiBuYW1lID0gbV90b2tlbi5tX2RhdGEuaWRlbnQ7 CiAgICAgICAgIG5leHQoKTsKICAgICAgICAgYm9vbCBoYXNJbml0aWFsaXplciA9IG1hdGNoKEVR VUFMKTsKLSAgICAgICAgY3VycmVudFNjb3BlKCktPmRlY2xhcmVWYXJpYWJsZShuYW1lKTsKKyAg ICAgICAgZGVjbGFyZVZhcmlhYmxlKG5hbWUpOwogICAgICAgICBjb250ZXh0LmFkZFZhcihuYW1l LCBEZWNsYXJhdGlvblN0YWNrczo6SXNDb25zdGFudCB8IChoYXNJbml0aWFsaXplciA/IERlY2xh cmF0aW9uU3RhY2tzOjpIYXNJbml0aWFsaXplciA6IDApKTsKICAgICAgICAgVHJlZUV4cHJlc3Np b24gaW5pdGlhbGl6ZXIgPSAwOwogICAgICAgICBpZiAoaGFzSW5pdGlhbGl6ZXIpIHsKQEAgLTc1 OSw2ICs3NzUsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQg SlNQYXJzZXI6OnBhcnNlVHJ5U3RhdGVtZW50KFRyZWVCdWlsZAogICAgICAgICBuZXh0KCk7CiAg ICAgICAgIFNjb3BlUmVmIGNhdGNoU2NvcGUgPSBwdXNoU2NvcGUoKTsKICAgICAgICAgY2F0Y2hT Y29wZS0+ZGVjbGFyZVZhcmlhYmxlKGlkZW50KTsKKyAgICAgICAgY2F0Y2hTY29wZS0+cHJldmVu dE5ld0RlY2xzKCk7CiAgICAgICAgIGNvbnN1bWVPckZhaWwoQ0xPU0VQQVJFTik7CiAgICAgICAg IG1hdGNoT3JGYWlsKE9QRU5CUkFDRSk7CiAgICAgICAgIGludCBpbml0aWFsRXZhbENvdW50ID0g Y29udGV4dC5ldmFsQ291bnQoKTsKQEAgLTg2Miw3ICs4NzksNyBAQCB0ZW1wbGF0ZSA8Y2xhc3Mg VHJlZUJ1aWxkZXI+IFRyZWVGb3JtYWxQYXJhbWV0ZXJMaXN0IEpTUGFyc2VyOjpwYXJzZUZvcm1h bFBhcmFtZQogewogICAgIG1hdGNoT3JGYWlsKElERU5UKTsKICAgICB1c2VzQXJndW1lbnRzID0g bV9nbG9iYWxEYXRhLT5wcm9wZXJ0eU5hbWVzLT5hcmd1bWVudHMgPT0gKm1fdG9rZW4ubV9kYXRh LmlkZW50OwotICAgIGN1cnJlbnRTY29wZSgpLT5kZWNsYXJlVmFyaWFibGUobV90b2tlbi5tX2Rh dGEuaWRlbnQpOworICAgIGRlY2xhcmVWYXJpYWJsZShtX3Rva2VuLm1fZGF0YS5pZGVudCk7CiAg ICAgVHJlZUZvcm1hbFBhcmFtZXRlckxpc3QgbGlzdCA9IGNvbnRleHQuY3JlYXRlRm9ybWFsUGFy YW1ldGVyTGlzdCgqbV90b2tlbi5tX2RhdGEuaWRlbnQpOwogICAgIFRyZWVGb3JtYWxQYXJhbWV0 ZXJMaXN0IHRhaWwgPSBsaXN0OwogICAgIG5leHQoKTsKQEAgLTg3MCw3ICs4ODcsNyBAQCB0ZW1w bGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVGb3JtYWxQYXJhbWV0ZXJMaXN0IEpTUGFyc2Vy OjpwYXJzZUZvcm1hbFBhcmFtZQogICAgICAgICBuZXh0KCk7CiAgICAgICAgIG1hdGNoT3JGYWls KElERU5UKTsKICAgICAgICAgY29uc3QgSWRlbnRpZmllciogaWRlbnQgPSBtX3Rva2VuLm1fZGF0 YS5pZGVudDsKLSAgICAgICAgY3VycmVudFNjb3BlKCktPmRlY2xhcmVWYXJpYWJsZShpZGVudCk7 CisgICAgICAgIGRlY2xhcmVWYXJpYWJsZShpZGVudCk7CiAgICAgICAgIG5leHQoKTsKICAgICAg ICAgdXNlc0FyZ3VtZW50cyA9IHVzZXNBcmd1bWVudHMgfHwgbV9nbG9iYWxEYXRhLT5wcm9wZXJ0 eU5hbWVzLT5hcmd1bWVudHMgPT0gKmlkZW50OwogICAgICAgICB0YWlsID0gY29udGV4dC5jcmVh dGVGb3JtYWxQYXJhbWV0ZXJMaXN0KHRhaWwsICppZGVudCk7CkBAIC05MzMsNyArOTUwLDcgQEAg dGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVtZW50IEpTUGFyc2VyOjpwYXJz ZUZ1bmN0aW9uRGVjbGFyYXRpb24oVHIKICAgICBpbnQgYm9keVN0YXJ0TGluZSA9IDA7CiAgICAg ZmFpbElmRmFsc2UoKHBhcnNlRnVuY3Rpb25JbmZvPEZ1bmN0aW9uTmVlZHNOYW1lLCB0cnVlPihj b250ZXh0LCBuYW1lLCBwYXJhbWV0ZXJzLCBib2R5LCBvcGVuQnJhY2VQb3MsIGNsb3NlQnJhY2VQ b3MsIGJvZHlTdGFydExpbmUpKSk7CiAgICAgZmFpbElmRmFsc2UobmFtZSk7Ci0gICAgY3VycmVu dFNjb3BlKCktPmRlY2xhcmVWYXJpYWJsZShuYW1lKTsKKyAgICBkZWNsYXJlVmFyaWFibGUobmFt ZSk7CiAgICAgcmV0dXJuIGNvbnRleHQuY3JlYXRlRnVuY0RlY2xTdGF0ZW1lbnQobmFtZSwgYm9k eSwgcGFyYW1ldGVycywgb3BlbkJyYWNlUG9zLCBjbG9zZUJyYWNlUG9zLCBib2R5U3RhcnRMaW5l LCBtX2xhc3RMaW5lKTsKIH0KIAo=