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

* ext/win32ole/win32ole.c (ole_wc2mb, reg_enum_key): allocate

Browse Source 
buffer should be NULL terminated.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2007-08-25 21:57:46 +00:00
parent 2ca7ad139f
commit 71e6011d63
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Aug 26 06:51:46 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_wc2mb, reg_enum_key): allocate
buffer should be NULL terminated.
Sun Aug 26 06:04:13 2007 Koichi Sasada <ko1@atdot.net> Sun Aug 26 06:04:13 2007 Koichi Sasada <ko1@atdot.net>
* insnhelper.ci (vm_setup_method): reorder code for branch prediction. * insnhelper.ci (vm_setup_method): reorder code for branch prediction.

8
ext/win32ole/win32ole.c
View File

@ -116,7 +116,7 @@
#define WC2VSTR(x) ole_wc2vstr((x), TRUE) #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
#define WIN32OLE_VERSION "1.0.4" #define WIN32OLE_VERSION "1.0.5"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@ -768,8 +768,9 @@ ole_wc2mb(LPWSTR pw)
LPSTR pm; LPSTR pm;
size = WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, NULL, 0, NULL, NULL); size = WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, NULL, 0, NULL, NULL);
if (size) { if (size) {
pm = ALLOC_N(char, size); pm = ALLOC_N(char, size + 1);
WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, pm, size, NULL, NULL); WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, pm, size, NULL, NULL);
pm[size] = '\0';
} }
else { else {
pm = ALLOC_N(char, 1); pm = ALLOC_N(char, 1);
@ -1913,12 +1914,13 @@ reg_open_vkey(HKEY hkey, VALUE key, HKEY *phkey)
static VALUE static VALUE
reg_enum_key(HKEY hkey, DWORD i) reg_enum_key(HKEY hkey, DWORD i)
{ {
char buf[BUFSIZ]; char buf[BUFSIZ + 1];
DWORD size_buf = sizeof(buf); DWORD size_buf = sizeof(buf);
FILETIME ft; FILETIME ft;
LONG err = RegEnumKeyEx(hkey, i, buf, &size_buf, LONG err = RegEnumKeyEx(hkey, i, buf, &size_buf,
NULL, NULL, NULL, &ft); NULL, NULL, NULL, &ft);
if(err == ERROR_SUCCESS) { if(err == ERROR_SUCCESS) {
buf[BUFSIZ] = '\0';
return rb_str_new2(buf); return rb_str_new2(buf);
} }
return Qnil; return Qnil;