Merge branch 'msantos/erts/cli-abort-on-alloc-fail/PR-948/OTP-13486'

* msantos/erts/cli-abort-on-alloc-fail/PR-948/OTP-13486:
  erts/common: check for OOM on Windows

1 files changed, 18 insertions, 6 deletions

diff --git a/erts/etc/common/erlc.c b/erts/etc/common/erlc.c
index f9d909e01c..08ac40f947 100644
--- a/erts/etc/common/erlc.c
+++ b/erts/etc/common/erlc.c
@@ -71,13 +71,14 @@ static int pause_after_execution = 0;
 
 static char* process_opt(int* pArgc, char*** pArgv, int offset);
 static void error(char* format, ...);
-static char* emalloc(size_t size);
+static void* emalloc(size_t size);
 static char* strsave(char* string);
 static void push_words(char* src);
 static int run_erlang(char* name, char** argv);
 static char* get_default_emulator(char* progname);
 #ifdef __WIN32__
 static char* possibly_quote(char* arg);
+static void* erealloc(void *p, size_t size);
 #endif
 
 /*
@@ -171,10 +172,10 @@ int main(int argc, char** argv)
     int i;
     int len;
     /* Convert argv to utf8 */
-    argv = malloc((argc+1) * sizeof(char*));
+    argv = emalloc((argc+1) * sizeof(char*));
     for (i=0; i<argc; i++) {
 	len = WideCharToMultiByte(CP_UTF8, 0, wcargv[i], -1, NULL, 0, NULL, NULL);
-	argv[i] = malloc(len*sizeof(char));
+	argv[i] = emalloc(len*sizeof(char));
 	WideCharToMultiByte(CP_UTF8, 0, wcargv[i], -1, argv[i], len, NULL, NULL);
     }
     argv[argc] = NULL;
@@ -370,7 +371,7 @@ wchar_t *make_commandline(char **argv)
 	buff = (wchar_t *) emalloc(siz*sizeof(wchar_t));
     } else if (siz < num) {
 	siz = num;
-	buff = (wchar_t *) realloc(buff,siz*sizeof(wchar_t));
+	buff = (wchar_t *) erealloc(buff,siz*sizeof(wchar_t));
     }
     p = buff;
     num=0;
@@ -478,15 +479,26 @@ error(char* format, ...)
     exit(1);
 }
 
-static char*
+static void*
 emalloc(size_t size)
 {
-  char *p = malloc(size);
+  void *p = malloc(size);
   if (p == NULL)
     error("Insufficient memory");
   return p;
 }
 
+#ifdef __WIN32__
+static void *
+erealloc(void *p, size_t size)
+{
+    void *res = realloc(p, size);
+    if (res == NULL)
+    error("Insufficient memory");
+    return res;
+}
+#endif
+
 static char*
 strsave(char* string)
 {