From 5b800bef9e56ae937359b025a26e3658baf7e649 Mon Sep 17 00:00:00 2001
From: suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 13 Sep 2014 02:28:47 +0000
Subject: * ext/win32ole/win32ole_event.c(ev_advise, ole_event_free,  
 fev_s_allocate, fev_unadvise): avoid segmentation fault when COM   server
 freed before calling Unadvise from WIN32OLE_EVENT object. *
 ext/win32ole/win32ole.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                     | 7 +++++++
 ext/win32ole/win32ole.c       | 2 +-
 ext/win32ole/win32ole_event.c | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a796878681..76a02ee598 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Sep 13 11:16:58 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_event.c(ev_advise, ole_event_free,
+	  fev_s_allocate, fev_unadvise): avoid segmentation fault when COM
+	  server freed before calling Unadvise from WIN32OLE_EVENT object.
+	* ext/win32ole/win32ole.c: ditto.
+
 Sat Sep 13 09:47:44 2014  Eric Wong  <e@80x24.org>
 
 	* man/ruby.1: use https for *.ruby-lang.org links
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 3e037c52d8..a99bff2257 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -26,7 +26,7 @@
 const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, 0xC0, 0x4F, 0x8F, 0x5D, 0x9A}};
 #endif
 
-#define WIN32OLE_VERSION "1.8.1"
+#define WIN32OLE_VERSION "1.8.2"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
diff --git a/ext/win32ole/win32ole_event.c b/ext/win32ole/win32ole_event.c
index 00aabd20b8..55b884ff1b 100644
--- a/ext/win32ole/win32ole_event.c
+++ b/ext/win32ole/win32ole_event.c
@@ -58,6 +58,7 @@ typedef struct tagIEVENTSINKOBJ {
 struct oleeventdata {
     DWORD dwCookie;
     IConnectionPoint *pConnectionPoint;
+    IDispatch *pDispatch;
     long event_id;
 };
 
@@ -857,6 +858,7 @@ ole_event_free(struct oleeventdata *poleev)
         OLE_RELEASE(poleev->pConnectionPoint);
         poleev->pConnectionPoint = NULL;
     }
+    OLE_RELEASE(poleev->pDispatch);
     free(poleev);
 }
 
@@ -869,6 +871,7 @@ fev_s_allocate(VALUE klass)
     poleev->dwCookie = 0;
     poleev->pConnectionPoint = NULL;
     poleev->event_id = 0;
+    poleev->pDispatch = NULL;
     return obj;
 }
 
@@ -946,6 +949,8 @@ ev_advise(int argc, VALUE *argv, VALUE self)
     poleev->dwCookie = dwCookie;
     poleev->pConnectionPoint = pConnectionPoint;
     poleev->event_id = pIEV->m_event_id;
+    poleev->pDispatch = pDispatch;
+    OLE_ADDREF(pDispatch);
 
     return self;
 }
@@ -1147,6 +1152,7 @@ fev_unadvise(VALUE self)
         OLE_RELEASE(poleev->pConnectionPoint);
         poleev->pConnectionPoint = NULL;
     }
+    OLE_FREE(poleev->pDispatch);
     return Qnil;
 }
 
-- 
cgit v1.2.3