diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-01-13 14:59:17 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-01-13 14:59:17 +0000 |
| commit | 90a64de5776686789ad25c38ed76e7ec205428b8 (patch) | |
| tree | f5275b482467e709bed947e364fa452e7f1438aa /ext | |
| parent | 862b00a0a1e3199f6310229d0755c3dde648f680 (diff) | |
| download | ruby-90a64de5776686789ad25c38ed76e7ec205428b8.tar.gz ruby-90a64de5776686789ad25c38ed76e7ec205428b8.tar.xz ruby-90a64de5776686789ad25c38ed76e7ec205428b8.zip | |
fix memory leak of win32ole.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/win32ole/win32ole.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 6b7d2569d..40b8d1d67 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -30,6 +30,9 @@ #define va_init_list(a,b) va_start(a) #endif +#include <stdlib.h> +#include <crtdbg.h> + #define DOUT fprintf(stderr,"[%d]\n",__LINE__) #define DOUTS(x) fprintf(stderr,"[%d]:" #x "=%s\n",__LINE__,x) #define DOUTMSG(x) fprintf(stderr, "[%d]:" #x "\n",__LINE__) @@ -78,7 +81,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "0.6.9" +#define WIN32OLE_VERSION "0.7.0" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -633,6 +636,7 @@ ole_free(pole) struct oledata *pole; { OLE_FREE(pole->pDispatch); + free(pole); } static void @@ -640,6 +644,7 @@ oletype_free(poletype) struct oletypedata *poletype; { OLE_FREE(poletype->pTypeInfo); + free(poletype); } static void @@ -648,6 +653,7 @@ olemethod_free(polemethod) { OLE_FREE(polemethod->pTypeInfo); OLE_FREE(polemethod->pOwnerTypeInfo); + free(polemethod); } static void @@ -655,6 +661,7 @@ olevariable_free(polevar) struct olevariabledata *polevar; { OLE_FREE(polevar->pTypeInfo); + free(polevar); } static void @@ -662,6 +669,7 @@ oleparam_free(pole) struct oleparamdata *pole; { OLE_FREE(pole->pTypeInfo); + free(pole); } static LPWSTR @@ -5871,6 +5879,11 @@ ole_event_free(poleev) IConnectionPoint *pcp = NULL; if (poleev->freed == 1) { + /* + * this return create memory leak. + * but poleev->pEvent->pConnectionPoint shoul'd not be freed + * until poleev-> freed == 0. + */ return; } if(poleev->pEvent) { @@ -5881,6 +5894,7 @@ ole_event_free(poleev) pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie); OLE_RELEASE(pcp); } + free(poleev); } } |