Mercurial > pidgin.yaz
changeset 32277:70ff869a74d1
Open an explorer.exe window at the location of the file when clicking
on a file link instead of executing the file, because executing a file
can be potentially dangerous. Problem discovered by James Burton of
Insomnia Security. Fixed by Eion Robb.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 18 Aug 2011 08:38:23 +0000 |
| parents | 4794e858bd80 |
| children | d2eb28c12d44 |
| files | ChangeLog pidgin/gtkutils.c |
| diffstat | 2 files changed, 26 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 18 08:00:50 2011 +0000 +++ b/ChangeLog Thu Aug 18 08:38:23 2011 +0000 @@ -53,6 +53,12 @@ * Fix coming out of idle while in an unavailable state * Fix logging into Yahoo! JAPAN. (#14259) + Windows-Specific Changes: + * Open an explorer.exe window at the location of the file when clicking + on a file link instead of executing the file, because executing a file + can be potentially dangerous. Problem discovered by James Burton of + Insomnia Security. Fixed by Eion Robb. + version 2.9.0 (06/23/2011): Pidgin: * Fix a potential remote denial-of-service bug related to displaying
--- a/pidgin/gtkutils.c Thu Aug 18 08:00:50 2011 +0000 +++ b/pidgin/gtkutils.c Thu Aug 18 08:38:23 2011 +0000 @@ -3282,13 +3282,26 @@ #ifdef _WIN32 /* If using Win32... */ int code; - wchar_t *wc_filename = g_utf8_to_utf16( - uri, -1, NULL, NULL, NULL); - - code = (int)ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL, - SW_SHOW); - - g_free(wc_filename); + if (purple_str_has_prefix(uri, "file://")) + { + gchar *escaped = g_shell_quote(uri); + gchar *param = g_strconcat("/select,\"", uri, "\"", NULL); + gchar *wc_param = g_utf8_to_utf16(param, -1, NULL, NULL, NULL); + + code = (int)ShellExecuteW(NULL, "OPEN", L"explorer.exe", wc_param, NULL, SW_NORMAL); + + g_free(wc_param); + g_free(param); + g_free(escaped); + } else { + wchar_t *wc_filename = g_utf8_to_utf16( + uri, -1, NULL, NULL, NULL); + + code = (int)ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL, + SW_SHOW); + + g_free(wc_filename); + } if (code == SE_ERR_ASSOCINCOMPLETE || code == SE_ERR_NOASSOC) {