57204 2011-03-27 22:51:41 -0700 Create a plug-in's MIME types preferences plist if it doesn't exist. 2011-05-09 17:21:22 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 57205 1 aestes andersca abarth aestes andersca eric webkit.review.bot oldest_to_newest 374284 0 aestes 2011-03-27 22:51:41 -0700 If a plug-in stores its MIME type information in a plist in ~/Library/Preferences/ but the plist doesn't yet exist, WebKit2 needs to load the plug-in bundle and call createPluginMIMETypesPreferences to have the file created. 374285 1 aestes 2011-03-27 22:52:22 -0700 <rdar://problem/9195048> 400822 2 92866 andersca 2011-05-09 15:36:24 -0700 Created attachment 92866 Patch 400826 3 92866 sam 2011-05-09 15:38:53 -0700 Comment on attachment 92866 Patch :( r=me 400843 4 andersca 2011-05-09 15:49:49 -0700 Committed r86097: <http://trac.webkit.org/changeset/86097> 400921 5 webkit.review.bot 2011-05-09 17:21:22 -0700 http://trac.webkit.org/changeset/86097 might have broken GTK Linux 64-bit Debug 92866 2011-05-09 15:36:24 -0700 2011-05-09 15:38:53 -0700 Patch bug-57204-20110509153623.patch text/plain 12919 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MDk0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDUtMDkgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDcmVhdGUgYSBwbHVnLWluJ3MgTUlNRSB0eXBlcyBwcmVm ZXJlbmNlcyBwbGlzdCBpZiBpdCBkb2Vzbid0IGV4aXN0LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcyMDQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzkxOTUwNDg+CisKKyAgICAgICAgU3Bhd24gYSBwbHVnLWluIHByb2Nlc3MgYW5kIGxldCBpdCBj cmVhdGUgdGhlIHBsaXN0LiBGb3Igbm93LCB3ZSdsbCBkbyB0aGlzIG9uIHRoZQorICAgICAgICBt YWluIHRocmVhZCBzaW5jZSBpdCdzIGEgcmFyZSBvbmUtdGltZSBjb21wdXRhdGlvbiBhbmQgd2Ug aGF2ZSBhbiBBUEkgZnVuY3Rpb24sCisgICAgICAgIFdLRnJhbWVDYW5TaG93TUlNRVR5cGUsIHdo aWNoIHdvdWxkIGhhdmUgdG8gYmxvY2sgYW55d2F5LgorCisgICAgICAgICogUGx1Z2luUHJvY2Vz cy9tYWMvUGx1Z2luUHJvY2Vzc01haW5NYWMubW06CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblBy b2Nlc3NNYWluKToKKyAgICAgICAgSWYgLWNyZWF0ZVBsdWdpbk1JTUVUeXBlc1ByZWZlcmVuY2Vz IGlzIG9uZSBvZiB0aGUgY29tbWFuZCBsaW5lIGFyZ3VtZW50IGtleXMsCisgICAgICAgIHRoZSBw bHVnLWluIHBhdGggd2lsbCBiZSB0aGUgYXJndW1lbnQgdmFsdWUuIENhbGwgTmV0c2NhcGVQbHVn aW5Nb2R1bGU6OmNyZWF0ZVBsdWdpbk1JTUVUeXBlc1ByZWZlcmVuY2VzCisgICAgICAgIHRvIGNy ZWF0ZSB0aGUgcHJlZmVyZW5jZXMgZmlsZSBhbmQgdGhlbiBleGl0LgorCisgICAgICAgICogU2hh cmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTW9kdWxlTWFjLm1tOgorICAg ICAgICAoV2ViS2l0Ojpjb250ZW50c09mUHJvcGVydHlMaXN0QXRVUkwpOgorICAgICAgICBNb3Zl IGNvZGUgdG8gcmVhZCBhIHByb3BlcnR5IGxpc3Qgb3V0IGludG8gYSBoZWxwZXIgZnVuY3Rpb24u CisKKyAgICAgICAgKFdlYktpdDo6Z2V0TUlNRVR5cGVzRnJvbVBsdWdpbkJ1bmRsZSk6CisgICAg ICAgIElmIHRoZXJlJ3Mgbm8gcHJvcGVydHkgbGlzdCBmaWxlLCB0cnkgdG8gY3JlYXRlIG9uZS4K KworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbk1vZHVsZTo6Y3JlYXRlUGx1Z2luTUlN RVR5cGVzUHJlZmVyZW5jZXMpOgorICAgICAgICBMb2FkIHRoZSBwbHVnLWluLCBmaW5kIHRoZSBC UF9DcmVhdGVQbHVnaW5NSU1FVHlwZXNQcmVmZXJlbmNlcyBhbmQgY2FsbCBpdC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5Qcm9jZXNzUHJveHlNYWMubW06CisgICAg ICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3NQcm94eTo6Y3JlYXRlUHJvcGVydHlMaXN0RmlsZSk6 CisgICAgICAgIFNwYXduIGEgcGx1Zy1pbiBwcm9jZXNzIGFuZCBwYXNzIHRoZSAtY3JlYXRlUGx1 Z2luTUlNRVR5cGVzUHJlZmVyZW5jZXMgZmxhZyB0byBpdCBhbmQgdGhlbiB3YWl0CisgICAgICAg IGZvciBpdCB0byBleGl0LgorCiAyMDExLTA1LTA5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWluTWFjLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nl c3NNYWluTWFjLm1tCShyZXZpc2lvbiA4NjA4MikKKysrIFNvdXJjZS9XZWJLaXQyL1BsdWdpblBy b2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWluTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2 ICsyOSw3IEBACiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQogCiAjaW1wb3J0ICJDb21tYW5k TGluZS5oIgorI2ltcG9ydCAiTmV0c2NhcGVQbHVnaW5Nb2R1bGUuaCIKICNpbXBvcnQgIlBsdWdp blByb2Nlc3MuaCIKICNpbXBvcnQgIlJ1bkxvb3AuaCIKICNpbXBvcnQgPFdlYktpdFN5c3RlbUlu dGVyZmFjZS5oPgpAQCAtNTQsNiArNTUsMTggQEAgaW50IFBsdWdpblByb2Nlc3NNYWluKGNvbnN0 IENvbW1hbmRMaW5lJgogICAgIC8vIGJ5IGFueSBjaGlsZCBwcm9jZXNzZXMgdGhhdCB0aGUgcGx1 Zy1pbiBtYXkgbGF1bmNoLgogICAgIHVuc2V0ZW52KCJEWUxEX0lOU0VSVF9MSUJSQVJJRVMiKTsK IAorICAgIC8vIENoZWNrIGlmIHdlJ3JlIGJlaW5nIHNwYXduZWQgdG8gd3JpdGUgYSBNSU1FIHR5 cGUgcHJlZmVyZW5jZXMgZmlsZS4KKyAgICBTdHJpbmcgcGx1Z2luUGF0aCA9IGNvbW1hbmRMaW5l WyJjcmVhdGVQbHVnaW5NSU1FVHlwZXNQcmVmZXJlbmNlcyJdOworICAgIGlmICghcGx1Z2luUGF0 aC5pc0VtcHR5KCkpIHsKKyAgICAgICAgSlNDOjppbml0aWFsaXplVGhyZWFkaW5nKCk7CisgICAg ICAgIFdURjo6aW5pdGlhbGl6ZU1haW5UaHJlYWQoKTsKKworICAgICAgICBpZiAoIU5ldHNjYXBl UGx1Z2luTW9kdWxlOjpjcmVhdGVQbHVnaW5NSU1FVHlwZXNQcmVmZXJlbmNlcyhwbHVnaW5QYXRo KSkKKyAgICAgICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CisKKyAgICAgICAgcmV0dXJuIEVY SVRfU1VDQ0VTUzsKKyAgICB9CisKICAgICBTdHJpbmcgc2VydmljZU5hbWUgPSBjb21tYW5kTGlu ZVsic2VydmljZW5hbWUiXTsKICAgICBpZiAoc2VydmljZU5hbWUuaXNFbXB0eSgpKQogICAgICAg ICByZXR1cm4gRVhJVF9GQUlMVVJFOwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5Nb2R1bGUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbk1vZHVsZS5oCShy ZXZpc2lvbiA4NjA4MikKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBl L05ldHNjYXBlUGx1Z2luTW9kdWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDEwIEBA IHB1YmxpYzoKIAogICAgIE1vZHVsZSogbW9kdWxlKCkgY29uc3QgeyByZXR1cm4gbV9tb2R1bGUu Z2V0KCk7IH0KIAorI2lmIFBMVUdJTl9BUkNISVRFQ1RVUkUoTUFDKQorICAgIHN0YXRpYyBib29s IGNyZWF0ZVBsdWdpbk1JTUVUeXBlc1ByZWZlcmVuY2VzKGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0 aCk7CisjZW5kaWYKKwogcHJpdmF0ZToKICAgICBleHBsaWNpdCBOZXRzY2FwZVBsdWdpbk1vZHVs ZShjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5Nb2R1bGVNYWMubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNj YXBlUGx1Z2luTW9kdWxlTWFjLm1tCShyZXZpc2lvbiA4NjA4MikKKysrIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbQko d29ya2luZyBjb3B5KQpAQCAtMjYsOSArMjYsMTEgQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2lt cG9ydCAiTmV0c2NhcGVQbHVnaW5Nb2R1bGUuaCIKIAorI2ltcG9ydCAiUGx1Z2luUHJvY2Vzc1By b3h5LmgiCiAjaW1wb3J0IDxXZWJDb3JlL1dlYkNvcmVOU1N0cmluZ0V4dHJhcy5oPgogI2ltcG9y dCA8d3RmL0hhc2hTZXQuaD4KIAorCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNw YWNlIFdlYktpdCB7CkBAIC04NiwyNiArODgsNDQgQEAgc3RhdGljIGJvb2wgZ2V0UGx1Z2luQXJj aGl0ZWN0dXJlKENGQnVuZAogCiAgICAgcmV0dXJuIGZhbHNlOwogfQotICAgIAotc3RhdGljIFJl dGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+IGdldE1JTUVUeXBlc0Zyb21QbHVnaW5CdW5kbGUoQ0ZC dW5kbGVSZWYgYnVuZGxlKQorCitzdGF0aWMgUmV0YWluUHRyPENGRGljdGlvbmFyeVJlZj4gY29u dGVudHNPZlByb3BlcnR5TGlzdEF0VVJMKENGVVJMUmVmIHByb3BlcnR5TGlzdFVSTCkKK3sKKyAg ICBDRkRhdGFSZWYgcHJvcGVydHlMaXN0RGF0YTsKKyAgICBDRlVSTENyZWF0ZURhdGFBbmRQcm9w ZXJ0aWVzRnJvbVJlc291cmNlKGtDRkFsbG9jYXRvckRlZmF1bHQsIHByb3BlcnR5TGlzdFVSTCwg JnByb3BlcnR5TGlzdERhdGEsIDAsIDAsIDApOworICAgIGlmICghcHJvcGVydHlMaXN0RGF0YSkK KyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBSZXRhaW5QdHI8Q0ZQcm9wZXJ0eUxpc3RSZWY+IHBy b3BlcnR5TGlzdChBZG9wdENGLCBDRlByb3BlcnR5TGlzdENyZWF0ZVdpdGhEYXRhKGtDRkFsbG9j YXRvckRlZmF1bHQsIHByb3BlcnR5TGlzdERhdGEsIGtDRlByb3BlcnR5TGlzdEltbXV0YWJsZSwg MCwgMCkpOworICAgIENGUmVsZWFzZShwcm9wZXJ0eUxpc3REYXRhKTsKKworICAgIGlmICghcHJv cGVydHlMaXN0KQorICAgICAgICByZXR1cm4gMDsKKworICAgIGlmIChDRkdldFR5cGVJRChwcm9w ZXJ0eUxpc3QuZ2V0KCkpICE9IENGRGljdGlvbmFyeUdldFR5cGVJRCgpKQorICAgICAgICByZXR1 cm4gMDsKKworICAgIHJldHVybiBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPihBZG9wdENGLCBz dGF0aWNfY2FzdDxDRkRpY3Rpb25hcnlSZWY+KHByb3BlcnR5TGlzdC5sZWFrUmVmKCkpKTsKK30K Kworc3RhdGljIFJldGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+IGdldE1JTUVUeXBlc0Zyb21QbHVn aW5CdW5kbGUoQ0ZCdW5kbGVSZWYgYnVuZGxlLCBjb25zdCBQbHVnaW5JbmZvU3RvcmU6OlBsdWdp biYgcGx1Z2luKQogewogICAgIENGU3RyaW5nUmVmIHByb3BlcnR5TGlzdEZpbGVuYW1lID0gc3Rh dGljX2Nhc3Q8Q0ZTdHJpbmdSZWY+KENGQnVuZGxlR2V0VmFsdWVGb3JJbmZvRGljdGlvbmFyeUtl eShidW5kbGUsIENGU1RSKCJXZWJQbHVnaW5NSU1FVHlwZXNGaWxlbmFtZSIpKSk7CiAgICAgaWYg KHByb3BlcnR5TGlzdEZpbGVuYW1lKSB7CiAgICAgICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4g cHJvcGVydHlMaXN0UGF0aChBZG9wdENGLCBDRlN0cmluZ0NyZWF0ZVdpdGhGb3JtYXQoa0NGQWxs b2NhdG9yRGVmYXVsdCwgMCwgQ0ZTVFIoIiVAL0xpYnJhcnkvUHJlZmVyZW5jZXMvJUAiKSwgTlNI b21lRGlyZWN0b3J5KCksIHByb3BlcnR5TGlzdEZpbGVuYW1lKSk7CiAgICAgICAgIFJldGFpblB0 cjxDRlVSTFJlZj4gcHJvcGVydHlMaXN0VVJMKEFkb3B0Q0YsIENGVVJMQ3JlYXRlV2l0aEZpbGVT eXN0ZW1QYXRoKGtDRkFsbG9jYXRvckRlZmF1bHQsIHByb3BlcnR5TGlzdFBhdGguZ2V0KCksIGtD RlVSTFBPU0lYUGF0aFN0eWxlLCBGQUxTRSkpOwogCi0gICAgICAgIENGRGF0YVJlZiBwcm9wZXJ0 eUxpc3REYXRhOwotICAgICAgICBDRlVSTENyZWF0ZURhdGFBbmRQcm9wZXJ0aWVzRnJvbVJlc291 cmNlKGtDRkFsbG9jYXRvckRlZmF1bHQsIHByb3BlcnR5TGlzdFVSTC5nZXQoKSwgJnByb3BlcnR5 TGlzdERhdGEsIDAsIDAsIDApOwotICAgICAgICBSZXRhaW5QdHI8Q0ZQcm9wZXJ0eUxpc3RSZWY+ IHByb3BlcnR5TGlzdChBZG9wdENGLCBDRlByb3BlcnR5TGlzdENyZWF0ZVdpdGhEYXRhKGtDRkFs bG9jYXRvckRlZmF1bHQsIHByb3BlcnR5TGlzdERhdGEsIGtDRlByb3BlcnR5TGlzdEltbXV0YWJs ZSwgMCwgMCkpOwotICAgICAgICBpZiAocHJvcGVydHlMaXN0RGF0YSkKLSAgICAgICAgICAgIENG UmVsZWFzZShwcm9wZXJ0eUxpc3REYXRhKTsKLSAgICAgICAgCi0gICAgICAgIC8vIEZJWE1FOiBI YXZlIHRoZSBwbHVnLWluIGNyZWF0ZSB0aGUgTUlNRSB0eXBlcyBwcm9wZXJ0eSBsaXN0IGlmIGl0 IGRvZXNuJ3QgZXhpc3QuCi0gICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NzIwNAotICAgICAgICBpZiAoIXByb3BlcnR5TGlzdCB8fCBDRkdldFR5cGVJ RChwcm9wZXJ0eUxpc3QuZ2V0KCkpICE9IENGRGljdGlvbmFyeUdldFR5cGVJRCgpKQorICAgICAg ICBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBwcm9wZXJ0eUxpc3QgPSBjb250ZW50c09mUHJv cGVydHlMaXN0QXRVUkwocHJvcGVydHlMaXN0VVJMLmdldCgpKTsKKworI2lmIEVOQUJMRShQTFVH SU5fUFJPQ0VTUykKKyAgICAgICAgaWYgKCFwcm9wZXJ0eUxpc3QgJiYgUGx1Z2luUHJvY2Vzc1By b3h5OjpjcmVhdGVQcm9wZXJ0eUxpc3RGaWxlKHBsdWdpbikpCisgICAgICAgICAgICBwcm9wZXJ0 eUxpc3QgPSBjb250ZW50c09mUHJvcGVydHlMaXN0QXRVUkwocHJvcGVydHlMaXN0VVJMLmdldCgp KTsKKyNlbmRpZgorCisgICAgICAgIGlmICghcHJvcGVydHlMaXN0KQogICAgICAgICAgICAgcmV0 dXJuIDA7CiAgICAgICAgIAotICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Q0ZEaWN0aW9uYXJ5 UmVmPihDRkRpY3Rpb25hcnlHZXRWYWx1ZShzdGF0aWNfY2FzdDxDRkRpY3Rpb25hcnlSZWY+KHBy b3BlcnR5TGlzdC5nZXQoKSksIENGU1RSKCJXZWJQbHVnaW5NSU1FVHlwZXMiKSkpOworICAgICAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8Q0ZEaWN0aW9uYXJ5UmVmPihDRkRpY3Rpb25hcnlHZXRWYWx1 ZShwcm9wZXJ0eUxpc3QuZ2V0KCksIENGU1RSKCJXZWJQbHVnaW5NSU1FVHlwZXMiKSkpOwogICAg IH0KICAgICAKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Q0ZEaWN0aW9uYXJ5UmVmPihDRkJ1bmRs ZUdldFZhbHVlRm9ySW5mb0RpY3Rpb25hcnlLZXkoYnVuZGxlLCBDRlNUUigiV2ViUGx1Z2luTUlN RVR5cGVzIikpKTsKQEAgLTExMyw3ICsxMzMsNyBAQCBzdGF0aWMgUmV0YWluUHRyPENGRGljdGlv bmFyeVJlZj4gZ2V0TUlNCiAKIHN0YXRpYyBib29sIGdldFBsdWdpbkluZm9Gcm9tUHJvcGVydHlM aXN0cyhDRkJ1bmRsZVJlZiBidW5kbGUsIFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luJiBwbHVnaW4p CiB7Ci0gICAgUmV0YWluUHRyPENGRGljdGlvbmFyeVJlZj4gbWltZVR5cGVzID0gZ2V0TUlNRVR5 cGVzRnJvbVBsdWdpbkJ1bmRsZShidW5kbGUpOworICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlS ZWY+IG1pbWVUeXBlcyA9IGdldE1JTUVUeXBlc0Zyb21QbHVnaW5CdW5kbGUoYnVuZGxlLCBwbHVn aW4pOwogICAgIGlmICghbWltZVR5cGVzIHx8IENGR2V0VHlwZUlEKG1pbWVUeXBlcy5nZXQoKSkg IT0gQ0ZEaWN0aW9uYXJ5R2V0VHlwZUlEKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAt MzYyLDYgKzM4MiwyNyBAQCBib29sIE5ldHNjYXBlUGx1Z2luTW9kdWxlOjpnZXRQbHVnaW5JbmZv CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK2Jvb2wgTmV0c2NhcGVQbHVnaW5Nb2R1bGU6OmNyZWF0 ZVBsdWdpbk1JTUVUeXBlc1ByZWZlcmVuY2VzKGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCkKK3sK KyAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGJ1bmRsZVBhdGgoQWRvcHRDRiwgcGx1Z2luUGF0 aC5jcmVhdGVDRlN0cmluZygpKTsKKyAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IGJ1bmRsZVVSTChB ZG9wdENGLCBDRlVSTENyZWF0ZVdpdGhGaWxlU3lzdGVtUGF0aChrQ0ZBbGxvY2F0b3JEZWZhdWx0 LCBidW5kbGVQYXRoLmdldCgpLCBrQ0ZVUkxQT1NJWFBhdGhTdHlsZSwgZmFsc2UpKTsKKyAgICAK KyAgICAvLyBUcnkgdG8gaW5pdGlhbGl6ZSB0aGUgYnVuZGxlLgorICAgIFJldGFpblB0cjxDRkJ1 bmRsZVJlZj4gYnVuZGxlKEFkb3B0Q0YsIENGQnVuZGxlQ3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1 bHQsIGJ1bmRsZVVSTC5nZXQoKSkpOworICAgIGlmICghYnVuZGxlKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKKyAgICBpZiAoIUNGQnVuZGxlTG9hZEV4ZWN1dGFibGUoYnVuZGxlLmdldCgpKSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgdm9pZCAoKmNyZWF0ZVBsdWdpbk1JTUVUeXBl c1ByZWZlcmVuY2VzKSh2b2lkKSA9IHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCAoKikodm9pZCk+KENG QnVuZGxlR2V0RnVuY3Rpb25Qb2ludGVyRm9yTmFtZShidW5kbGUuZ2V0KCksIENGU1RSKCJCUF9D cmVhdGVQbHVnaW5NSU1FVHlwZXNQcmVmZXJlbmNlcyIpKSk7CisgICAgaWYgKCFjcmVhdGVQbHVn aW5NSU1FVHlwZXNQcmVmZXJlbmNlcykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAorICAg IGNyZWF0ZVBsdWdpbk1JTUVUeXBlc1ByZWZlcmVuY2VzKCk7CisgICAgcmV0dXJuIHRydWU7Cit9 CisKIHZvaWQgTmV0c2NhcGVQbHVnaW5Nb2R1bGU6OmRldGVybWluZVF1aXJrcygpCiB7CiAgICAg UGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4gcGx1Z2luOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmgJKHJldmlzaW9u IDg2MDgyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vz c1Byb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDkgKzU0LDYgQEAgc3RydWN0IFBsdWdpblBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM7CiAKIGNsYXNzIFBsdWdpblByb2Nlc3NQcm94eSA6IENv cmVJUEM6OkNvbm5lY3Rpb246OkNsaWVudCwgUHJvY2Vzc0xhdW5jaGVyOjpDbGllbnQgewogcHVi bGljOgotI2lmIFBMQVRGT1JNKE1BQykKLSAgICBzdGF0aWMgYm9vbCBwbHVnaW5OZWVkc0V4ZWN1 dGFibGVIZWFwKGNvbnN0IFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luJik7Ci0jZW5kaWYKICAgICBz dGF0aWMgUGFzc093blB0cjxQbHVnaW5Qcm9jZXNzUHJveHk+IGNyZWF0ZShQbHVnaW5Qcm9jZXNz TWFuYWdlciosIGNvbnN0IFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luJik7CiAgICAgflBsdWdpblBy b2Nlc3NQcm94eSgpOwogCkBAIC03NSw2ICs3MiwxNCBAQCBwdWJsaWM6CiAgICAgLy8gVGVybWlu YXRlcyB0aGUgcGx1Zy1pbiBwcm9jZXNzLgogICAgIHZvaWQgdGVybWluYXRlKCk7CiAKKyNpZiBQ TEFURk9STShNQUMpCisgICAgLy8gUmV0dXJucyB3aGV0aGVyIHRoZSBwbHVnLWluIG5lZWRzIHRo ZSBoZWFwIHRvIGJlIG1hcmtlZCBleGVjdXRhYmxlLgorICAgIHN0YXRpYyBib29sIHBsdWdpbk5l ZWRzRXhlY3V0YWJsZUhlYXAoY29uc3QgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4mKTsKKworICAg IC8vIENyZWF0ZXMgYSBwcm9wZXJ0eSBsaXN0IGluIH4vTGlicmFyeS9QcmVmZXJlbmNlcyB0aGF0 IGNvbnRhaW5zIGFsbCB0aGUgTUlNRSB0eXBlcyBzdXBwb3J0ZWQgYnkgdGhlIHBsdWctaW4uCisg ICAgc3RhdGljIGJvb2wgY3JlYXRlUHJvcGVydHlMaXN0RmlsZShjb25zdCBQbHVnaW5JbmZvU3Rv cmU6OlBsdWdpbiYpOworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgUGx1Z2luUHJvY2Vzc1Byb3h5 KFBsdWdpblByb2Nlc3NNYW5hZ2VyKiwgY29uc3QgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4mKTsK IApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpblByb2Nl c3NQcm94eU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1 Z2lucy9tYWMvUGx1Z2luUHJvY2Vzc1Byb3h5TWFjLm1tCShyZXZpc2lvbiA4NjA4MikKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5Qcm9jZXNzUHJveHlNYWMu bW0JKHdvcmtpbmcgY29weSkKQEAgLTI4LDggKzI4LDEyIEBACiAKICNpZiBFTkFCTEUoUExVR0lO X1BST0NFU1MpCiAKKyNpbXBvcnQgIkVudmlyb25tZW50VmFyaWFibGVzLmgiCiAjaW1wb3J0ICJQ bHVnaW5Qcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCiAjaW1wb3J0ICJXZWJLaXRTeXN0ZW1J bnRlcmZhY2UuaCIKKyNpbXBvcnQgPFdlYkNvcmUvRmlsZVN5c3RlbS5oPgorI2ltcG9ydCA8c3Bh d24uaD4KKyNpbXBvcnQgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogQGludGVyZmFjZSBXS1BsYWNl aG9sZGVyTW9kYWxXaW5kb3cgOiBOU1dpbmRvdyAKIEBlbmQKQEAgLTQ1LDYgKzQ5LDggQEAgLSAo Qk9PTClfd2FudHNVc2VyQXR0ZW50aW9uCiAKIEBlbmQKIAordXNpbmcgbmFtZXNwYWNlIFdlYkNv cmU7CisKIG5hbWVzcGFjZSBXZWJLaXQgewogICAgIAogYm9vbCBQbHVnaW5Qcm9jZXNzUHJveHk6 OnBsdWdpbk5lZWRzRXhlY3V0YWJsZUhlYXAoY29uc3QgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4m IHBsdWdpbkluZm8pCkBAIC01OSw2ICs2NSw1MyBAQCBib29sIFBsdWdpblByb2Nlc3NQcm94eTo6 cGx1Z2luTmVlZHNFeGVjCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK2Jvb2wgUGx1Z2luUHJvY2Vz c1Byb3h5OjpjcmVhdGVQcm9wZXJ0eUxpc3RGaWxlKGNvbnN0IFBsdWdpbkluZm9TdG9yZTo6UGx1 Z2luJiBwbHVnaW4pCit7CisgICAgTlNCdW5kbGUgKndlYktpdDJCdW5kbGUgPSBbTlNCdW5kbGUg YnVuZGxlV2l0aElkZW50aWZpZXI6QCJjb20uYXBwbGUuV2ViS2l0MiJdOworICAgIE5TU3RyaW5n ICpmcmFtZXdvcmtzUGF0aCA9IFtbd2ViS2l0MkJ1bmRsZSBidW5kbGVQYXRoXSBzdHJpbmdCeURl bGV0aW5nTGFzdFBhdGhDb21wb25lbnRdOworICAgIGNvbnN0IGNoYXIqIGZyYW1ld29ya0V4ZWN1 dGFibGVQYXRoID0gW1t3ZWJLaXQyQnVuZGxlIGV4ZWN1dGFibGVQYXRoXSBmaWxlU3lzdGVtUmVw cmVzZW50YXRpb25dOworICAgIAorICAgIE5TU3RyaW5nICpwcm9jZXNzUGF0aCA9IFt3ZWJLaXQy QnVuZGxlIHBhdGhGb3JBdXhpbGlhcnlFeGVjdXRhYmxlOkAiUGx1Z2luUHJvY2Vzcy5hcHAiXTsK KyAgICBOU1N0cmluZyAqcHJvY2Vzc0FwcEV4ZWN1dGFibGVQYXRoID0gW1tOU0J1bmRsZSBidW5k bGVXaXRoUGF0aDpwcm9jZXNzUGF0aF0gZXhlY3V0YWJsZVBhdGhdOworCisgICAgQ1N0cmluZyBw bHVnaW5QYXRoU3RyaW5nID0gZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHBsdWdpbi5wYXRoKTsK KworICAgIHBvc2l4X3NwYXduYXR0cl90IGF0dHI7CisgICAgcG9zaXhfc3Bhd25hdHRyX2luaXQo JmF0dHIpOworCisgICAgY3B1X3R5cGVfdCBjcHVUeXBlc1tdID0geyBwbHVnaW4ucGx1Z2luQXJj aGl0ZWN0dXJlIH07ICAgIAorICAgIHNpemVfdCBvdXRDb3VudCA9IDA7CisgICAgcG9zaXhfc3Bh d25hdHRyX3NldGJpbnByZWZfbnAoJmF0dHIsIDEsIGNwdVR5cGVzLCAmb3V0Q291bnQpOworCisg ICAgRW52aXJvbm1lbnRWYXJpYWJsZXMgZW52aXJvbm1lbnRWYXJpYWJsZXM7CisgICAgCisgICAg Ly8gVG8gbWFrZSBlbmdpbmVlcmluZyBidWlsZHMgd29yaywgaWYgdGhlIHBhdGggaXMgb3V0c2lk ZSBvZiAvU3lzdGVtIHNldCB1cAorICAgIC8vIERZTERfRlJBTUVXT1JLX1BBVEggdG8gcGljayB1 cCBvdGhlciBmcmFtZXdvcmtzLCBidXQgZG9uJ3QgZG8gaXQgZm9yIHRoZQorICAgIC8vIHByb2R1 Y3Rpb24gY29uZmlndXJhdGlvbiBiZWNhdXNlIGl0IGludm9sdmVzIGV4dHJhIGZpbGUgc3lzdGVt IGFjY2Vzcy4KKyAgICBpZiAoIVtmcmFtZXdvcmtzUGF0aCBoYXNQcmVmaXg6QCIvU3lzdGVtLyJd KQorICAgICAgICBlbnZpcm9ubWVudFZhcmlhYmxlcy5hcHBlbmRWYWx1ZSgiRFlMRF9GUkFNRVdP UktfUEFUSCIsIFtmcmFtZXdvcmtzUGF0aCBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb25dLCAnOicp OworCisgICAgY29uc3QgY2hhciogYXJnc1tdID0geyBbcHJvY2Vzc0FwcEV4ZWN1dGFibGVQYXRo IGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbl0sIGZyYW1ld29ya0V4ZWN1dGFibGVQYXRoLCAiLXR5 cGUiLCAicGx1Z2lucHJvY2VzcyIsICItY3JlYXRlUGx1Z2luTUlNRVR5cGVzUHJlZmVyZW5jZXMi LCBwbHVnaW5QYXRoU3RyaW5nLmRhdGEoKSwgMCB9OworCisgICAgcGlkX3QgcGlkOworICAgIGlu dCByZXN1bHQgPSBwb3NpeF9zcGF3bigmcGlkLCBhcmdzWzBdLCAwLCAmYXR0ciwgY29uc3RfY2Fz dDxjaGFyKiBjb25zdCo+KGFyZ3MpLCBlbnZpcm9ubWVudFZhcmlhYmxlcy5lbnZpcm9ubWVudFBv aW50ZXIoKSk7CisgICAgcG9zaXhfc3Bhd25hdHRyX2Rlc3Ryb3koJmF0dHIpOworCisgICAgaWYg KHJlc3VsdCA8IDApCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpbnQgc3RhdHVzOworICAg IGlmICh3YWl0cGlkKHBpZCwgJnN0YXR1cywgMCkgPCAwKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisKKyAgICBpZiAoIVdJRkVYSVRFRChzdGF0dXMpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisK KyAgICBpZiAoV0VYSVRTVEFUVVMoc3RhdHVzKSAhPSBFWElUX1NVQ0NFU1MpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgIHJldHVybiB0cnVlOworfQorCiB2b2lkIFBsdWdpblByb2Nlc3NQ cm94eTo6cGxhdGZvcm1Jbml0aWFsaXplUGx1Z2luUHJvY2VzcyhQbHVnaW5Qcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJ VElORykgJiYgSEFWRShIT1NURURfQ09SRV9BTklNQVRJT04pCg==