50262 2010-11-30 12:57:14 -0800 Pass the plug-in process shim in DYLD_INSERT_LIBRARIES when launching the plug-in process 2010-11-30 13:06:21 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 315253 0 andersca 2010-11-30 12:57:14 -0800 Pass the plug-in process shim in DYLD_INSERT_LIBRARIES when launching the plug-in process 315255 1 75185 andersca 2010-11-30 13:01:24 -0800 Created attachment 75185 Patch 315256 2 75185 sam 2010-11-30 13:04:51 -0800 Comment on attachment 75185 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75185&action=review > WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm:163 > + char *valueIfVariableHasName(const char* environmentVariable, const char* name) const * on wrong side. 315258 3 andersca 2010-11-30 13:06:21 -0800 Committed r72957: <http://trac.webkit.org/changeset/72957> 75185 2010-11-30 13:01:24 -0800 2010-11-30 13:04:51 -0800 Patch bug-50262-20101130130123.patch text/plain 6470 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg Njk4YWM2ZTZlOGViZjA0MDc0YjJjZjYwMTE4NzNjM2Q2NDFkN2UyZC4uYzk0OTM5ZmI2MmI5OTM5 ZWI3NTVlYjRlMGQ0YjgzYzNhYjU5ZTdkOCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOSBAQAogMjAxMC0xMS0zMCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhc3MgdGhlIHBsdWctaW4gcHJvY2VzcyBzaGlt IGluIERZTERfSU5TRVJUX0xJQlJBUklFUyB3aGVuIGxhdW5jaGluZyB0aGUgcGx1Zy1pbiBwcm9j ZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDI2 MgorCisgICAgICAgICogVUlQcm9jZXNzL0xhdW5jaGVyL21hYy9Qcm9jZXNzTGF1bmNoZXJNYWMu bW06CisgICAgICAgIEFkZCBhbiBFbnZpcm9ubWVudFZhcmlhYmxlcyBjbGFzcyB0aGF0IGFsbG93 cyBmb3IgZWFzeSBtb2RpZmljYXRpb24gb2YgdGhlIGVudmlyb25tZW50IHZhcmlhYmxlcworICAg ICAgICBwYXNzZWQgdG8gcG9zaXhfc3Bhd24uCisKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0xh dW5jaGVyOjpsYXVuY2hQcm9jZXNzKToKKyAgICAgICAgV2hlbiBzcGF3bmluZyB0aGUgcGx1Zy1p biBwcm9jZXNzLCBpbnNlcnQgdGhlIHBsdWctaW4gcHJvY2VzcyBzaGltLgorCisyMDEwLTExLTMw ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3 ZWQgYnkgU2FtIFdlaW5pZy4KIAogICAgICAgICBBZGQgcGx1Zy1pbiBwcm9jZXNzIHNoaW0KZGlm ZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL21hYy9Qcm9jZXNzTGF1bmNoZXJN YWMubW0gYi9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFj Lm1tCmluZGV4IDM0Y2Y0MDA2MmY4YTEyZjg0N2Q1Yjk4MmQzMzU2NzIwNWI3NTZlOWQuLjUxOTA2 YWM0NmZmZDdjMGZjOTJhMTBhZWQ4ZWJkNzYzMDRiMDIwMjEgMTAwNjQ0Ci0tLSBhL1dlYktpdDIv VUlQcm9jZXNzL0xhdW5jaGVyL21hYy9Qcm9jZXNzTGF1bmNoZXJNYWMubW0KKysrIGIvV2ViS2l0 Mi9VSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbQpAQCAtMzUsNiAr MzUsNyBAQAogI2luY2x1ZGUgPHNlcnZlcnMvYm9vdHN0cmFwLmg+CiAjaW5jbHVkZSA8c3Bhd24u aD4KICNpbmNsdWRlIDxzeXMvcGFyYW0uaD4KKyNpbmNsdWRlIDxzeXMvc3RhdC5oPgogI2luY2x1 ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1RocmVhZGluZy5oPgogI2luY2x1 ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KQEAgLTg5LDYgKzkwLDEyMiBAQCBzdGF0aWMgdm9pZCBz ZXRVcFRlcm1pbmF0aW9uTm90aWZpY2F0aW9uSGFuZGxlcihwaWRfdCBwaWQpCiAjZW5kaWYKIH0K IAorY2xhc3MgRW52aXJvbm1lbnRWYXJpYWJsZXMgeworICAgIFdURl9NQUtFX05PTkNPUFlBQkxF KEVudmlyb25tZW50VmFyaWFibGVzKTsKKworcHVibGljOgorICAgIEVudmlyb25tZW50VmFyaWFi bGVzKCkKKyAgICAgICAgOiBtX2Vudmlyb25tZW50UG9pbnRlcigqX05TR2V0RW52aXJvbigpKQor ICAgIHsKKyAgICB9CisKKyAgICB+RW52aXJvbm1lbnRWYXJpYWJsZXMoKQorICAgIHsKKyAgICAg ICAgZGVsZXRlQWxsVmFsdWVzKG1fYWxsb2NhdGVkU3RyaW5ncyk7CisgICAgfQorCisgICAgdm9p ZCBzZXQoY29uc3QgY2hhciogbmFtZSwgY29uc3QgY2hhciogdmFsdWUpCisgICAgeworICAgICAg ICAvLyBDaGVjayBpZiB3ZSBuZWVkIHRvIGNvcHkgdGhlIGVudmlyb25tZW50LgorICAgICAgICBp ZiAobV9lbnZpcm9ubWVudFBvaW50ZXIgPT0gKl9OU0dldEVudmlyb24oKSkKKyAgICAgICAgICAg IGNvcHlFbnZpcm9ubWVudFZhcmlhYmxlcygpOworCisgICAgICAgIC8vIEFsbG9jYXRlIGEgc3Ry aW5nIGZvciB0aGUgbmFtZSBhbmQgdmFsdWUuCisgICAgICAgIGNoYXIqIG5hbWVBbmRWYWx1ZSA9 IGNyZWF0ZVN0cmluZ0ZvclZhcmlhYmxlKG5hbWUsIHZhbHVlKTsKKworICAgICAgICBmb3IgKHNp emVfdCBpID0gMDsgaSA8IG1fZW52aXJvbm1lbnRWYXJpYWJsZXMuc2l6ZSgpIC0gMTsgKytpKSB7 CisgICAgICAgICAgICBjaGFyKiBlbnZpcm9ubWVudFZhcmlhYmxlID0gbV9lbnZpcm9ubWVudFZh cmlhYmxlc1tpXTsKKworICAgICAgICAgICAgaWYgKHZhbHVlSWZWYXJpYWJsZUhhc05hbWUoZW52 aXJvbm1lbnRWYXJpYWJsZSwgbmFtZSkpIHsKKyAgICAgICAgICAgICAgICAvLyBKdXN0IHJlcGxh Y2UgdGhlIGVudmlyb25tZW50IHZhcmlhYmxlLgorICAgICAgICAgICAgICAgIG1fZW52aXJvbm1l bnRWYXJpYWJsZXNbaV0gPSBuYW1lQW5kVmFsdWU7CisgICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgLy8gQXBwZW5kIHRoZSBuZXcgc3Ry aW5nLgorICAgICAgICBBU1NFUlQoIW1fZW52aXJvbm1lbnRWYXJpYWJsZXMubGFzdCgpKTsKKyAg ICAgICAgbV9lbnZpcm9ubWVudFZhcmlhYmxlcy5sYXN0KCkgPSBuYW1lQW5kVmFsdWU7CisgICAg ICAgIG1fZW52aXJvbm1lbnRWYXJpYWJsZXMuYXBwZW5kKHN0YXRpY19jYXN0PGNoYXIqPigwKSk7 CisKKyAgICAgICAgbV9lbnZpcm9ubWVudFBvaW50ZXIgPSBtX2Vudmlyb25tZW50VmFyaWFibGVz LmRhdGEoKTsKKyAgICB9CisKKyAgICBjaGFyKiBnZXQoY29uc3QgY2hhciogbmFtZSkgY29uc3QK KyAgICB7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBtX2Vudmlyb25tZW50UG9pbnRlcltp XTsgKytpKSB7CisgICAgICAgICAgICBpZiAoY2hhciogdmFsdWUgPSB2YWx1ZUlmVmFyaWFibGVI YXNOYW1lKG1fZW52aXJvbm1lbnRQb2ludGVyW2ldLCBuYW1lKSkKKyAgICAgICAgICAgICAgICBy ZXR1cm4gdmFsdWU7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCisgICAg Ly8gV2lsbCBhcHBlbmQgdGhlIHZhbHVlIHdpdGggdGhlIGdpdmVuIHNlcGFyYXRvciBpZiB0aGUg ZW52aXJvbm1lbnQgdmFyaWFibGUgYWxyZWFkeSBleGlzdHMuCisgICAgdm9pZCBhcHBlbmRWYWx1 ZShjb25zdCBjaGFyKiBuYW1lLCBjb25zdCBjaGFyKiB2YWx1ZSwgY2hhciBzZXBhcmF0b3IpCisg ICAgeworICAgICAgICBjaGFyKiBleGlzdGluZ1ZhbHVlID0gZ2V0KG5hbWUpOworICAgICAgICBp ZiAoIWV4aXN0aW5nVmFsdWUpIHsKKyAgICAgICAgICAgIHNldChuYW1lLCB2YWx1ZSk7CisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBWZWN0b3I8Y2hhciwgMTI4PiBu ZXdWYWx1ZTsKKyAgICAgICAgbmV3VmFsdWUuYXBwZW5kKGV4aXN0aW5nVmFsdWUsIHN0cmxlbihl eGlzdGluZ1ZhbHVlKSk7CisgICAgICAgIG5ld1ZhbHVlLmFwcGVuZChzZXBhcmF0b3IpOworICAg ICAgICBuZXdWYWx1ZS5hcHBlbmQodmFsdWUsIHN0cmxlbih2YWx1ZSkgKyAxKTsKKworICAgICAg ICBzZXQobmFtZSwgbmV3VmFsdWUuZGF0YSgpKTsKKyAgICB9CisKKyAgICBjaGFyKiogZW52aXJv bm1lbnRQb2ludGVyKCkgY29uc3QgeyByZXR1cm4gbV9lbnZpcm9ubWVudFBvaW50ZXI7IH0KKwor cHJpdmF0ZToKKyAgICBjaGFyICp2YWx1ZUlmVmFyaWFibGVIYXNOYW1lKGNvbnN0IGNoYXIqIGVu dmlyb25tZW50VmFyaWFibGUsIGNvbnN0IGNoYXIqIG5hbWUpIGNvbnN0CisgICAgeworICAgICAg ICAvLyBGaW5kIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBuYW1lLgorICAgICAgICBjaGFyKiBl cXVhbHNMb2NhdGlvbiA9IHN0cmNocihlbnZpcm9ubWVudFZhcmlhYmxlLCAnPScpOworICAgICAg ICBBU1NFUlQoZXF1YWxzTG9jYXRpb24pOworCisgICAgICAgIHNpemVfdCBuYW1lTGVuZ3RoID0g ZXF1YWxzTG9jYXRpb24gLSBlbnZpcm9ubWVudFZhcmlhYmxlOworICAgICAgICBpZiAoc3RybmNt cChlbnZpcm9ubWVudFZhcmlhYmxlLCBuYW1lLCBuYW1lTGVuZ3RoKSkKKyAgICAgICAgICAgIHJl dHVybiAwOworCisgICAgICAgIHJldHVybiBlcXVhbHNMb2NhdGlvbiArIDE7CisgICAgfQorCisg ICAgY2hhciogY3JlYXRlU3RyaW5nRm9yVmFyaWFibGUoY29uc3QgY2hhciogbmFtZSwgY29uc3Qg Y2hhciogdmFsdWUpCisgICAgeworICAgICAgICBpbnQgbmFtZUxlbmd0aCA9IHN0cmxlbihuYW1l KTsKKyAgICAgICAgaW50IHZhbHVlTGVuZ3RoID0gc3RybGVuKHZhbHVlKTsKKworICAgICAgICAv LyBBbGxvY2F0ZSBlbm91Z2ggcm9vbSB0byBob2xkICduYW1lPXZhbHVlJyBhbmQgdGhlIG51bGwg Y2hhcmFjdGVyLgorICAgICAgICBjaGFyKiBzdHJpbmcgPSBzdGF0aWNfY2FzdDxjaGFyKj4oZmFz dE1hbGxvYyhuYW1lTGVuZ3RoICsgMSArIHZhbHVlTGVuZ3RoICsgMSkpOworICAgICAgICBtZW1j cHkoc3RyaW5nLCBuYW1lLCBuYW1lTGVuZ3RoKTsKKyAgICAgICAgc3RyaW5nW25hbWVMZW5ndGhd ID0gJz0nOworICAgICAgICBtZW1jcHkoc3RyaW5nICsgbmFtZUxlbmd0aCArIDEsIHZhbHVlLCB2 YWx1ZUxlbmd0aCk7CisgICAgICAgIHN0cmluZ1tuYW1lTGVuZ3RoICsgMSArIHZhbHVlTGVuZ3Ro XSA9ICdcMCc7CisKKyAgICAgICAgbV9hbGxvY2F0ZWRTdHJpbmdzLmFwcGVuZChzdHJpbmcpOwor CisgICAgICAgIHJldHVybiBzdHJpbmc7CisgICAgfQorCisgICAgdm9pZCBjb3B5RW52aXJvbm1l bnRWYXJpYWJsZXMoKQorICAgIHsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7ICgqX05TR2V0 RW52aXJvbigpKVtpXTsgaSsrKQorICAgICAgICAgICAgbV9lbnZpcm9ubWVudFZhcmlhYmxlcy5h cHBlbmQoKCpfTlNHZXRFbnZpcm9uKCkpW2ldKTsKKworICAgICAgICAvLyBOdWxsLXRlcm1pbmF0 ZSB0aGUgYXJyYXkuCisgICAgICAgIG1fZW52aXJvbm1lbnRWYXJpYWJsZXMuYXBwZW5kKHN0YXRp Y19jYXN0PGNoYXIqPigwKSk7CisgICAgfQorCisgICAgY2hhcioqIG1fZW52aXJvbm1lbnRQb2lu dGVyOworICAgIFZlY3RvcjxjaGFyKj4gbV9lbnZpcm9ubWVudFZhcmlhYmxlczsKKworICAgIC8v IFRoZXNlIGFsbG9jYXRlZCBzdHJpbmdzIHdpbGwgYmUgZnJlZWQgaW4gdGhlIGRlc3RydWN0b3Iu CisgICAgVmVjdG9yPGNoYXIqPiBtX2FsbG9jYXRlZFN0cmluZ3M7Cit9OworCiB2b2lkIFByb2Nl c3NMYXVuY2hlcjo6bGF1bmNoUHJvY2VzcygpCiB7CiAgICAgLy8gQ3JlYXRlIHRoZSBsaXN0ZW5p bmcgcG9ydC4KQEAgLTE0MSw3ICsyNTgsMjEgQEAgdm9pZCBQcm9jZXNzTGF1bmNoZXI6OmxhdW5j aFByb2Nlc3MoKQogICAgIHBvc2l4X3NwYXduYXR0cl9zZXRmbGFncygmYXR0ciwgZmxhZ3MpOwog CiAgICAgcGlkX3QgcHJvY2Vzc0lkZW50aWZpZXI7Ci0gICAgaW50IHJlc3VsdCA9IHBvc2l4X3Nw YXduKCZwcm9jZXNzSWRlbnRpZmllciwgcGF0aCwgMCwgJmF0dHIsIChjaGFyICpjb25zdCopYXJn cywgKl9OU0dldEVudmlyb24oKSk7CisKKyAgICBFbnZpcm9ubWVudFZhcmlhYmxlcyBlbnZpcm9u bWVudFZhcmlhYmxlczsKKworICAgIGlmIChtX2xhdW5jaE9wdGlvbnMucHJvY2Vzc1R5cGUgPT0g UHJvY2Vzc0xhdW5jaGVyOjpQbHVnaW5Qcm9jZXNzKSB7CisgICAgICAgIC8vIFdlIG5lZWQgdG8g aW5zZXJ0IHRoZSBwbHVnLWluIHByb2Nlc3Mgc2hpbS4KKyAgICAgICAgTlNTdHJpbmcgKnBsdWdp blByb2Nlc3NTaGltUGF0aE5TU3RyaW5nID0gW1t3ZWJQcm9jZXNzQXBwRXhlY3V0YWJsZVBhdGgg c3RyaW5nQnlEZWxldGluZ0xhc3RQYXRoQ29tcG9uZW50XSBzdHJpbmdCeUFwcGVuZGluZ1BhdGhD b21wb25lbnQ6QCJQbHVnaW5Qcm9jZXNzU2hpbS5keWxpYiJdOworICAgICAgICBjb25zdCBjaGFy ICpwbHVnaW5Qcm9jZXNzU2hpbVBhdGggPSBbcGx1Z2luUHJvY2Vzc1NoaW1QYXRoTlNTdHJpbmcg ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uXTsKKworICAgICAgICAvLyBNYWtlIHN1cmUgdGhhdCB0 aGUgZmlsZSBleGlzdHMuCisgICAgICAgIHN0cnVjdCBzdGF0IHN0YXRCdWY7CisgICAgICAgIGlm IChzdGF0KHBsdWdpblByb2Nlc3NTaGltUGF0aCwgJnN0YXRCdWYpID09IDAgJiYgKHN0YXRCdWYu c3RfbW9kZSAmIFNfSUZNVCkgPT0gU19JRlJFRykKKyAgICAgICAgICAgIGVudmlyb25tZW50VmFy aWFibGVzLmFwcGVuZFZhbHVlKCJEWUxEX0lOU0VSVF9MSUJSQVJJRVMiLCBwbHVnaW5Qcm9jZXNz U2hpbVBhdGgsICc6Jyk7CisgICAgfQorICAgIAorICAgIGludCByZXN1bHQgPSBwb3NpeF9zcGF3 bigmcHJvY2Vzc0lkZW50aWZpZXIsIHBhdGgsIDAsICZhdHRyLCAoY2hhciAqY29uc3QqKWFyZ3Ms IGVudmlyb25tZW50VmFyaWFibGVzLmVudmlyb25tZW50UG9pbnRlcigpKTsKIAogICAgIHBvc2l4 X3NwYXduYXR0cl9kZXN0cm95KCZhdHRyKTsKIAo=