diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-26 06:09:11 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-26 06:09:11 +0000 |
| commit | 1db0393eb132ff6ecb85747d4a440072755959f8 (patch) | |
| tree | a4c8f02c363a1a0c8faee609639b27dc7d6aa818 /ext/win32ole/win32ole.c | |
| parent | 859f3d14eda5ecd59ed7a7172dc63cdfa2acba92 (diff) | |
uninitialized variable
* process.c (rb_spawn_process): get rid of usage of uninitialized
variable.
reported by Denis Denisov <denji0k AT gmail.com>.
* regexec.c (match_at): ditto.
* ext/win32ole/win32ole.c (ole_wc2mb_alloc, ole_vstr2wc, ole_mb2wc):
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole/win32ole.c')
| -rw-r--r-- | ext/win32ole/win32ole.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 9daa8554ba..582ff32c78 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -579,11 +579,13 @@ load_conv_function51932(void) pIMultiLanguage = p; } } +#define need_conv_function51932() (load_conv_function51932(), 1) #else #define load_conv_function51932() failed_load_conv51932() +#define need_conv_function51932() (failed_load_conv51932(), 0) #endif -#define conv_51932(cp) ((cp) == 51932 && (load_conv_function51932(), 1)) +#define conv_51932(cp) ((cp) == 51932 && need_conv_function51932()) static void set_ole_codepage(UINT cp) @@ -711,8 +713,8 @@ ole_wc2mb_alloc(LPWSTR pw, char *(alloc)(UINT size, void *arg), void *arg) ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp); } pm[size] = '\0'; + return pm; #endif - return pm; } size = WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, NULL, 0, NULL, NULL); if (size) { @@ -893,8 +895,8 @@ ole_vstr2wc(VALUE vstr) if (FAILED(hr)) { ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp); } -#endif return pw; +#endif } size = MultiByteToWideChar(cp, 0, RSTRING_PTR(vstr), RSTRING_LEN(vstr), NULL, 0); pw = SysAllocStringLen(NULL, size); @@ -923,8 +925,8 @@ ole_mb2wc(char *pm, int len) if (FAILED(hr)) { ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cWIN32OLE_cp); } -#endif return pw; +#endif } size = MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, NULL, 0); pw = SysAllocStringLen(NULL, size - 1); |