summaryrefslogtreecommitdiff
path: root/ext/win32ole/win32ole.c
diff options
context:
space:
mode:
authorsuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-16 14:14:56 +0000
committersuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-16 14:14:56 +0000
commitb1d1b1b1d35b129da06e54cc98972d6e25d4a0ba (patch)
tree9553d2e4957a14f37327168b53b24509b7ea3c8e /ext/win32ole/win32ole.c
parent6291abe61e8a363ad176ff1324f57f9915b48108 (diff)
fix bug in ext/win32ole/sample/ienavi.rb
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole/win32ole.c')
-rw-r--r--ext/win32ole/win32ole.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 56580183fa..a463d3ccc7 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.3"
+#define WIN32OLE_VERSION "0.6.4"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -4878,7 +4878,9 @@ ole_search_event_at(ary, ev)
ret = i;
break;
}
- else if (rb_str_cmp(ev, event_name) == 0) {
+ else if (TYPE(ev) == T_STRING &&
+ TYPE(event_name) == T_STRING &&
+ rb_str_cmp(ev, event_name) == 0) {
ret = i;
break;
}
@@ -5453,7 +5455,7 @@ add_event_call_back(obj, event, data)
rb_ivar_set(obj, id_events, events);
}
at = ole_search_event_at(events, event);
- if (at >= -1) {
+ if (at > -1) {
rb_ary_delete_at(events, at);
}
rb_ary_push(events, data);