diff options
author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-13 02:28:47 +0000 |
---|---|---|
committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-13 02:28:47 +0000 |
commit | 5b800bef9e56ae937359b025a26e3658baf7e649 (patch) | |
tree | c5e776f9c3edffca02f6ae9ebd32a9011aec2fb4 /ext | |
parent | da7475b00daab9e2128f9c70c098db0c2b51f443 (diff) | |
download | ruby-5b800bef9e56ae937359b025a26e3658baf7e649.tar.gz |
* 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
Diffstat (limited to 'ext')
-rw-r--r-- | ext/win32ole/win32ole.c | 2 | ||||
-rw-r--r-- | ext/win32ole/win32ole_event.c | 6 |
2 files changed, 7 insertions, 1 deletions
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; } |