diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-04-19 16:02:24 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-04-19 16:02:24 +0000 |
| commit | 3213532f305ca9aad647e84c45ecd7784b22a333 (patch) | |
| tree | 0fd25dcacea77ee3136ce4166d1abfba23c40624 | |
| parent | 8e3ad4c75806f3c1456be8c3097899799ab16c47 (diff) | |
2006-04-19 John (J5) Palmieri <johnp@redhat.com>
* mono/Connection.cs, mono/Message.cs: Check Target type
Patch from Aaron Bockover (abockover at novell.com)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | mono/Connection.cs | 2 | ||||
| -rw-r--r-- | mono/Message.cs | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2006-04-19 John (J5) Palmieri <johnp@redhat.com> + + * mono/Connection.cs, mono/Message.cs: Check Target type + Patch from Aaron Bockover (abockover at novell.com) + 2006-04-13 Thiago Macieira <thiago.macieira@trolltech.com> * INSTALL: fine-tune the requirements for the Qt4 binding. diff --git a/mono/Connection.cs b/mono/Connection.cs index af0764db..5413c1c8 100644 --- a/mono/Connection.cs +++ b/mono/Connection.cs @@ -116,7 +116,7 @@ namespace DBus // Maybe we already have a Connection object associated with // this rawConnection then return it IntPtr rawThis = dbus_connection_get_data (rawConnection, slot); - if (rawThis != IntPtr.Zero) { + if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Connection)) { return (DBus.Connection) ((GCHandle)rawThis).Target; } } diff --git a/mono/Message.cs b/mono/Message.cs index 944e3f92..f9556b5d 100644 --- a/mono/Message.cs +++ b/mono/Message.cs @@ -110,7 +110,7 @@ namespace DBus if (slot > -1) { // If we already have a Message object associated with this rawMessage then return it IntPtr rawThis = dbus_message_get_data(rawMessage, slot); - if (rawThis != IntPtr.Zero) + if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Message)) return (DBus.Message) ((GCHandle)rawThis).Target; } // If it doesn't exist then create a new Message around it |