52635 2011-01-18 09:52:10 -0800 Plug-in hosting WebProcess instances appear in Activity Monitor as WebProcess 2011-01-18 10:11: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 335875 0 andersca 2011-01-18 09:52:10 -0800 Plug-in hosting WebProcess instances appear in Activity Monitor as WebProcess 335880 1 79289 andersca 2011-01-18 09:55:13 -0800 Created attachment 79289 Patch 335885 2 79289 mitz 2011-01-18 10:00:53 -0800 Comment on attachment 79289 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79289&action=review > Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm:87 > + }; > + No need for these spaces. > Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm:99 > + [[(NSString*)parameters.pluginPath lastPathComponent] stringByDeletingPathExtension], Need space before the asterisk. Is this what the WebKit1 plug-in host does (use the path, not the display name from the bundle)? 335895 3 andersca 2011-01-18 10:11:21 -0800 Committed r76034: <http://trac.webkit.org/changeset/76034> 79289 2011-01-18 09:55:13 -0800 2011-01-18 10:00:53 -0800 Patch bug-52635-20110118095511.patch text/plain 13445 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2MDMxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNTggQEAKKzIwMTEtMDEtMTggIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBQbHVnLWluIGhvc3RpbmcgV2ViUHJvY2VzcyBpbnN0YW5j ZXMgYXBwZWFyIGluIEFjdGl2aXR5IE1vbml0b3IgYXMgV2ViUHJvY2VzcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI2MzUKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg3MzEzMzc+CisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nl c3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzOjppbml0aWFsaXplKToKKyAg ICAgICAgQ2FsbCBwbGF0Zm9ybUluaXRpYWxpemUuCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNz L1BsdWdpblByb2Nlc3MuaDoKKyAgICAgICAgQWRkIHBsYXRmb3JtSW5pdGlhbGl6ZS4KKworICAg ICAgICAqIFBsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWMubW06CisgICAgICAgIChX ZWJLaXQ6OlBsdWdpblByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZSk6CisgICAgICAgIFNldCB0 aGUgY29tcG9zaXRpbmcgcmVuZGVyIHNlcnZlciBwb3J0IGFuZCB0aGUgdmlzaWJsZSBhcHBsaWNh dGlvbiBuYW1lLgorCisgICAgICAgICogU2hhcmVkL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3NDcmVhdGlv blBhcmFtZXRlcnM6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgIEVuY29kZS9kZWNvZGUgdGhlIHBhcmVu dCBwcm9jZXNzIG5hbWUuCisKKyAgICAgICAgKiBTaGFyZWQvUGx1Z2lucy9QbHVnaW5Qcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgIEFkZCBwYXJlbnRQcm9jZXNzTmFtZS4KKwor ICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAg ICAgRW5jb2RlL2RlY29kZSB0aGUgcGFyZW50IHByb2Nlc3MgbmFtZS4KKworICAgICAgICAqIFNo YXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgIEFkZCBwYXJlbnRQ cm9jZXNzTmFtZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xh dW5jaGVyTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzTGF1bmNoZXI6OmxhdW5jaFBy b2Nlc3MpOgorICAgICAgICBEb24ndCBwYXNzIHRoZSBwYXJlbnQgcHJvY2VzcyBuYW1lIGhlcmUu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luUHJvY2Vzc1Byb3h5TWFj Lm1tOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzUHJveHk6OnBsYXRmb3JtSW5pdGlh bGl6ZVBsdWdpblByb2Nlc3MpOgorICAgICAgICBTZXQgdGhlIHZpc2libGUgbmFtZS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6 V2ViQ29udGV4dDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIFBhc3Mg YWxvbmcgdGhlIHBhcmVudCBwcm9jZXNzIG5hbWUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL21h Yy9XZWJQcm9jZXNzTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9y bUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgU2V0IHRoZSB2aXNpYmxlIG5hbWUuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNzTWFpbk1hYy5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzc01haW4pOgorICAgICAgICBEb24ndCBzZXQgdGhlIHZpc2libGUg bmFtZSBoZXJlLiBJdCdzIGRvbmUgaW4gcGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcy4KKwog MjAxMS0wMS0xOCAgQmFsYXpzIEtlbGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQ3NhYmEgT3N6dHJvZ29uw6FjLgpJbmRleDogU291cmNlL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MuY3BwCShyZXZpc2lvbiA3NjAyOSkKKysr IFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTExNSw5ICsxMTUsNyBAQCB2b2lkIFBsdWdpblByb2Nlc3M6OmluaXRpYWxpemUo Y29uc3QgUGx1CiAKICAgICBtX3BsdWdpblBhdGggPSBwYXJhbWV0ZXJzLnBsdWdpblBhdGg7CiAK LSNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmIFBMQVRGT1JNKE1BQykKLSAgICBt X2NvbXBvc2l0aW5nUmVuZGVyU2VydmVyUG9ydCA9IHBhcmFtZXRlcnMuYWNjZWxlcmF0ZWRDb21w b3NpdGluZ1BvcnQucG9ydCgpOwotI2VuZGlmCisgICAgcGxhdGZvcm1Jbml0aWFsaXplKHBhcmFt ZXRlcnMpOwogfQogCiB2b2lkIFBsdWdpblByb2Nlc3M6OmNyZWF0ZVdlYlByb2Nlc3NDb25uZWN0 aW9uKCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vz cy5oCShyZXZpc2lvbiA3NjAyOSkKKysrIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1 Z2luUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC03Miw2ICs3Miw4IEBAIHByaXZhdGU6CiAg ICAgCiAgICAgdm9pZCBzaHV0ZG93blRpbWVyRmlyZWQoKTsKIAorICAgIHZvaWQgcGxhdGZvcm1J bml0aWFsaXplKGNvbnN0IFBsdWdpblByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmKTsKKwogICAg IC8vIFRoZSBjb25uZWN0aW9uIHRvIHRoZSBVSSBwcm9jZXNzLgogICAgIFJlZlB0cjxDb3JlSVBD OjpDb25uZWN0aW9uPiBtX2Nvbm5lY3Rpb247CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsdWdp blByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01hYy5tbQkocmV2aXNpb24gNzYw MjkpCisrKyBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Qcm9jZXNzTWFj Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNCwxMSArMjQsMTYgQEAKICAqLwogCiAjaWYgRU5BQkxF KFBMVUdJTl9QUk9DRVNTKQorCisvLyBGSVhNRSAoV2ViS2l0MikgPHJkYXI6Ly9wcm9ibGVtLzg3 Mjg4NjA+IFdlYktpdDIgbmVlZHMgdG8gYmUgbG9jYWxpemVkCisjZGVmaW5lIFVJX1NUUklORyhf X3N0ciwgX19kZXNjKSBbTlNTdHJpbmcgc3RyaW5nV2l0aFVURjhTdHJpbmc6X19zdHJdCiAgCiAj aW5jbHVkZSAiUGx1Z2luUHJvY2Vzcy5oIgogCiAjaW5jbHVkZSAiTmV0c2NhcGVQbHVnaW4uaCIK ICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzU2hpbS5oIgorI2luY2x1ZGUgIlBsdWdpblByb2Nlc3ND cmVhdGlvblBhcmFtZXRlcnMuaCIKKyNpbmNsdWRlIDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4K ICNpbmNsdWRlIDxkbGZjbi5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTc4LDEyICs4Mywy NSBAQCB2b2lkIFBsdWdpblByb2Nlc3M6OmluaXRpYWxpemVTaGltKCkKICAgICAgICAgc2hvdWxk Q2FsbFJlYWxEZWJ1Z2dlciwKICAgICAgICAgaXNXaW5kb3dBY3RpdmUsCiAgICAgICAgIGdldEN1 cnJlbnRFdmVudEJ1dHRvblN0YXRlCi0gICAgfTsKLQorICAgIH07ICAgICAgCisgICAgCiAgICAg UGx1Z2luUHJvY2Vzc1NoaW1Jbml0aWFsaXplRnVuYyBpbml0RnVuYyA9IHJlaW50ZXJwcmV0X2Nh c3Q8UGx1Z2luUHJvY2Vzc1NoaW1Jbml0aWFsaXplRnVuYz4oZGxzeW0oUlRMRF9ERUZBVUxULCAi V2ViS2l0UGx1Z2luUHJvY2Vzc1NoaW1Jbml0aWFsaXplIikpOwogICAgIGluaXRGdW5jKGNhbGxi YWNrcyk7CiB9CiAKK3ZvaWQgUGx1Z2luUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplKGNvbnN0 IFBsdWdpblByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCit7CisgICAgbV9j b21wb3NpdGluZ1JlbmRlclNlcnZlclBvcnQgPSBwYXJhbWV0ZXJzLmFjY2VsZXJhdGVkQ29tcG9z aXRpbmdQb3J0LnBvcnQoKTsKKworICAgIE5TU3RyaW5nICphcHBsaWNhdGlvbk5hbWUgPSBbTlNT dHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpVSV9TVFJJTkcoIiVAICglQCBJbnRlcm5ldCBwbHVnLWlu KSIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAidmlzaWJsZSBuYW1lIG9mIHRoZSBwbHVnLWluIGhvc3QgcHJvY2Vz cy4gVGhlIGZpcnN0IGFyZ3VtZW50IGlzIHRoZSBwbHVnLWluIG5hbWUgIgorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ImFuZCB0aGUgc2Vjb25kIGFyZ3VtZW50IGlzIHRoZSBhcHBsaWNhdGlvbiBuYW1lLiIpLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgW1soTlNTdHJpbmcqKXBhcmFtZXRlcnMucGx1 Z2luUGF0aCBsYXN0UGF0aENvbXBvbmVudF0gc3RyaW5nQnlEZWxldGluZ1BhdGhFeHRlbnNpb25d LCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChOU1N0cmluZyAqKXBhcmFtZXRl cnMucGFyZW50UHJvY2Vzc05hbWVdOworICAgIAorICAgIFdLU2V0VmlzaWJsZUFwcGxpY2F0aW9u TmFtZSgoQ0ZTdHJpbmdSZWYpYXBwbGljYXRpb25OYW1lKTsKK30KKwogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CiAKICNlbmRpZiAvLyBFTkFCTEUoUExVR0lOX1BST0NFU1MpCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMu Y3BwCShyZXZpc2lvbiA3NjAyOSkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTYsNiArNTYsNyBAQCB2 b2lkIFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kCiAgICAgZW5jb2Rlci0+ZW5j b2RlKGxhbmd1YWdlQ29kZSk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKHRleHRDaGVja2VyU3RhdGUp OwogI2lmIFBMQVRGT1JNKE1BQykKKyAgICBlbmNvZGVyLT5lbmNvZGUocGFyZW50UHJvY2Vzc05h bWUpOwogICAgIGVuY29kZXItPmVuY29kZShwcmVzZW50ZXJBcHBsaWNhdGlvblBpZCk7CiAgICAg ZW5jb2Rlci0+ZW5jb2RlKG5zVVJMQ2FjaGVQYXRoKTsKICAgICBlbmNvZGVyLT5lbmNvZGUobnNV UkxDYWNoZU1lbW9yeUNhcGFjaXR5KTsKQEAgLTk1LDYgKzk2LDggQEAgYm9vbCBXZWJQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICNpZiBQ TEFURk9STShNQUMpCisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocGFyYW1ldGVycy5wYXJlbnRQ cm9jZXNzTmFtZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29kZXItPmRl Y29kZShwYXJhbWV0ZXJzLnByZXNlbnRlckFwcGxpY2F0aW9uUGlkKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMubnNVUkxDYWNoZVBh dGgpKQpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFt ZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiA3NjAyOSkKKysrIFNvdXJjZS9XZWJLaXQyL1No YXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTcz LDYgKzczLDggQEAgc3RydWN0IFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgewogICAgIFRl eHRDaGVja2VyU3RhdGUgdGV4dENoZWNrZXJTdGF0ZTsKIAogI2lmIFBMQVRGT1JNKE1BQykKKyAg ICBTdHJpbmcgcGFyZW50UHJvY2Vzc05hbWU7CisKICAgICBwaWRfdCBwcmVzZW50ZXJBcHBsaWNh dGlvblBpZDsKICAgICBDU3RyaW5nIG5zVVJMQ2FjaGVQYXRoOwogCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9QbHVnaW5Qcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gNzYwMjkpCisrKyBTb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDAsNiArNDAsNyBAQCB2b2lkIFBsdWdpblByb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnM6OmVuCiAgICAgZW5jb2Rlci0+ZW5jb2RlKHBsdWdpblBhdGgpOwogCiAjaWYgUExB VEZPUk0oTUFDKQorICAgIGVuY29kZXItPmVuY29kZShwYXJlbnRQcm9jZXNzTmFtZSk7CiAgICAg ZW5jb2Rlci0+ZW5jb2RlKGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdQb3J0KTsKICNlbmRpZgogfQpA QCAtNTAsNiArNTEsOCBAQCBib29sIFBsdWdpblByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRl CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogI2lmIFBMQVRGT1JNKE1BQykKKyAgICBpZiAoIWRl Y29kZXItPmRlY29kZShyZXN1bHQucGFyZW50UHJvY2Vzc05hbWUpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocmVzdWx0LmFjY2VsZXJhdGVkQ29tcG9z aXRpbmdQb3J0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvUGx1Z2luUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiA3NjAyOSkKKysrIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9QbHVnaW5zL1BsdWdpblByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2lu ZyBjb3B5KQpAQCAtNTAsNiArNTAsNyBAQCBzdHJ1Y3QgUGx1Z2luUHJvY2Vzc0NyZWF0aW9uUGFy YW1ldGVycyB7CiAgICAgU3RyaW5nIHBsdWdpblBhdGg7CiAKICNpZiBQTEFURk9STShNQUMpCisg ICAgU3RyaW5nIHBhcmVudFByb2Nlc3NOYW1lOwogICAgIENvcmVJUEM6Ok1hY2hQb3J0IGFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdQb3J0OwogI2VuZGlmCiB9OwpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0xhdW5jaGVyL21hYy9Qcm9jZXNzTGF1bmNoZXJNYWMubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL21hYy9Qcm9jZXNzTGF1bmNoZXJN YWMubW0JKHJldmlzaW9uIDc2MDI5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5j aGVyL21hYy9Qcm9jZXNzTGF1bmNoZXJNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ5LDMyICs0 OSw2IEBAIGV4dGVybiAiQyIga2Vybl9yZXR1cm5fdCBib290c3RyYXBfcmVnaXMKIAogbmFtZXNw YWNlIFdlYktpdCB7CiAKLSNpZiAhZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKSAmJiAhZGVm aW5lZChCVUlMRElOR19PTl9TTk9XX0xFT1BBUkQpCi1zdGF0aWMgY29uc3QgY2hhciogcHJvY2Vz c05hbWUoKQotewotICAgIHJldHVybiBbW1tOU1Byb2Nlc3NJbmZvIHByb2Nlc3NJbmZvXSBwcm9j ZXNzTmFtZV0gZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uXTsKLX0KLSNlbHNlCi0vLyAtW05TUHJv Y2Vzc0luZm8gcHJvY2Vzc05hbWVdIGlzbid0IHRocmVhZC1zYWZlIG9uIExlb3BhcmQgYW5kIFNu b3cgTGVvcGFyZCBzbyB3ZSBoYXZlIG91ciBvd24gaW1wbGVtZW50YXRpb24uCi1zdGF0aWMgY29u c3QgY2hhciogY3JlYXRlUHJvY2Vzc05hbWUoKQotewotICAgIHVpbnQzMl90IGJ1ZmZlclNpemUg PSBNQVhQQVRITEVOOwotICAgIGNoYXIgZXhlY3V0YWJsZVBhdGhbYnVmZmVyU2l6ZV07Ci0gICAg Ci0gICAgaWYgKF9OU0dldEV4ZWN1dGFibGVQYXRoKGV4ZWN1dGFibGVQYXRoLCAmYnVmZmVyU2l6 ZSkpCi0gICAgICAgIHJldHVybiAiIjsKLSAgICAKLSAgICBjb25zdCBjaGFyICpwcm9jZXNzTmFt ZSA9IHN0cnJjaHIoZXhlY3V0YWJsZVBhdGgsICcvJykgKyAxOwotICAgIHJldHVybiBzdHJkdXAo cHJvY2Vzc05hbWUpOwotfQotCi1zdGF0aWMgY29uc3QgY2hhciogcHJvY2Vzc05hbWUoKQotewot ICAgIHN0YXRpYyBjb25zdCBjaGFyKiBwcm9jZXNzTmFtZSA9IGNyZWF0ZVByb2Nlc3NOYW1lKCk7 Ci0gICAgcmV0dXJuIHByb2Nlc3NOYW1lOwotfQotI2VuZGlmCi0KIHN0YXRpYyB2b2lkIHNldFVw VGVybWluYXRpb25Ob3RpZmljYXRpb25IYW5kbGVyKHBpZF90IHBpZCkKIHsKICNpZiBIQVZFKERJ U1BBVENIX0gpCkBAIC0yMjYsNyArMjAwLDcgQEAgdm9pZCBQcm9jZXNzTGF1bmNoZXI6OmxhdW5j aFByb2Nlc3MoKQogICAgIENTdHJpbmcgc2VydmljZU5hbWUgPSBTdHJpbmc6OmZvcm1hdCgiY29t LmFwcGxlLldlYktpdC5XZWJQcm9jZXNzLSVkLSVwIiwgZ2V0cGlkKCksIHRoaXMpLnV0ZjgoKTsK IAogICAgIGNvbnN0IGNoYXIqIHBhdGggPSBbd2ViUHJvY2Vzc0FwcEV4ZWN1dGFibGVQYXRoIGZp bGVTeXN0ZW1SZXByZXNlbnRhdGlvbl07Ci0gICAgY29uc3QgY2hhciogYXJnc1tdID0geyBwYXRo LCBidW5kbGVQYXRoLCAiLXR5cGUiLCBwcm9jZXNzVHlwZUFzU3RyaW5nKG1fbGF1bmNoT3B0aW9u cy5wcm9jZXNzVHlwZSksICItc2VydmljZW5hbWUiLCBzZXJ2aWNlTmFtZS5kYXRhKCksICItcGFy ZW50cHJvY2Vzc25hbWUiLCBwcm9jZXNzTmFtZSgpLCAwIH07CisgICAgY29uc3QgY2hhciogYXJn c1tdID0geyBwYXRoLCBidW5kbGVQYXRoLCAiLXR5cGUiLCBwcm9jZXNzVHlwZUFzU3RyaW5nKG1f bGF1bmNoT3B0aW9ucy5wcm9jZXNzVHlwZSksICItc2VydmljZW5hbWUiLCBzZXJ2aWNlTmFtZS5k YXRhKCksIDAgfTsKIAogICAgIC8vIFJlZ2lzdGVyIG91cnNlbHZlcy4KICAgICBrZXJuX3JldHVy bl90IGtyID0gYm9vdHN0cmFwX3JlZ2lzdGVyMihib290c3RyYXBfcG9ydCwgY29uc3RfY2FzdDxj aGFyKj4oc2VydmljZU5hbWUuZGF0YSgpKSwgbGlzdGVuaW5nUG9ydCwgMCk7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luUHJvY2Vzc1Byb3h5TWFjLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVn aW5Qcm9jZXNzUHJveHlNYWMubW0JKHJldmlzaW9uIDc2MDI5KQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpblByb2Nlc3NQcm94eU1hYy5tbQkod29ya2luZyBj b3B5KQpAQCAtMzUsNiArMzUsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIHZvaWQgUGx1Z2luUHJv Y2Vzc1Byb3h5OjpwbGF0Zm9ybUluaXRpYWxpemVQbHVnaW5Qcm9jZXNzKFBsdWdpblByb2Nlc3ND cmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NP TVBPU0lUSU5HKSAmJiBIQVZFKEhPU1RFRF9DT1JFX0FOSU1BVElPTikKKyAgICBwYXJhbWV0ZXJz LnBhcmVudFByb2Nlc3NOYW1lID0gW1tOU1Byb2Nlc3NJbmZvIHByb2Nlc3NJbmZvXSBwcm9jZXNz TmFtZV07CiAgICAgbWFjaF9wb3J0X3QgcmVuZGVyU2VydmVyUG9ydCA9IFdLSW5pdGlhbGl6ZVJl bmRlclNlcnZlcigpOwogICAgIGlmIChyZW5kZXJTZXJ2ZXJQb3J0ICE9IE1BQ0hfUE9SVF9OVUxM KQogICAgICAgICBwYXJhbWV0ZXJzLmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdQb3J0ID0gQ29yZUlQ Qzo6TWFjaFBvcnQocmVuZGVyU2VydmVyUG9ydCwgTUFDSF9NU0dfVFlQRV9DT1BZX1NFTkQpOwpJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1hYy5tbQko cmV2aXNpb24gNzYwMjkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRl eHRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTc0LDcgKzc0LDggQEAgdm9pZCBXZWJDb250ZXh0 OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgICAgICBjYWNoZVBhdGggPSByZWludGVycHJl dF9jYXN0PENGU3RyaW5nUmVmPihOU0hvbWVEaXJlY3RvcnkoKSk7CiAKICAgICBOU1VSTENhY2hl ICp1cmxDYWNoZSA9IFtOU1VSTENhY2hlIHNoYXJlZFVSTENhY2hlXTsKLSAgICAKKworICAgIHBh cmFtZXRlcnMucGFyZW50UHJvY2Vzc05hbWUgPSBbW05TUHJvY2Vzc0luZm8gcHJvY2Vzc0luZm9d IHByb2Nlc3NOYW1lXTsgICAgCiAgICAgcGFyYW1ldGVycy5uc1VSTENhY2hlUGF0aCA9IGZpbGVT eXN0ZW1SZXByZXNlbnRhdGlvbihbKE5TU3RyaW5nICopY2FjaGVQYXRoLmdldCgpIHN0cmluZ0J5 U3RhbmRhcmRpemluZ1BhdGhdKTsKICAgICBwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVNZW1vcnlDYXBh Y2l0eSA9IFt1cmxDYWNoZSBtZW1vcnlDYXBhY2l0eV07CiAgICAgcGFyYW1ldGVycy5uc1VSTENh Y2hlRGlza0NhcGFjaXR5ID0gW3VybENhY2hlIGRpc2tDYXBhY2l0eV07CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNzTWFjLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWMubW0JKHJldmlzaW9uIDc2 MDI5KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01hYy5tbQko d29ya2luZyBjb3B5KQpAQCAtMTUxLDYgKzE1MSwxMiBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRm b3JtSW5pdGlhbGl6ZVdlYlByCiB7CiAgICAgaW5pdGlhbGl6ZVNhbmRib3gocGFyYW1ldGVycyk7 CiAKKyAgICBpZiAoIXBhcmFtZXRlcnMucGFyZW50UHJvY2Vzc05hbWUuaXNOdWxsKCkpIHsKKyAg ICAgICAgLy8gRklYTUUgKFdlYktpdDIpIDxyZGFyOi8vcHJvYmxlbS84NzI4ODYwPiBXZWJLaXQy IG5lZWRzIHRvIGJlIGxvY2FsaXplZAorICAgICAgICBOU1N0cmluZyAqYXBwbGljYXRpb25OYW1l ID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCIlQCBXZWIgQ29udGVudCIsIChOU1N0cmlu ZyAqKXBhcmFtZXRlcnMucGFyZW50UHJvY2Vzc05hbWVdOworICAgICAgICBXS1NldFZpc2libGVB cHBsaWNhdGlvbk5hbWUoKENGU3RyaW5nUmVmKWFwcGxpY2F0aW9uTmFtZSk7CisgICAgfQorCiAg ICAgaWYgKCFwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVQYXRoLmlzTnVsbCgpKSB7CiAgICAgICAgIE5T VUludGVnZXIgY2FjaGVNZW1vcnlDYXBhY2l0eSA9IHBhcmFtZXRlcnMubnNVUkxDYWNoZU1lbW9y eUNhcGFjaXR5OwogICAgICAgICBOU1VJbnRlZ2VyIGNhY2hlRGlza0NhcGFjaXR5ID0gcGFyYW1l dGVycy5uc1VSTENhY2hlRGlza0NhcGFjaXR5OwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9tYWMvV2ViUHJvY2Vzc01haW5NYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01haW5NYWMubW0JKHJldmlzaW9uIDc2MDI5KQor KysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01haW5NYWMubW0JKHdv cmtpbmcgY29weSkKQEAgLTgwLDE0ICs4MCw2IEBAIGludCBXZWJQcm9jZXNzTWFpbihjb25zdCBD b21tYW5kTGluZSYgY28KICAgICBXVEY6OmluaXRpYWxpemVNYWluVGhyZWFkKCk7CiAgICAgUnVu TG9vcDo6aW5pdGlhbGl6ZU1haW5SdW5Mb29wKCk7CiAKLSAgICAvLyBTZXQgdGhlIHZpc2libGUg YXBwbGljYXRpb24gbmFtZS4KLSAgICBTdHJpbmcgcGFyZW50UHJvY2Vzc05hbWUgPSBjb21tYW5k TGluZVsicGFyZW50cHJvY2Vzc25hbWUiXTsKLSAgICBpZiAoIXBhcmVudFByb2Nlc3NOYW1lLmlz TnVsbCgpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBMb2NhbGl6YXRpb24hCi0gICAgICAgIE5TU3Ry aW5nICphcHBsaWNhdGlvbk5hbWUgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIiVAIFdl YiBDb250ZW50IiwgKE5TU3RyaW5nICopcGFyZW50UHJvY2Vzc05hbWVdOwotICAgICAgICBXS1Nl dFZpc2libGVBcHBsaWNhdGlvbk5hbWUoKENGU3RyaW5nUmVmKWFwcGxpY2F0aW9uTmFtZSk7Ci0g ICAgfQotCiAgICAgLy8gQ3JlYXRlIHRoZSBjb25uZWN0aW9uLgogICAgIFdlYlByb2Nlc3M6OnNo YXJlZCgpLmluaXRpYWxpemUoc2VydmVyUG9ydCwgUnVuTG9vcDo6bWFpbigpKTsKIAo=