[gtk+/gtk-2-20] Avoid potential DLL hijacking in ms-windows theme engine
- From: Tor Lillqvist <tml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-20] Avoid potential DLL hijacking in ms-windows theme engine
- Date: Thu, 2 Sep 2010 11:35:51 +0000 (UTC)
commit ab5b246202beb5b28fdd84174f1f992aba5d76c0
Author: Tor Lillqvist <tml iki fi>
Date: Thu Sep 2 14:30:59 2010 +0300
Avoid potential DLL hijacking in ms-windows theme engine
Load uxtheme.dll from an absolute path. A proper uxtheme.dll, if
present, will always be in the Windows system directory, so load it
from there.
modules/engines/ms-windows/xp_theme.c | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c
index 506d9ed..a0f333b 100755
--- a/modules/engines/ms-windows/xp_theme.c
+++ b/modules/engines/ms-windows/xp_theme.c
@@ -165,6 +165,8 @@ static const short element_part_map[XP_THEME_ELEMENT__SIZEOF] = {
TKP_TICSVERT
};
+#define UXTHEME_DLL "uxtheme.dll"
+
static HINSTANCE uxtheme_dll = NULL;
static HTHEME open_themes[XP_THEME_CLASS__SIZEOF];
static gboolean use_xp_theme = FALSE;
@@ -219,12 +221,36 @@ xp_theme_close_open_handles (void)
void
xp_theme_init (void)
{
+ char *buf;
+ char dummy;
+ int n, k;
+
if (uxtheme_dll)
return;
memset (open_themes, 0, sizeof (open_themes));
- uxtheme_dll = LoadLibrary ("uxtheme.dll");
+ n = GetSystemDirectory (&dummy, 0);
+
+ if (n <= 0)
+ return;
+
+ buf = g_malloc (n + 1 + strlen (UXTHEME_DLL));
+ k = GetSystemDirectory (buf, n);
+
+ if (k == 0 || k > n)
+ {
+ g_free (buf);
+ return;
+ }
+
+ if (!G_IS_DIR_SEPARATOR (buf[strlen (buf) -1]))
+ strcat (buf, G_DIR_SEPARATOR_S);
+ strcat (buf, UXTHEME_DLL);
+
+ uxtheme_dll = LoadLibrary (buf);
+ g_free (buf);
+
if (!uxtheme_dll)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]