diff --git a/ChangeLog b/ChangeLog index ab5031f616..05b82c4ae7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,13 @@ -Fri Dec 26 14:51:34 2014 Nobuyoshi Nakada +Fri Dec 26 15:09:08 2014 Nobuyoshi Nakada + + * process.c (rb_spawn_process): get rid of usage of uninitialized + variable. + reported by Denis Denisov . + + * regexec.c (match_at): ditto. + + * ext/win32ole/win32ole.c (ole_wc2mb_alloc, ole_vstr2wc, ole_mb2wc): + ditto. * dir.c (ruby_glob0): no need to check never-NULL pointer. reported by Denis Denisov . 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); diff --git a/process.c b/process.c index 25cdc1605b..2a5ed993bf 100644 --- a/process.c +++ b/process.c @@ -3910,6 +3910,7 @@ rb_spawn_process(struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen) } status = system(StringValuePtr(prog)); rb_last_status_set((status & 0xff) << 8, 0); + pid = 1; /* dummy */ # endif rb_execarg_run_options(&sarg, NULL, errmsg, errmsg_buflen); diff --git a/regexec.c b/regexec.c index 1ec337fdc1..299c3161a5 100644 --- a/regexec.c +++ b/regexec.c @@ -1408,8 +1408,9 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, int len; fprintf(stderr, "%4"PRIdPTR"> \"", (*p == OP_FINISH) ? (ptrdiff_t )-1 : s - str); bp = buf; + q = s; if (*p != OP_FINISH) { /* s may not be a valid pointer if OP_FINISH. */ - for (i = 0, q = s; i < 7 && q < end; i++) { + for (i = 0; i < 7 && q < end; i++) { len = enclen(encode, q, end); while (len-- > 0) *bp++ = *q++; }