46295 2010-09-22 12:52:13 -0700 Enhance ProcessLauncher to be able to launch plug-in processes 2010-09-22 13:16:23 -0700 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 283177 0 andersca 2010-09-22 12:52:13 -0700 Enhance ProcessLauncher to be able to launch plug-in processes 283183 1 68422 andersca 2010-09-22 12:58:30 -0700 Created attachment 68422 Patch 283191 2 andersca 2010-09-22 13:16:23 -0700 Committed r68075: <http://trac.webkit.org/changeset/68075> 68422 2010-09-22 12:58:30 -0700 2010-09-22 12:59:54 -0700 Patch bug-46295-20100922125829.patch text/plain 13366 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YTZkNTIxMzUxNDk3NWFjN2JmMWNmYjE4MjM2NWE1NzUxN2ExYTI3Mi4uYjgxMzk4Yzk3OTMzY2Uw MTQ1YzQ4ZGM4YWE0M2U3NWJiODU5OTU4YiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0NyBAQAogMjAxMC0wOS0yMiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuaGFuY2UgUHJvY2Vzc0xhdW5jaGVyIHRvIGJl IGFibGUgdG8gbGF1bmNoIHBsdWctaW4gcHJvY2Vzc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjI5NQorCisgICAgICAgICogVUlQcm9jZXNzL0xh dW5jaGVyL1Byb2Nlc3NMYXVuY2hlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NMYXVu Y2hlcjo6UHJvY2Vzc0xhdW5jaGVyKToKKyAgICAgICAgTWFrZSB0aGUgUHJvY2Vzc0xhdW5jaGVy IGNvbnN0cnVjdG9yIHRha2UgYSBMYXVuY2hPcHRpb25zIHN0cnVjdC4KKworICAgICAgICAoV2Vi S2l0OjpQcm9jZXNzTGF1bmNoZXI6OnByb2Nlc3NUeXBlQXNTdHJpbmcpOgorICAgICAgICBHaXZl biBhIHByb2Nlc3MgdHlwZSwgcmV0dXJuIGl0cyBzdHJpbmcgcmVwcmVzZW50YXRpb24uCisKKyAg ICAgICAgKFdlYktpdDo6UHJvY2Vzc0xhdW5jaGVyOjpnZXRQcm9jZXNzVHlwZUZyb21TdHJpbmcp OgorICAgICAgICBBbmQgdmljZSB2ZXJzYS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9MYXVuY2hl ci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzTGF1 bmNoZXI6OmxhdW5jaFByb2Nlc3MpOgorICAgICAgICBSZW5hbWUgIm1vZGUiIHRvICJ0eXBlIiBh bmQgcGFzcyB0aGUgdHlwZSBhcyBhIHN0cmluZyBiYXNlZCBvbiB0aGUgTGF1bmNoT3B0aW9ucyBz dHJ1Y3QuCisgICAgICAgIEFsc28sIHNldCB0aGUgbGF1bmNoIGFyY2hpdGVjdHVyZSBmcm9tIHRo ZSBMYXVuY2hPcHRpb25zIHN0cnVjdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9MYXVuY2hlci93 aW4vUHJvY2Vzc0xhdW5jaGVyV2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0xhdW5j aGVyOjpsYXVuY2hQcm9jZXNzKToKKyAgICAgICAgUmVuYW1lICJtb2RlIiB0byAidHlwZS4iCisK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzc1Byb3h5Ojpjb25uZWN0KToKKyAgICAgICAgSW5pdGlhbGl6ZSBhIExhdW5j aE9wdGlvbnMgc3RydWN0LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJLaXRNYWluLmNwcDoK KyAgICAgICAgKFdlYktpdE1haW4pOgorICAgICAgICBGYWN0b3IgY29kZSB0aGF0IGNhbiBiZSBz aGFyZWQgYmV0d2VlbiB0aGUgbWFjIGFuZCB3aW5kb3dzIFdlYktpdE1haW4gY29kZSBvdXQgaW50 byBhCisgICAgICAgIFdlYktpdE1haW4gb3ZlcmxvYWQgdGhhdCB0YWtlcyBhIENvbW1hbmRMaW5l LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzTWFpbi5oOgorICAgICAgICAqIFdl YlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWluTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQ cm9jZXNzTWFpbik6CisgICAgICAgICogV2ViUHJvY2Vzcy93aW4vV2ViUHJvY2Vzc01haW5XaW4u Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzTWFpbik6CisgICAgICAgIENoYW5nZSBX ZWJQcm9jZXNzTWFpbiB0byB0YWtlIGEgY29uc3QgQ29tbWFuZExpbmUgcmVmZXJlbmNlIGluc3Rl YWQgb2YgYSBwb2ludGVyLgorCisyMDEwLTA5LTIyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KIAogICAgICAg ICBSZW5hbWUgR2V0UGx1Z2luSG9zdENvbm5lY3Rpb24gdG8gR2V0UGx1Z2luUGF0aApkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvUHJvY2Vzc0xhdW5jaGVyLmNwcCBiL1dl YktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL1Byb2Nlc3NMYXVuY2hlci5jcHAKaW5kZXggYWJiYmI0 NjYwMTg3OTYyYjVlYzIxMzJkMTVhODc5ZDRhZmU0N2JiNS4uNDdjZWRjMTdmMjVmYTY0NDQ3NTE2 MmYyZjg5YTczYmEzZjcyZmYyNiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNo ZXIvUHJvY2Vzc0xhdW5jaGVyLmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9Q cm9jZXNzTGF1bmNoZXIuY3BwCkBAIC0zNiw4ICszNiw5IEBAIHN0YXRpYyBXb3JrUXVldWUmIHBy b2Nlc3NMYXVuY2hlcldvcmtRdWV1ZSgpCiAgICAgcmV0dXJuIHByb2Nlc3NMYXVuY2hlcldvcmtR dWV1ZTsKIH0KIAotUHJvY2Vzc0xhdW5jaGVyOjpQcm9jZXNzTGF1bmNoZXIoQ2xpZW50KiBjbGll bnQpCitQcm9jZXNzTGF1bmNoZXI6OlByb2Nlc3NMYXVuY2hlcihDbGllbnQqIGNsaWVudCwgY29u c3QgTGF1bmNoT3B0aW9ucyYgbGF1bmNoT3B0aW9ucykKICAgICA6IG1fY2xpZW50KGNsaWVudCkK KyAgICAsIG1fbGF1bmNoT3B0aW9ucyhsYXVuY2hPcHRpb25zKQogICAgICwgbV9wcm9jZXNzSWRl bnRpZmllcigwKQogewogICAgIC8vIExhdW5jaCB0aGUgcHJvY2Vzcy4KQEAgLTYzLDQgKzY0LDMy IEBAIHZvaWQgUHJvY2Vzc0xhdW5jaGVyOjppbnZhbGlkYXRlKCkKICAgICBtX2NsaWVudCA9IDA7 CiB9CiAKK2NvbnN0IGNoYXIqIFByb2Nlc3NMYXVuY2hlcjo6cHJvY2Vzc1R5cGVBc1N0cmluZyhQ cm9jZXNzVHlwZSBwcm9jZXNzVHlwZSkKK3sKKyAgICBzd2l0Y2ggKHByb2Nlc3NUeXBlKSB7Cisg ICAgY2FzZSBXZWJQcm9jZXNzOgorICAgICAgICByZXR1cm4gIndlYnByb2Nlc3MiOworICAgIGNh c2UgUGx1Z2luUHJvY2VzczoKKyAgICAgICAgcmV0dXJuICJwbHVnaW5wcm9jZXNzIjsKKyAgICB9 CisKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gMDsKK30KKworYm9vbCBQ cm9jZXNzTGF1bmNoZXI6OmdldFByb2Nlc3NUeXBlRnJvbVN0cmluZyhjb25zdCBjaGFyKiBzdHJp bmcsIFByb2Nlc3NUeXBlJiBwcm9jZXNzVHlwZSkKK3sKKyAgICBpZiAoIXN0cmNtcChzdHJpbmcs ICJ3ZWJwcm9jZXNzIikpIHsKKyAgICAgICAgcHJvY2Vzc1R5cGUgPSBXZWJQcm9jZXNzOworICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBpZiAoIXN0cmNtcChzdHJpbmcsICJwbHVn aW5wcm9jZXNzIikpIHsKKyAgICAgICAgcHJvY2Vzc1R5cGUgPSBQbHVnaW5Qcm9jZXNzOworICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIH0gLy8g bmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIv UHJvY2Vzc0xhdW5jaGVyLmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9Qcm9jZXNzTGF1 bmNoZXIuaAppbmRleCA2Mzk4ZjdjNDg4ZGU2YzkzMDMyNDU3OWY1ODc5OWI4ZGZlMTJiOWU3Li4z Y2Q4OWJhMjY2NmE3ZmRjZDg5MzVjNTlhMWRkMGRkM2YzNjU0NGM3IDEwMDY0NAotLS0gYS9XZWJL aXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9Qcm9jZXNzTGF1bmNoZXIuaAorKysgYi9XZWJLaXQyL1VJ UHJvY2Vzcy9MYXVuY2hlci9Qcm9jZXNzTGF1bmNoZXIuaApAQCAtNDYsOSArNDYsMjIgQEAgcHVi bGljOgogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTGF1bmNoaW5nKFByb2Nlc3NMYXVu Y2hlciosIENvcmVJUEM6OkNvbm5lY3Rpb246OklkZW50aWZpZXIpID0gMDsKICAgICB9OwogICAg IAotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFByb2Nlc3NMYXVuY2hlcj4gY3JlYXRlKENsaWVudCog Y2xpZW50KQorICAgIGVudW0gUHJvY2Vzc1R5cGUgeworICAgICAgICBXZWJQcm9jZXNzLAorICAg ICAgICBQbHVnaW5Qcm9jZXNzCisgICAgfTsKKworICAgIHN0cnVjdCBMYXVuY2hPcHRpb25zIHsK KyAgICAgICAgUHJvY2Vzc1R5cGUgcHJvY2Vzc1R5cGU7CisjaWYgUExBVEZPUk0oTUFDKQorICAg ICAgICBzdGF0aWMgY29uc3QgY3B1X3R5cGVfdCBNYXRjaEN1cnJlbnRBcmNoaXRlY3R1cmUgPSAw OworICAgICAgICBjcHVfdHlwZV90IGFyY2hpdGVjdHVyZTsKKyNlbmRpZgorICAgIH07CisKKyAg ICBzdGF0aWMgUGFzc1JlZlB0cjxQcm9jZXNzTGF1bmNoZXI+IGNyZWF0ZShDbGllbnQqIGNsaWVu dCwgY29uc3QgTGF1bmNoT3B0aW9ucyYgbGF1bmNoT3B0aW9ucykKICAgICB7Ci0gICAgICAgIHJl dHVybiBhZG9wdFJlZihuZXcgUHJvY2Vzc0xhdW5jaGVyKGNsaWVudCkpOworICAgICAgICByZXR1 cm4gYWRvcHRSZWYobmV3IFByb2Nlc3NMYXVuY2hlcihjbGllbnQsIGxhdW5jaE9wdGlvbnMpKTsK ICAgICB9CiAKICAgICBib29sIGlzTGF1bmNoaW5nKCkgY29uc3QgeyByZXR1cm4gbV9pc0xhdW5j aGluZzsgfQpAQCAtNTcsMTkgKzcwLDI0IEBAIHB1YmxpYzoKICAgICB2b2lkIHRlcm1pbmF0ZVBy b2Nlc3MoKTsKICAgICB2b2lkIGludmFsaWRhdGUoKTsKIAorICAgIHN0YXRpYyBib29sIGdldFBy b2Nlc3NUeXBlRnJvbVN0cmluZyhjb25zdCBjaGFyKiwgUHJvY2Vzc1R5cGUmKTsKKwogI2lmIFBM QVRGT1JNKFFUKQogICAgIGZyaWVuZCBjbGFzcyBQcm9jZXNzTGF1bmNoZXJIZWxwZXI7CiAgICAg c3RhdGljIFFMb2NhbFNvY2tldCogdGFrZVBlbmRpbmdDb25uZWN0aW9uKCk7CiAjZW5kaWYKIAog cHJpdmF0ZToKLSAgICBleHBsaWNpdCBQcm9jZXNzTGF1bmNoZXIoQ2xpZW50Kik7CisgICAgUHJv Y2Vzc0xhdW5jaGVyKENsaWVudCosIGNvbnN0IExhdW5jaE9wdGlvbnMmIGxhdW5jaE9wdGlvbnMp OworCisgICAgc3RhdGljIGNvbnN0IGNoYXIqIHByb2Nlc3NUeXBlQXNTdHJpbmcoUHJvY2Vzc1R5 cGUpOwogCiAgICAgdm9pZCBsYXVuY2hQcm9jZXNzKCk7CiAgICAgdm9pZCBkaWRGaW5pc2hMYXVu Y2hpbmdQcm9jZXNzKFBsYXRmb3JtUHJvY2Vzc0lkZW50aWZpZXIsIENvcmVJUEM6OkNvbm5lY3Rp b246OklkZW50aWZpZXIpOwogCiAgICAgQ2xpZW50KiBtX2NsaWVudDsKIAorICAgIGNvbnN0IExh dW5jaE9wdGlvbnMgbV9sYXVuY2hPcHRpb25zOwogICAgIGJvb2wgbV9pc0xhdW5jaGluZzsKICAg ICBQbGF0Zm9ybVByb2Nlc3NJZGVudGlmaWVyIG1fcHJvY2Vzc0lkZW50aWZpZXI7CiB9OwpkaWZm IC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1h Yy5tbSBiL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL21hYy9Qcm9jZXNzTGF1bmNoZXJNYWMu bW0KaW5kZXggZGQ0NjRlYzUzNDQ5OGU2ZTNiYWMwMTMyM2VmNzNhYzFkYjFhNjY0NS4uYmQwZDc1 NWNiNDJlMWQ0MmMwMDM5NTFjY2I0YTc0ODc3OTMxNjI2NCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9V SVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbQorKysgYi9XZWJLaXQy L1VJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFjLm1tCkBAIC0xMDUsNyAr MTA1LDcgQEAgdm9pZCBQcm9jZXNzTGF1bmNoZXI6OmxhdW5jaFByb2Nlc3MoKQogICAgIENTdHJp bmcgc2VydmljZU5hbWUgPSBTdHJpbmc6OmZvcm1hdCgiY29tLmFwcGxlLldlYktpdC5XZWJQcm9j ZXNzLSVkLSVwIiwgZ2V0cGlkKCksIHRoaXMpLnV0ZjgoKTsKIAogICAgIGNvbnN0IGNoYXIqIHBh dGggPSBbd2ViUHJvY2Vzc0FwcEV4ZWN1dGFibGVQYXRoIGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlv bl07Ci0gICAgY29uc3QgY2hhciogYXJnc1tdID0geyBwYXRoLCAiLW1vZGUiLCAibGVnYWN5d2Vi cHJvY2VzcyIsICItc2VydmljZW5hbWUiLCBzZXJ2aWNlTmFtZS5kYXRhKCksICItcGFyZW50cHJv Y2Vzc25hbWUiLCBwcm9jZXNzTmFtZSgpLCAwIH07CisgICAgY29uc3QgY2hhciogYXJnc1tdID0g eyBwYXRoLCAiLXR5cGUiLCBwcm9jZXNzVHlwZUFzU3RyaW5nKG1fbGF1bmNoT3B0aW9ucy5wcm9j ZXNzVHlwZSksICItc2VydmljZW5hbWUiLCBzZXJ2aWNlTmFtZS5kYXRhKCksICItcGFyZW50cHJv Y2Vzc25hbWUiLCBwcm9jZXNzTmFtZSgpLCAwIH07CiAKICAgICAvLyBSZWdpc3RlciBvdXJzZWx2 ZXMuCiAgICAga2Vybl9yZXR1cm5fdCBrciA9IGJvb3RzdHJhcF9yZWdpc3RlcjIoYm9vdHN0cmFw X3BvcnQsIGNvbnN0X2Nhc3Q8Y2hhcio+KHNlcnZpY2VOYW1lLmRhdGEoKSksIGxpc3RlbmluZ1Bv cnQsIDApOwpAQCAtMTE2LDEyICsxMTYsMTQgQEAgdm9pZCBQcm9jZXNzTGF1bmNoZXI6OmxhdW5j aFByb2Nlc3MoKQogCiAgICAgLy8gRklYTUU6IFNob3VsZCB3ZSByZXN0b3JlIHNpZ25hbHMgaGVy ZT8KIAotI2lmIENQVShYODYpCi0gICAgLy8gRW5zdXJlIHRoYXQgdGhlIGNoaWxkIHByb2Nlc3Mg cnVucyBhcyB0aGUgc2FtZSBhcmNoaXRlY3R1cmUgYXMgdGhlIHBhcmVudCBwcm9jZXNzLiAKLSAg ICBjcHVfdHlwZV90IGNwdVR5cGVzW10gPSB7IENQVV9UWVBFX1g4NiB9OyAgICAKKyAgICAvLyBE ZXRlcm1pbmUgdGhlIGFyY2hpdGVjdHVyZSB0byB1c2UuCisgICAgY3B1X3R5cGVfdCBhcmNoaXRl Y3R1cmUgPSBtX2xhdW5jaE9wdGlvbnMuYXJjaGl0ZWN0dXJlOworICAgIGlmIChhcmNoaXRlY3R1 cmUgPT0gTGF1bmNoT3B0aW9uczo6TWF0Y2hDdXJyZW50QXJjaGl0ZWN0dXJlKQorICAgICAgICBh cmNoaXRlY3R1cmUgPSBfTlNHZXRNYWNoRXhlY3V0ZUhlYWRlcigpLT5jcHV0eXBlOworCisgICAg Y3B1X3R5cGVfdCBjcHVUeXBlc1tdID0geyBhcmNoaXRlY3R1cmUgfTsgICAgCiAgICAgc2l6ZV90 IG91dENvdW50ID0gMDsKICAgICBwb3NpeF9zcGF3bmF0dHJfc2V0YmlucHJlZl9ucCgmYXR0ciwg MSwgY3B1VHlwZXMsICZvdXRDb3VudCk7Ci0jZW5kaWYKIAogICAgIC8vIFN0YXJ0IHN1c3BlbmRl ZCBzbyB3ZSBjYW4gc2V0IHVwIHRoZSB0ZXJtaW5hdGlvbiBub3RpZmljYXRpb24gaGFuZGxlci4K ICAgICBwb3NpeF9zcGF3bmF0dHJfc2V0ZmxhZ3MoJmF0dHIsIFBPU0lYX1NQQVdOX1NUQVJUX1NV U1BFTkRFRCk7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci93aW4vUHJv Y2Vzc0xhdW5jaGVyV2luLmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3dpbi9Qcm9j ZXNzTGF1bmNoZXJXaW4uY3BwCmluZGV4IDc1NWNhNDBiMjI0ZDE2YTRlOGI5ZTc3OWFiY2MwMjc2 NGU3ZGIwOWEuLjE2ZWIyMTk2MTU2ZjQ2ZjQ0MDU5M2JmNzhiMmIyNTAwNDEwNGVlZTkgMTAwNjQ0 Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3dpbi9Qcm9jZXNzTGF1bmNoZXJXaW4u Y3BwCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3dpbi9Qcm9jZXNzTGF1bmNoZXJX aW4uY3BwCkBAIC02OSw5ICs2OSwxMCBAQCB2b2lkIFByb2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJv Y2VzcygpCiAKICAgICBTdHJpbmcgY29tbWFuZExpbmUocGF0aFN0cik7CiAKKyAgICAvLyBGSVhN RTogSXQgd291bGQgYmUgbmljZSBpZiB3ZSBjb3VsZCBqdXN0IGNyZWF0ZSBhIENvbW1hbmRMaW5l IG9iamVjdCBhbmQgb3V0cHV0IGEgY29tbWFuZCBsaW5lIHZlY3RvciBmcm9tIGl0LgogICAgIFZl Y3RvcjxVQ2hhcj4gY29tbWFuZExpbmVWZWN0b3I7CiAgICAgYXBwZW5kKGNvbW1hbmRMaW5lVmVj dG9yLCBjb21tYW5kTGluZSk7Ci0gICAgYXBwZW5kKGNvbW1hbmRMaW5lVmVjdG9yLCAiIC1tb2Rl IHdlYnByb2Nlc3MiKTsKKyAgICBhcHBlbmQoY29tbWFuZExpbmVWZWN0b3IsICIgLXR5cGUgd2Vi cHJvY2VzcyIpOwogICAgIGFwcGVuZChjb21tYW5kTGluZVZlY3RvciwgIiAtY2xpZW50SWRlbnRp ZmllciAiKTsKICAgICBhcHBlbmQoY29tbWFuZExpbmVWZWN0b3IsIFN0cmluZzo6bnVtYmVyKHJl aW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihjbGllbnRJZGVudGlmaWVyKSkpOwogICAgIGNvbW1h bmRMaW5lVmVjdG9yLmFwcGVuZCgnXDAnKTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNz L1dlYlByb2Nlc3NQcm94eS5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwCmluZGV4IDIzMWFjN2RhZjk0YzUwODAyN2Y1MmMwNWZjMDhjZjcyODMyZTE0MGUuLjhkOGU1 ZGE3YjM3NmMxZmRjZThkNWMwZjc2ZjFkZTRlNjRjMDFkN2UgMTAwNjQ0Ci0tLSBhL1dlYktpdDIv VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmNwcApAQCAtMTE1LDcgKzExNSwxNCBAQCB2b2lkIFdlYlByb2Nlc3NQcm94 eTo6Y29ubmVjdCgpCiAgICAgICAgIG1fdGhyZWFkTGF1bmNoZXIgPSBUaHJlYWRMYXVuY2hlcjo6 Y3JlYXRlKHRoaXMpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVCghbV9wcm9jZXNzTGF1 bmNoZXIpOwotICAgICAgICBtX3Byb2Nlc3NMYXVuY2hlciA9IFByb2Nlc3NMYXVuY2hlcjo6Y3Jl YXRlKHRoaXMpOworCisgICAgICAgIFByb2Nlc3NMYXVuY2hlcjo6TGF1bmNoT3B0aW9ucyBsYXVu Y2hPcHRpb25zOworICAgICAgICBsYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlID0gUHJvY2Vzc0xh dW5jaGVyOjpXZWJQcm9jZXNzOworI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgLy8gV2Ugd2Fu dCB0aGUgd2ViIHByb2Nlc3MgdG8gbWF0Y2ggdGhlIGFyY2hpdGVjdHVyZSBvZiB0aGUgVUkgcHJv Y2Vzcy4KKyAgICAgICAgbGF1bmNoT3B0aW9ucy5hcmNoaXRlY3R1cmUgPSBQcm9jZXNzTGF1bmNo ZXI6OkxhdW5jaE9wdGlvbnM6Ok1hdGNoQ3VycmVudEFyY2hpdGVjdHVyZTsKKyNlbmRpZgorICAg ICAgICBtX3Byb2Nlc3NMYXVuY2hlciA9IFByb2Nlc3NMYXVuY2hlcjo6Y3JlYXRlKHRoaXMsIGxh dW5jaE9wdGlvbnMpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYktpdE1haW4uY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYktpdE1haW4uY3BwCmluZGV4 IGJjMGYwNGU5Y2NiMDk4M2MyODkwNjM2ZDFiODg3NDFmMmUzYmY4NmMuLmU3NzNlYWU4MzlkNTlh YTgxYWIxY2IyMWZlZGVlZWM4ZWI2YjJjMDggMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJLaXRNYWluLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViS2l0TWFpbi5jcHAK QEAgLTI1LDcgKzI1LDkgQEAKIAogI2luY2x1ZGUgIkNvbW1hbmRMaW5lLmgiCiAKKyNpbmNsdWRl ICJQcm9jZXNzTGF1bmNoZXIuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzTWFpbi5oIgorI2luY2x1 ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogI2lmIFBMQVRGT1JNKE1BQykKICNpbmNsdWRlIDxv YmpjL29iamMtYXV0by5oPgpAQCAtMzMsNiArMzUsMjMgQEAKIAogdXNpbmcgbmFtZXNwYWNlIFdl YktpdDsKIAorc3RhdGljIGludCBXZWJLaXRNYWluKGNvbnN0IENvbW1hbmRMaW5lJiBjb21tYW5k TGluZSkKK3sKKyAgICBQcm9jZXNzTGF1bmNoZXI6OlByb2Nlc3NUeXBlIHByb2Nlc3NUeXBlOyAg ICAKKyAgICBpZiAoIVByb2Nlc3NMYXVuY2hlcjo6Z2V0UHJvY2Vzc1R5cGVGcm9tU3RyaW5nKGNv bW1hbmRMaW5lWyJ0eXBlIl0udXRmOCgpLmRhdGEoKSwgcHJvY2Vzc1R5cGUpKQorICAgICAgICBy ZXR1cm4gRVhJVF9GQUlMVVJFOworCisgICAgc3dpdGNoIChwcm9jZXNzVHlwZSkgeworICAgICAg ICBjYXNlIFByb2Nlc3NMYXVuY2hlcjo6V2ViUHJvY2VzczoKKyAgICAgICAgICAgIHJldHVybiBX ZWJQcm9jZXNzTWFpbihjb21tYW5kTGluZSk7CisgICAgICAgIGNhc2UgUHJvY2Vzc0xhdW5jaGVy OjpQbHVnaW5Qcm9jZXNzOgorICAgICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSB0aGlzLgorICAg ICAgICAgICAgYnJlYWs7CisgICAgfQorCisgICAgcmV0dXJuIEVYSVRfRkFJTFVSRTsKK30KKwog I2lmIFBMQVRGT1JNKE1BQykKIAogZXh0ZXJuICJDIiBXS19FWFBPUlQgaW50IFdlYktpdE1haW4o aW50IGFyZ2MsIGNoYXIqKiBhcmd2KTsKQEAgLTQ1LDExICs2NCw3IEBAIGludCBXZWJLaXRNYWlu KGludCBhcmdjLCBjaGFyKiogYXJndikKICAgICBpZiAoIWNvbW1hbmRMaW5lLnBhcnNlKGFyZ2Ms IGFyZ3YpKQogICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwogICAgIAotICAgIFN0cmluZyBt b2RlID0gY29tbWFuZExpbmVbIm1vZGUiXTsKLSAgICBpZiAobW9kZSA9PSAibGVnYWN5d2VicHJv Y2VzcyIpCi0gICAgICAgIHJldHVybiBXZWJQcm9jZXNzTWFpbigmY29tbWFuZExpbmUpOwotICAg IAotICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CisgICAgcmV0dXJuIFdlYktpdE1haW4oY29tbWFu ZExpbmUpOwogfQogCiAjZWxpZiBQTEFURk9STShXSU4pCkBAIC0xMjYsMTEgKzE0MSw3IEBAIGlu dCBXZWJLaXRNYWluKEhJTlNUQU5DRSBoSW5zdGFuY2UsIEhJTlNUQU5DRSBoUHJldkluc3RhbmNl LCBMUFRTVFIgbHBzdHJDbWRMaW5lCiAgICAgaWYgKCFjb21tYW5kTGluZS5wYXJzZShscHN0ckNt ZExpbmUpKQogICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwogCi0gICAgU3RyaW5nIG1vZGUg PSBjb21tYW5kTGluZVsibW9kZSJdOwotICAgIGlmIChtb2RlID09ICJ3ZWJwcm9jZXNzIikKLSAg ICAgICAgcmV0dXJuIFdlYktpdDo6V2ViUHJvY2Vzc01haW4oJmNvbW1hbmRMaW5lKTsKLQotICAg IHJldHVybiBFWElUX0ZBSUxVUkU7CisgICAgcmV0dXJuIFdlYktpdE1haW4oY29tbWFuZExpbmUp OgogfQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNz TWFpbi5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3NNYWluLmgKaW5kZXggOWYxNWUz YTY5ZDFlMTk3NzJmNDMyMWE4NGU2MmQ2MTg3MTBhMDlkMy4uODkyM2JkZDBlMjIzOWQzYjFmZmZj ZGVhNzFiZmU1YTgyMGY5ZmVmNiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBy b2Nlc3NNYWluLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3NNYWluLmgKQEAg LTI5LDYgKzI5LDYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIENvbW1hbmRMaW5lOwog Ci1pbnQgV2ViUHJvY2Vzc01haW4oQ29tbWFuZExpbmUqKTsKK2ludCBXZWJQcm9jZXNzTWFpbihj b25zdCBDb21tYW5kTGluZSYpOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBh L1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01haW5NYWMubW0gYi9XZWJLaXQyL1dl YlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWluTWFjLm1tCmluZGV4IDRiNDk5MjFkYmVkZDY2Yjc0 YWI4M2JkNDEwNTkxNmIyMmRjYWFmYjAuLmE1Y2E0ZjgwZTAzYWY4NjI1NTRjNGZmYmUzOGVhYzM0 ZTBmNGI1ODQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01h aW5NYWMubW0KKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNzTWFpbk1hYy5t bQpAQCAtNTUsNyArNTUsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNl IFdlYktpdCB7CiAKLWludCBXZWJQcm9jZXNzTWFpbihDb21tYW5kTGluZSogY29tbWFuZExpbmUp CitpbnQgV2ViUHJvY2Vzc01haW4oY29uc3QgQ29tbWFuZExpbmUmIGNvbW1hbmRMaW5lKQogewog ICAgIE5TQXV0b3JlbGVhc2VQb29sICpwb29sID0gW1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxvY10g aW5pdF07CiAKQEAgLTcxLDcgKzcxLDcgQEAgaW50IFdlYlByb2Nlc3NNYWluKENvbW1hbmRMaW5l KiBjb21tYW5kTGluZSkKICAgICB9CiAjZW5kaWYKIAotICAgIFN0cmluZyBzZXJ2aWNlTmFtZSA9 ICgqY29tbWFuZExpbmUpWyJzZXJ2aWNlbmFtZSJdOworICAgIFN0cmluZyBzZXJ2aWNlTmFtZSA9 IGNvbW1hbmRMaW5lWyJzZXJ2aWNlbmFtZSJdOwogICAgIGlmIChzZXJ2aWNlTmFtZS5pc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAKQEAgLTk3LDcgKzk3LDcgQEAgaW50 IFdlYlByb2Nlc3NNYWluKENvbW1hbmRMaW5lKiBjb21tYW5kTGluZSkKICAgICBSdW5Mb29wOjpp bml0aWFsaXplTWFpblJ1bkxvb3AoKTsKIAogICAgIC8vIFNldCB0aGUgdmlzaWJsZSBhcHBsaWNh dGlvbiBuYW1lLgotICAgIFN0cmluZyBwYXJlbnRQcm9jZXNzTmFtZSA9ICgqY29tbWFuZExpbmUp WyJwYXJlbnRwcm9jZXNzbmFtZSJdOworICAgIFN0cmluZyBwYXJlbnRQcm9jZXNzTmFtZSA9IGNv bW1hbmRMaW5lWyJwYXJlbnRwcm9jZXNzbmFtZSJdOwogICAgIGlmICghcGFyZW50UHJvY2Vzc05h bWUuaXNOdWxsKCkpIHsKICAgICAgICAgLy8gRklYTUU6IExvY2FsaXphdGlvbiEKICAgICAgICAg TlNTdHJpbmcgKmFwcGxpY2F0aW9uTmFtZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAi JUAgV2ViIENvbnRlbnQiLCAoTlNTdHJpbmcgKilwYXJlbnRQcm9jZXNzTmFtZV07CmRpZmYgLS1n aXQgYS9XZWJLaXQyL1dlYlByb2Nlc3Mvd2luL1dlYlByb2Nlc3NNYWluV2luLmNwcCBiL1dlYktp dDIvV2ViUHJvY2Vzcy93aW4vV2ViUHJvY2Vzc01haW5XaW4uY3BwCmluZGV4IDk0NzMwZGYwZjNk NGMxZDMyOGQyZmNjZDEzMTkwNWQ2MmEyNTQ1MzMuLjk0NGQ4ZmY3Yjc1NzNhYzY3MmJjZjA0NTBh MzIyYWQ4ODdiNjJiMmMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy93aW4vV2ViUHJv Y2Vzc01haW5XaW4uY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy93aW4vV2ViUHJvY2Vzc01h aW5XaW4uY3BwCkBAIC01Niw3ICs1Niw3IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVTYWZhcmlU aGVtZSgpCiB9CiAjZW5kaWYgLy8gVVNFKFNBRkFSSV9USEVNRSkKIAotaW50IFdlYlByb2Nlc3NN YWluKENvbW1hbmRMaW5lKiBjb21tYW5kTGluZSkKK2ludCBXZWJQcm9jZXNzTWFpbihjb25zdCBD b21tYW5kTGluZSYgY29tbWFuZExpbmUpCiB7CiAgICAgOjpPbGVJbml0aWFsaXplKDApOwogCkBA IC02OCw3ICs2OCw3IEBAIGludCBXZWJQcm9jZXNzTWFpbihDb21tYW5kTGluZSogY29tbWFuZExp bmUpCiAgICAgV1RGOjppbml0aWFsaXplTWFpblRocmVhZCgpOwogICAgIFJ1bkxvb3A6OmluaXRp YWxpemVNYWluUnVuTG9vcCgpOwogCi0gICAgY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyU3RyaW5n ID0gKCpjb21tYW5kTGluZSlbImNsaWVudElkZW50aWZpZXIiXTsKKyAgICBjb25zdCBTdHJpbmcm IGlkZW50aWZpZXJTdHJpbmcgPSBjb21tYW5kTGluZVsiY2xpZW50SWRlbnRpZmllciJdOwogCiAg ICAgLy8gRklYTUU6IFNob3VsZCB3ZSByZXR1cm4gYW4gZXJyb3IgY29kZSBoZXJlPwogICAgIEhB TkRMRSBjbGllbnRJZGVudGlmaWVyID0gcmVpbnRlcnByZXRfY2FzdDxIQU5ETEU+KGlkZW50aWZp ZXJTdHJpbmcudG9VSW50NjRTdHJpY3QoKSk7Cg==