summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorsuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-01-13 14:59:17 +0000
committersuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-01-13 14:59:17 +0000
commit6f910a6fa17ff86990abfda9ea25895ddc6ea96c (patch)
treef5275b482467e709bed947e364fa452e7f1438aa /ext
parent5c4ae9d745d0b3e63e23dcd09838af27c9164254 (diff)
fix memory leak of win32ole.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/win32ole/win32ole.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 6b7d256..40b8d1d 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);
}
}