[evolution/gnome-2-30] Avoid dll hijacking Load sensapi.dll only from system directory where it should normally be and not
- From: Fridrich Strba <strba src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-2-30] Avoid dll hijacking Load sensapi.dll only from system directory where it should normally be and not
- Date: Mon, 13 Sep 2010 21:53:15 +0000 (UTC)
commit 6bcc254b04e0ad1e7f9e29864d678cabb3609511
Author: Fridrich Å trba <fridrich strba bluewin ch>
Date: Mon Sep 13 22:54:19 2010 +0200
Avoid dll hijacking
Load sensapi.dll only from system directory where it should normally
be and not from any random place.
modules/windows-sens/evolution-windows-sens.c | 27 ++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c
index 0f7a69f..e3ef6b7 100644
--- a/modules/windows-sens/evolution-windows-sens.c
+++ b/modules/windows-sens/evolution-windows-sens.c
@@ -457,6 +457,8 @@ static const gchar * add_curly_braces_to_uuid (const gchar * string_uuid)
return curly_braced_uuid_string;
}
+#define SENSAPI_DLL "sensapi.dll"
+
static void
windows_sens_constructed (GObject *object)
{
@@ -549,7 +551,27 @@ windows_sens_constructed (GObject *object)
IsNetworkAlive_t pIsNetworkAlive = NULL;
- HMODULE hDLL=LoadLibrary ("sensapi.dll");
+ char *buf = NULL;
+ char dummy;
+ int n, k;
+ HMODULE hDLL = NULL;
+
+ n = GetSystemDirectory (&dummy, 0);
+
+ if (n <= 0)
+ goto cleanup;
+
+ buf = g_malloc (n + 1 + strlen (SENSAPI_DLL));
+ k = GetSystemDirectory (buf, n);
+
+ if (k == 0 || k > n)
+ goto cleanup;
+
+ if (!G_IS_DIR_SEPARATOR (buf[strlen (buf) -1]))
+ strcat (buf, G_DIR_SEPARATOR_S);
+ strcat (buf, SENSAPI_DLL);
+
+ hDLL=LoadLibrary (buf);
if ((pIsNetworkAlive=(IsNetworkAlive_t) GetProcAddress (hDLL, "IsNetworkAlive"))) {
DWORD Network;
@@ -559,6 +581,9 @@ windows_sens_constructed (GObject *object)
FreeLibrary(hDLL);
e_shell_set_network_available (shell, alive);
+
+cleanup:
+ g_free (buf);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]