77297 2012-01-29 07:41:17 -0800 [npapi] NPP_GetMIMEDescription should return const char* 2012-02-01 15:11:22 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 77200 0 vanuan webkit-unassigned andersca ap stuartmorgan webkit.review.bot oldest_to_newest 544735 0 vanuan 2012-01-29 07:41:17 -0800 Return type of NPP_GetMIMEDescription was changed from char* to const char*: http://code.google.com/p/npapi-headers/issues/detail?id=2 So it should also be changed in Webkit. 544758 1 124469 vanuan 2012-01-29 13:49:07 -0800 Created attachment 124469 patch 544763 2 vanuan 2012-01-29 14:14:14 -0800 Can you review, please? 544928 3 stuartmorgan 2012-01-30 01:10:43 -0800 I'm not a WebKit reviewer, so no. 545186 4 124469 ap 2012-01-30 10:11:03 -0800 Comment on attachment 124469 patch Please also fix references to this in PluginPackage{Qt,Blackberry,Efl}.cpp. They should use NP_GetMIMEDescriptionFuncPtr, not a local typedef. 545358 5 124587 vanuan 2012-01-30 13:25:22 -0800 Created attachment 124587 patch_v2 See updated patch. However, I'm not sure whether all mentioned ports define XP_UNIX. So build can brake. I didn't check all ports, cause I don't have its dependencies installed. 545828 6 124587 vanuan 2012-01-31 00:21:52 -0800 Comment on attachment 124587 patch_v2 View in context: https://bugs.webkit.org/attachment.cgi?id=124587&action=review > Source/WebCore/ChangeLog:11 > + * plugins/npfunctions.h: Seems like I forgot to update the changelog 547292 7 124587 ap 2012-02-01 12:38:09 -0800 Comment on attachment 124587 patch_v2 OK 547306 8 124997 vanuan 2012-02-01 12:55:02 -0800 Created attachment 124997 Patch to land Updated changelog. Patch is ready to land. 547411 9 124997 webkit.review.bot 2012-02-01 15:11:17 -0800 Comment on attachment 124997 Patch to land Clearing flags on attachment: 124997 Committed r106503: <http://trac.webkit.org/changeset/106503> 547412 10 webkit.review.bot 2012-02-01 15:11:22 -0800 All reviewed patches have been landed. Closing bug. 124469 2012-01-29 13:49:07 -0800 2012-01-30 13:25:22 -0800 patch getMIMEDescription.patch text/plain 1757 vanuan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNjE5OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTI5ICBKb2huIFlh bmkgIDx2YW51YW5AZ21haWwuY29tPgorCisgICAgICAgIEdldE1JTUVEZXNjcmlwdGlvbiBzaG91 bGQgcmV0dXJuIGNvbnN0IGNoYXIgKgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzcyOTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvdXIuCisKKyAg ICAgICAgKiBwbHVnaW5zL25wYXBpLmg6CisgICAgICAgICogcGx1Z2lucy9ucGZ1bmN0aW9ucy5o OgorCiAyMDEyLTAxLTI4ICBBbGV4YW5kZXIgRsOmcsO4eSAgPGFoZkAweDkwLmRrPgogCiAgICAg ICAgIFtRdF0gUmVtb3ZlIHJlZmVyZW5jZXMgdG8gQ1NTQm9yZGVySW1hZ2VWYWx1ZS5oIGluIFRh cmdldC5wcmkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvbnBhcGkuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL25wYXBpLmgJKHJldmlzaW9uIDEwNjE5OCkKKysr IFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvbnBhcGkuaAkod29ya2luZyBjb3B5KQpAQCAtNzkxLDcg Kzc5MSw3IEBAIGV4dGVybiAiQyIgewogLyogTlBQXyogZnVuY3Rpb25zIGFyZSBwcm92aWRlZCBi eSB0aGUgcGx1Z2luIGFuZCBjYWxsZWQgYnkgdGhlIG5hdmlnYXRvci4gKi8KIAogI2lmIGRlZmlu ZWQoWFBfVU5JWCkKLWNoYXIqIE5QUF9HZXRNSU1FRGVzY3JpcHRpb24odm9pZCk7Citjb25zdCBj aGFyKiBOUFBfR2V0TUlNRURlc2NyaXB0aW9uKHZvaWQpOwogI2VuZGlmCiAKIE5QRXJyb3IgTlBf TE9BRERTIE5QUF9Jbml0aWFsaXplKHZvaWQpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGx1Z2lu cy9ucGZ1bmN0aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvbnBm dW5jdGlvbnMuaAkocmV2aXNpb24gMTA2MTk4KQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lucy9u cGZ1bmN0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMTEsNyArMjExLDcgQEAgdHlwZWRlZiBO UEVycm9yICgqTWFpbkZ1bmNQdHIpKE5QTmV0c2NhcAogCiAjaWYgZGVmaW5lZChYUF9VTklYKQog dHlwZWRlZiBFWFBPUlRFRF9DQUxMQkFDSyhOUEVycm9yLCBOUF9Jbml0aWFsaXplRnVuY1B0ciko TlBOZXRzY2FwZUZ1bmNzKiwgTlBQbHVnaW5GdW5jcyopOwotdHlwZWRlZiBFWFBPUlRFRF9DQUxM QkFDSyhjaGFyKiwgTlBfR2V0TUlNRURlc2NyaXB0aW9uRnVuY1B0cikodm9pZCk7Cit0eXBlZGVm IEVYUE9SVEVEX0NBTExCQUNLKGNvbnN0IGNoYXIqLCBOUF9HZXRNSU1FRGVzY3JpcHRpb25GdW5j UHRyKSh2b2lkKTsKICNlbHNlCiB0eXBlZGVmIEVYUE9SVEVEX0NBTExCQUNLKE5QRXJyb3IsIE5Q X0luaXRpYWxpemVGdW5jUHRyKShOUE5ldHNjYXBlRnVuY3MqKTsKICNlbmRpZgo= 124587 2012-01-30 13:25:22 -0800 2012-02-01 12:55:02 -0800 patch_v2 getMIMEDescription.patch text/plain 4690 vanuan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNjE5OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTI5ICBKb2huIFlh bmkgIDx2YW51YW5AZ21haWwuY29tPgorCisgICAgICAgIEdldE1JTUVEZXNjcmlwdGlvbiBzaG91 bGQgcmV0dXJuIGNvbnN0IGNoYXIgKgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzcyOTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvdXIuCisKKyAg ICAgICAgKiBwbHVnaW5zL25wYXBpLmg6CisgICAgICAgICogcGx1Z2lucy9ucGZ1bmN0aW9ucy5o OgorCiAyMDEyLTAxLTI4ICBBbGV4YW5kZXIgRsOmcsO4eSAgPGFoZkAweDkwLmRrPgogCiAgICAg ICAgIFtRdF0gUmVtb3ZlIHJlZmVyZW5jZXMgdG8gQ1NTQm9yZGVySW1hZ2VWYWx1ZS5oIGluIFRh cmdldC5wcmkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvbnBhcGkuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL25wYXBpLmgJKHJldmlzaW9uIDEwNjE5OCkKKysr IFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvbnBhcGkuaAkod29ya2luZyBjb3B5KQpAQCAtNzkxLDcg Kzc5MSw3IEBAIGV4dGVybiAiQyIgewogLyogTlBQXyogZnVuY3Rpb25zIGFyZSBwcm92aWRlZCBi eSB0aGUgcGx1Z2luIGFuZCBjYWxsZWQgYnkgdGhlIG5hdmlnYXRvci4gKi8KIAogI2lmIGRlZmlu ZWQoWFBfVU5JWCkKLWNoYXIqIE5QUF9HZXRNSU1FRGVzY3JpcHRpb24odm9pZCk7Citjb25zdCBj aGFyKiBOUFBfR2V0TUlNRURlc2NyaXB0aW9uKHZvaWQpOwogI2VuZGlmCiAKIE5QRXJyb3IgTlBf TE9BRERTIE5QUF9Jbml0aWFsaXplKHZvaWQpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGx1Z2lu cy9ucGZ1bmN0aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvbnBm dW5jdGlvbnMuaAkocmV2aXNpb24gMTA2MTk4KQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lucy9u cGZ1bmN0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMTEsNyArMjExLDcgQEAgdHlwZWRlZiBO UEVycm9yICgqTWFpbkZ1bmNQdHIpKE5QTmV0c2NhcAogCiAjaWYgZGVmaW5lZChYUF9VTklYKQog dHlwZWRlZiBFWFBPUlRFRF9DQUxMQkFDSyhOUEVycm9yLCBOUF9Jbml0aWFsaXplRnVuY1B0ciko TlBOZXRzY2FwZUZ1bmNzKiwgTlBQbHVnaW5GdW5jcyopOwotdHlwZWRlZiBFWFBPUlRFRF9DQUxM QkFDSyhjaGFyKiwgTlBfR2V0TUlNRURlc2NyaXB0aW9uRnVuY1B0cikodm9pZCk7Cit0eXBlZGVm IEVYUE9SVEVEX0NBTExCQUNLKGNvbnN0IGNoYXIqLCBOUF9HZXRNSU1FRGVzY3JpcHRpb25GdW5j UHRyKSh2b2lkKTsKICNlbHNlCiB0eXBlZGVmIEVYUE9SVEVEX0NBTExCQUNLKE5QRXJyb3IsIE5Q X0luaXRpYWxpemVGdW5jUHRyKShOUE5ldHNjYXBlRnVuY3MqKTsKICNlbmRpZgpJbmRleDogU291 cmNlL1dlYkNvcmUvcGx1Z2lucy9ibGFja2JlcnJ5L1BsdWdpblBhY2thZ2VCbGFja0JlcnJ5LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2JsYWNrYmVycnkvUGx1Z2lu UGFja2FnZUJsYWNrQmVycnkuY3BwCShyZXZpc2lvbiAxMDYxOTgpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbHVnaW5zL2JsYWNrYmVycnkvUGx1Z2luUGFja2FnZUJsYWNrQmVycnkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03OSw4ICs3OSw3IEBAIGJvb2wgUGx1Z2luUGFja2FnZTo6ZmV0Y2hJbmZvKCkK ICAgICAvLyBXZSBhcmUgZmV0Y2hpbmcgdGhlIGluZm8uIFRlY2huaWNhbGx5IHdlIGhhdmUgbm90 IGxvYWRlZCB0aGUgcGx1Z2luLiBQbHVnaW5WaWV3OjpJbml0IHdpbGwgbG9hZCB0aGUgcGx1Z2lu IHNvIGRlY3JlbWVudCB0aGUgY291bnRlcgogICAgIG1fbG9hZENvdW50LS07CiAKLSAgICB0eXBl ZGVmIGNoYXIgKigqTlBQX0dldE1JTUVEZXNjcmlwdGlvblByb2NQdHIpKCk7Ci0gICAgTlBQX0dl dE1JTUVEZXNjcmlwdGlvblByb2NQdHIgZ2V0RGVzY3JpcHRpb24gPSAoTlBQX0dldE1JTUVEZXNj cmlwdGlvblByb2NQdHIpIGRsc3ltKG1fbW9kdWxlLCAiTlBfR2V0TUlNRURlc2NyaXB0aW9uIik7 CisgICAgTlBfR2V0TUlNRURlc2NyaXB0aW9uRnVuY1B0ciBnZXREZXNjcmlwdGlvbiA9IChOUF9H ZXRNSU1FRGVzY3JpcHRpb25GdW5jUHRyKSBkbHN5bShtX21vZHVsZSwgIk5QX0dldE1JTUVEZXNj cmlwdGlvbiIpOwogICAgIE5QUF9HZXRWYWx1ZVByb2NQdHIgZ2V0VmFsdWUgPSAoTlBQX0dldFZh bHVlUHJvY1B0cikgZGxzeW0obV9tb2R1bGUsICJOUF9HZXRWYWx1ZSIpOwogCiAgICAgaWYgKCFn ZXREZXNjcmlwdGlvbiB8fCAhZ2V0VmFsdWUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbHVnaW5z L2VmbC9QbHVnaW5QYWNrYWdlRWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bHVnaW5zL2VmbC9QbHVnaW5QYWNrYWdlRWZsLmNwcAkocmV2aXNpb24gMTA2MTk4KQorKysgU291 cmNlL1dlYkNvcmUvcGx1Z2lucy9lZmwvUGx1Z2luUGFja2FnZUVmbC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQzLDggKzQzLDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi10eXBlZGVmIGNo YXIqICgqTlBQX0dldE1JTUVEZXNjcmlwdGlvblByb2NQdHIpKCk7Ci0KIGJvb2wgUGx1Z2luUGFj a2FnZTo6ZmV0Y2hJbmZvKCkKIHsKICAgICBjb25zdCBjaGFyICplcnJtc2c7CkBAIC01Myw3ICs1 MSw3IEBAIGJvb2wgUGx1Z2luUGFja2FnZTo6ZmV0Y2hJbmZvKCkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgTlBQX0dldFZhbHVlUHJvY1B0ciBnZXRWYWx1ZSA9IDA7Ci0gICAgTlBQX0dl dE1JTUVEZXNjcmlwdGlvblByb2NQdHIgZ2V0TUlNRURlc2NyaXB0aW9uID0gMDsKKyAgICBOUF9H ZXRNSU1FRGVzY3JpcHRpb25GdW5jUHRyIGdldE1JTUVEZXNjcmlwdGlvbiA9IDA7CiAKICAgICBn ZXRWYWx1ZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8TlBQX0dldFZhbHVlUHJvY1B0cj4oZGxzeW0obV9t b2R1bGUsICJOUF9HZXRWYWx1ZSIpKTsKICAgICBpZiAoKGVycm1zZyA9IGRsZXJyb3IoKSkpIHsK QEAgLTYxLDcgKzU5LDcgQEAgYm9vbCBQbHVnaW5QYWNrYWdlOjpmZXRjaEluZm8oKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgZ2V0TUlNRURlc2NyaXB0aW9uID0gcmVpbnRl cnByZXRfY2FzdDxOUFBfR2V0TUlNRURlc2NyaXB0aW9uUHJvY1B0cj4oZGxzeW0obV9tb2R1bGUs ICJOUF9HZXRNSU1FRGVzY3JpcHRpb24iKSk7CisgICAgZ2V0TUlNRURlc2NyaXB0aW9uID0gcmVp bnRlcnByZXRfY2FzdDxOUF9HZXRNSU1FRGVzY3JpcHRpb25GdW5jUHRyPihkbHN5bShtX21vZHVs ZSwgIk5QX0dldE1JTUVEZXNjcmlwdGlvbiIpKTsKICAgICBpZiAoKGVycm1zZyA9IGRsZXJyb3Io KSkpIHsKICAgICAgICAgRUlOQV9MT0dfRVJSKCJDb3VsZCBub3QgZ2V0IHN5bWJvbCBOUF9HZXRN SU1FRGVzY3JpcHRpb246ICVzIiwgZXJybXNnKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5QYWNrYWdlUXQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvcXQvUGx1Z2luUGFja2FnZVF0LmNwcAkocmV2 aXNpb24gMTA2MTk4KQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5QYWNrYWdl UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MSw5ICs0MSw4IEBAIGJvb2wgUGx1Z2luUGFja2Fn ZTo6ZmV0Y2hJbmZvKCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgTlBQX0dldFZhbHVl UHJvY1B0ciBndiA9IChOUFBfR2V0VmFsdWVQcm9jUHRyKW1fbW9kdWxlLT5yZXNvbHZlKCJOUF9H ZXRWYWx1ZSIpOwotICAgIHR5cGVkZWYgY2hhciAqKCpOUFBfR2V0TUlNRURlc2NyaXB0aW9uUHJv Y1B0cikoKTsKLSAgICBOUFBfR2V0TUlNRURlc2NyaXB0aW9uUHJvY1B0ciBnbSA9Ci0gICAgICAg IChOUFBfR2V0TUlNRURlc2NyaXB0aW9uUHJvY1B0ciltX21vZHVsZS0+cmVzb2x2ZSgiTlBfR2V0 TUlNRURlc2NyaXB0aW9uIik7CisgICAgTlBfR2V0TUlNRURlc2NyaXB0aW9uRnVuY1B0ciBnbSA9 CisgICAgICAgIChOUF9HZXRNSU1FRGVzY3JpcHRpb25GdW5jUHRyKW1fbW9kdWxlLT5yZXNvbHZl KCJOUF9HZXRNSU1FRGVzY3JpcHRpb24iKTsKICAgICBpZiAoIWdtIHx8ICFndikKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCg== 124997 2012-02-01 12:55:02 -0800 2012-02-01 15:11:17 -0800 Patch to land getMIMEDescription.patch text/plain 4968 vanuan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNjQ4NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAyLTAxICBKb2huIFlh bmkgIDx2YW51YW5AZ21haWwuY29tPgorCisgICAgICAgIEdldE1JTUVEZXNjcmlwdGlvbiBzaG91 bGQgcmV0dXJuIGNvbnN0IGNoYXIgKgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzcyOTcKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1 cnlha292LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW91ci4K KworICAgICAgICAqIHBsdWdpbnMvYmxhY2tiZXJyeS9QbHVnaW5QYWNrYWdlQmxhY2tCZXJyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5QYWNrYWdlOjpmZXRjaEluZm8pOgorICAgICAg ICAqIHBsdWdpbnMvZWZsL1BsdWdpblBhY2thZ2VFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5QYWNrYWdlOjpmZXRjaEluZm8pOgorICAgICAgICAq IHBsdWdpbnMvbnBhcGkuaDoKKyAgICAgICAgKiBwbHVnaW5zL25wZnVuY3Rpb25zLmg6CisgICAg ICAgICogcGx1Z2lucy9xdC9QbHVnaW5QYWNrYWdlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGx1Z2luUGFja2FnZTo6ZmV0Y2hJbmZvKToKKwogMjAxMi0wMi0wMSAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ucGFwaS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsdWdpbnMvbnBhcGkuaAkocmV2aXNpb24gMTA2MTk4KQorKysgU291cmNl L1dlYkNvcmUvcGx1Z2lucy9ucGFwaS5oCSh3b3JraW5nIGNvcHkpCkBAIC03OTEsNyArNzkxLDcg QEAgZXh0ZXJuICJDIiB7CiAvKiBOUFBfKiBmdW5jdGlvbnMgYXJlIHByb3ZpZGVkIGJ5IHRoZSBw bHVnaW4gYW5kIGNhbGxlZCBieSB0aGUgbmF2aWdhdG9yLiAqLwogCiAjaWYgZGVmaW5lZChYUF9V TklYKQotY2hhciogTlBQX0dldE1JTUVEZXNjcmlwdGlvbih2b2lkKTsKK2NvbnN0IGNoYXIqIE5Q UF9HZXRNSU1FRGVzY3JpcHRpb24odm9pZCk7CiAjZW5kaWYKIAogTlBFcnJvciBOUF9MT0FERFMg TlBQX0luaXRpYWxpemUodm9pZCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL25wZnVu Y3Rpb25zLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ucGZ1bmN0aW9u cy5oCShyZXZpc2lvbiAxMDYxOTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL25wZnVuY3Rp b25zLmgJKHdvcmtpbmcgY29weSkKQEAgLTIxMSw3ICsyMTEsNyBAQCB0eXBlZGVmIE5QRXJyb3Ig KCpNYWluRnVuY1B0cikoTlBOZXRzY2FwCiAKICNpZiBkZWZpbmVkKFhQX1VOSVgpCiB0eXBlZGVm IEVYUE9SVEVEX0NBTExCQUNLKE5QRXJyb3IsIE5QX0luaXRpYWxpemVGdW5jUHRyKShOUE5ldHNj YXBlRnVuY3MqLCBOUFBsdWdpbkZ1bmNzKik7Ci10eXBlZGVmIEVYUE9SVEVEX0NBTExCQUNLKGNo YXIqLCBOUF9HZXRNSU1FRGVzY3JpcHRpb25GdW5jUHRyKSh2b2lkKTsKK3R5cGVkZWYgRVhQT1JU RURfQ0FMTEJBQ0soY29uc3QgY2hhciosIE5QX0dldE1JTUVEZXNjcmlwdGlvbkZ1bmNQdHIpKHZv aWQpOwogI2Vsc2UKIHR5cGVkZWYgRVhQT1JURURfQ0FMTEJBQ0soTlBFcnJvciwgTlBfSW5pdGlh bGl6ZUZ1bmNQdHIpKE5QTmV0c2NhcGVGdW5jcyopOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbHVnaW5zL2JsYWNrYmVycnkvUGx1Z2luUGFja2FnZUJsYWNrQmVycnkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvYmxhY2tiZXJyeS9QbHVnaW5QYWNrYWdl QmxhY2tCZXJyeS5jcHAJKHJldmlzaW9uIDEwNjE5OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsdWdp bnMvYmxhY2tiZXJyeS9QbHVnaW5QYWNrYWdlQmxhY2tCZXJyeS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTc5LDggKzc5LDcgQEAgYm9vbCBQbHVnaW5QYWNrYWdlOjpmZXRjaEluZm8oKQogICAgIC8v IFdlIGFyZSBmZXRjaGluZyB0aGUgaW5mby4gVGVjaG5pY2FsbHkgd2UgaGF2ZSBub3QgbG9hZGVk IHRoZSBwbHVnaW4uIFBsdWdpblZpZXc6OkluaXQgd2lsbCBsb2FkIHRoZSBwbHVnaW4gc28gZGVj cmVtZW50IHRoZSBjb3VudGVyCiAgICAgbV9sb2FkQ291bnQtLTsKIAotICAgIHR5cGVkZWYgY2hh ciAqKCpOUFBfR2V0TUlNRURlc2NyaXB0aW9uUHJvY1B0cikoKTsKLSAgICBOUFBfR2V0TUlNRURl c2NyaXB0aW9uUHJvY1B0ciBnZXREZXNjcmlwdGlvbiA9IChOUFBfR2V0TUlNRURlc2NyaXB0aW9u UHJvY1B0cikgZGxzeW0obV9tb2R1bGUsICJOUF9HZXRNSU1FRGVzY3JpcHRpb24iKTsKKyAgICBO UF9HZXRNSU1FRGVzY3JpcHRpb25GdW5jUHRyIGdldERlc2NyaXB0aW9uID0gKE5QX0dldE1JTUVE ZXNjcmlwdGlvbkZ1bmNQdHIpIGRsc3ltKG1fbW9kdWxlLCAiTlBfR2V0TUlNRURlc2NyaXB0aW9u Iik7CiAgICAgTlBQX0dldFZhbHVlUHJvY1B0ciBnZXRWYWx1ZSA9IChOUFBfR2V0VmFsdWVQcm9j UHRyKSBkbHN5bShtX21vZHVsZSwgIk5QX0dldFZhbHVlIik7CiAKICAgICBpZiAoIWdldERlc2Ny aXB0aW9uIHx8ICFnZXRWYWx1ZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvZWZsL1Bs dWdpblBhY2thZ2VFZmwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMv ZWZsL1BsdWdpblBhY2thZ2VFZmwuY3BwCShyZXZpc2lvbiAxMDYxOTgpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbHVnaW5zL2VmbC9QbHVnaW5QYWNrYWdlRWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDMsOCArNDMsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXR5cGVkZWYgY2hhciogKCpO UFBfR2V0TUlNRURlc2NyaXB0aW9uUHJvY1B0cikoKTsKLQogYm9vbCBQbHVnaW5QYWNrYWdlOjpm ZXRjaEluZm8oKQogewogICAgIGNvbnN0IGNoYXIgKmVycm1zZzsKQEAgLTUzLDcgKzUxLDcgQEAg Ym9vbCBQbHVnaW5QYWNrYWdlOjpmZXRjaEluZm8oKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICBOUFBfR2V0VmFsdWVQcm9jUHRyIGdldFZhbHVlID0gMDsKLSAgICBOUFBfR2V0TUlNRURl c2NyaXB0aW9uUHJvY1B0ciBnZXRNSU1FRGVzY3JpcHRpb24gPSAwOworICAgIE5QX0dldE1JTUVE ZXNjcmlwdGlvbkZ1bmNQdHIgZ2V0TUlNRURlc2NyaXB0aW9uID0gMDsKIAogICAgIGdldFZhbHVl ID0gcmVpbnRlcnByZXRfY2FzdDxOUFBfR2V0VmFsdWVQcm9jUHRyPihkbHN5bShtX21vZHVsZSwg Ik5QX0dldFZhbHVlIikpOwogICAgIGlmICgoZXJybXNnID0gZGxlcnJvcigpKSkgewpAQCAtNjEs NyArNTksNyBAQCBib29sIFBsdWdpblBhY2thZ2U6OmZldGNoSW5mbygpCiAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9CiAKLSAgICBnZXRNSU1FRGVzY3JpcHRpb24gPSByZWludGVycHJldF9j YXN0PE5QUF9HZXRNSU1FRGVzY3JpcHRpb25Qcm9jUHRyPihkbHN5bShtX21vZHVsZSwgIk5QX0dl dE1JTUVEZXNjcmlwdGlvbiIpKTsKKyAgICBnZXRNSU1FRGVzY3JpcHRpb24gPSByZWludGVycHJl dF9jYXN0PE5QX0dldE1JTUVEZXNjcmlwdGlvbkZ1bmNQdHI+KGRsc3ltKG1fbW9kdWxlLCAiTlBf R2V0TUlNRURlc2NyaXB0aW9uIikpOwogICAgIGlmICgoZXJybXNnID0gZGxlcnJvcigpKSkgewog ICAgICAgICBFSU5BX0xPR19FUlIoIkNvdWxkIG5vdCBnZXQgc3ltYm9sIE5QX0dldE1JTUVEZXNj cmlwdGlvbjogJXMiLCBlcnJtc2cpOwogICAgICAgICByZXR1cm4gZmFsc2U7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblBhY2thZ2VRdC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5QYWNrYWdlUXQuY3BwCShyZXZpc2lvbiAx MDYxOTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblBhY2thZ2VRdC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQxLDkgKzQxLDggQEAgYm9vbCBQbHVnaW5QYWNrYWdlOjpmZXRj aEluZm8oKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBOUFBfR2V0VmFsdWVQcm9jUHRy IGd2ID0gKE5QUF9HZXRWYWx1ZVByb2NQdHIpbV9tb2R1bGUtPnJlc29sdmUoIk5QX0dldFZhbHVl Iik7Ci0gICAgdHlwZWRlZiBjaGFyICooKk5QUF9HZXRNSU1FRGVzY3JpcHRpb25Qcm9jUHRyKSgp OwotICAgIE5QUF9HZXRNSU1FRGVzY3JpcHRpb25Qcm9jUHRyIGdtID0KLSAgICAgICAgKE5QUF9H ZXRNSU1FRGVzY3JpcHRpb25Qcm9jUHRyKW1fbW9kdWxlLT5yZXNvbHZlKCJOUF9HZXRNSU1FRGVz Y3JpcHRpb24iKTsKKyAgICBOUF9HZXRNSU1FRGVzY3JpcHRpb25GdW5jUHRyIGdtID0KKyAgICAg ICAgKE5QX0dldE1JTUVEZXNjcmlwdGlvbkZ1bmNQdHIpbV9tb2R1bGUtPnJlc29sdmUoIk5QX0dl dE1JTUVEZXNjcmlwdGlvbiIpOwogICAgIGlmICghZ20gfHwgIWd2KQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAK