summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--win32/file.c7
-rw-r--r--win32/stub.c7
3 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e24fc5..06f0ca4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-Fri Dec 26 14:33:01 2014 Nobuyoshi Nakada <nobu@ruby.local>
+Fri Dec 26 14:48:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/file.c (code_page_i): handle realloc failure.
+ reported by Denis Denisov <denji0k AT gmail.com>.
+
+ * win32/stub.c (stub_sysinit): ditto.
* fix printf format conversion specifiers.
reported by Denis Denisov <denji0k AT gmail.com>.
diff --git a/win32/file.c b/win32/file.c
index a50d6d8..e2b7f93 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -160,8 +160,11 @@ code_page_i(st_data_t name, st_data_t idx, st_data_t arg)
USHORT *table = cp->table;
if (count <= idx) {
unsigned int i = count;
- cp->count = count = (((idx + 4) & ~31) | 28);
- cp->table = table = realloc(table, count * sizeof(*table));
+ count = (((idx + 4) & ~31) | 28);
+ table = realloc(table, count * sizeof(*table));
+ if (!table) return ST_CONTINUE;
+ cp->count = count;
+ cp->table = table;
while (i < count) table[i++] = INVALID_CODE_PAGE;
}
table[idx] = (USHORT)code_page;
diff --git a/win32/stub.c b/win32/stub.c
index fc82d73..3960024 100644
--- a/win32/stub.c
+++ b/win32/stub.c
@@ -21,7 +21,12 @@ stub_sysinit(int *argc, char ***argv)
for (i = 1; i < ac; ++i) {
lenall += strlen(av[i]) + 1;
}
- *argv = av = realloc(av, lenall + (lenexe + 1) * 2 + sizeof(char *) * (i + 2));
+ av = realloc(av, lenall + (lenexe + 1) * 2 + sizeof(char *) * (i + 2));
+ if (!av) {
+ perror("realloc command line");
+ exit(-1);
+ }
+ *argv = av;
*argc = ++ac;
p = (char *)(av + i + 2);
memmove(p + (lenexe + 1) * 2, (char *)(av + ac) + len0, lenall);