From f9c1d3425b54c2ca3f7799362cd73d7e00f1ce03 Mon Sep 17 00:00:00 2001 From: suke Date: Sat, 13 Jan 2007 22:57:47 +0000 Subject: fix memory leak of win32ole. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/win32ole/win32ole.c | 13 ++++++++++++- version.h | 6 +++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 974c94bdcc..f1d63d91f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jan 14 07:26:44 2007 Masaki Suketa + + * ext/win32ole/win32ole.c (ole_free, ole_type_free, + olemethod_free, olevariable_free, oleparam_free, + ole_event_free): fix memory leak. [ruby-core:09846] + Tue Jan 9 12:29:20 2007 Nobuyoshi Nakada * ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 6b7d2569d3..a15794d0f2 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -78,7 +78,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 +633,7 @@ ole_free(pole) struct oledata *pole; { OLE_FREE(pole->pDispatch); + free(pole); } static void @@ -640,6 +641,7 @@ oletype_free(poletype) struct oletypedata *poletype; { OLE_FREE(poletype->pTypeInfo); + free(poletype); } static void @@ -648,6 +650,7 @@ olemethod_free(polemethod) { OLE_FREE(polemethod->pTypeInfo); OLE_FREE(polemethod->pOwnerTypeInfo); + free(polemethod); } static void @@ -655,6 +658,7 @@ olevariable_free(polevar) struct olevariabledata *polevar; { OLE_FREE(polevar->pTypeInfo); + free(polevar); } static void @@ -662,6 +666,7 @@ oleparam_free(pole) struct oleparamdata *pole; { OLE_FREE(pole->pTypeInfo); + free(pole); } static LPWSTR @@ -5871,6 +5876,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 +5891,7 @@ ole_event_free(poleev) pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie); OLE_RELEASE(pcp); } + free(poleev); } } diff --git a/version.h b/version.h index abbb609270..7a00bdf2bd 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2007-01-09" +#define RUBY_RELEASE_DATE "2007-01-14" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20070109 +#define RUBY_RELEASE_CODE 20070114 #define RUBY_PATCHLEVEL 14 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 14 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; -- cgit v1.2.3