1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/win32ole/win32ole.c (ole_create_dcom): use the converted

Browse Source 
result if the argument can be converted to a string, to get rid
  of invalid access. Thanks to nobu. [ruby-dev:48467] [Bug #10127]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2014-08-12 12:51:36 +00:00
parent 89901cc760
commit eac5e58bb4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Aug 12 21:49:40 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_create_dcom): use the converted
result if the argument can be converted to a string, to get rid
of invalid access. Thanks to nobu. [ruby-dev:48467] [Bug #10127]
Tue Aug 12 14:22:58 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Tue Aug 12 14:22:58 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* configure.in: ignored working directory same as prefix value. * configure.in: ignored working directory same as prefix value.

10
ext/win32ole/win32ole.c
View File

@ -45,7 +45,7 @@ const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00,
#define NUM2UI8 NUM2UINT #define NUM2UI8 NUM2UINT
#endif #endif
#define WIN32OLE_VERSION "1.7.6" #define WIN32OLE_VERSION "1.7.7"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@ -226,7 +226,7 @@ static VALUE ary_new_dim(VALUE myary, LONG *pid, LONG *plb, LONG dim);
static void ary_store_dim(VALUE myary, LONG *pid, LONG *plb, LONG dim, VALUE val); static void ary_store_dim(VALUE myary, LONG *pid, LONG *plb, LONG dim, VALUE val);
static void ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self); static void ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self);
static HRESULT clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid); static HRESULT clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid);
static VALUE ole_create_dcom(int argc, VALUE *argv, VALUE self); static VALUE ole_create_dcom(VALUE self, VALUE ole, VALUE host, VALUE others);
static VALUE ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self); static VALUE ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self);
static VALUE fole_s_connect(int argc, VALUE *argv, VALUE self); static VALUE fole_s_connect(int argc, VALUE *argv, VALUE self);
static VALUE fole_s_const_load(int argc, VALUE *argv, VALUE self); static VALUE fole_s_const_load(int argc, VALUE *argv, VALUE self);
@ -2288,9 +2288,8 @@ clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
} }
static VALUE static VALUE
ole_create_dcom(int argc, VALUE *argv, VALUE self) ole_create_dcom(VALUE self, VALUE ole, VALUE host, VALUE others)
{ {
VALUE ole, host, others;
HRESULT hr; HRESULT hr;
CLSID clsid; CLSID clsid;
OLECHAR *pbuf; OLECHAR *pbuf;
@ -2308,7 +2307,6 @@ ole_create_dcom(int argc, VALUE *argv, VALUE self)
GetProcAddress(gole32, "CoCreateInstanceEx"); GetProcAddress(gole32, "CoCreateInstanceEx");
if (!gCoCreateInstanceEx) if (!gCoCreateInstanceEx)
rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment"); rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment");
rb_scan_args(argc, argv, "2*", &ole, &host, &others);
pbuf = ole_vstr2wc(ole); pbuf = ole_vstr2wc(ole);
hr = CLSIDFromProgID(pbuf, &clsid); hr = CLSIDFromProgID(pbuf, &clsid);
@ -2898,7 +2896,7 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
rb_raise(rb_eSecurityError, "Insecure Object Creation - %s", rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
StringValuePtr(svr_name)); StringValuePtr(svr_name));
} }
return ole_create_dcom(argc, argv, self); return ole_create_dcom(self, svr_name, host, others);
} }
/* get CLSID from OLE server name */ /* get CLSID from OLE server name */