X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/39934deb5202149f98198c111a35c21cb4d0d0f8..0f2ab471a18ff73cd84c86c1f270d868927fc7d2:/misc.c

diff --git a/misc.c b/misc.c
index 474bf024..fea96a97 100644
--- a/misc.c
+++ b/misc.c
@@ -5,10 +5,44 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <limits.h>
 #include <ctype.h>
 #include <assert.h>
 #include "putty.h"
 
+/*
+ * Parse a string block size specification. This is approximately a
+ * subset of the block size specs supported by GNU fileutils:
+ *  "nk" = n kilobytes
+ *  "nM" = n megabytes
+ *  "nG" = n gigabytes
+ * All numbers are decimal, and suffixes refer to powers of two.
+ * Case-insensitive.
+ */
+unsigned long parse_blocksize(const char *bs)
+{
+    char *suf;
+    unsigned long r = strtoul(bs, &suf, 10);
+    if (*suf != '\0') {
+	while (isspace(*suf)) suf++;
+	switch (*suf) {
+	  case 'k': case 'K':
+	    r *= 1024ul;
+	    break;
+	  case 'm': case 'M':
+	    r *= 1024ul * 1024ul;
+	    break;
+	  case 'g': case 'G':
+	    r *= 1024ul * 1024ul * 1024ul;
+	    break;
+	  case '\0':
+	  default:
+	    break;
+	}
+    }
+    return r;
+}
+
 /* ----------------------------------------------------------------------
  * String handling routines.
  */
@@ -355,14 +389,21 @@ void mlog(char *file, int line)
 }
 #endif
 
-void *safemalloc(size_t size)
+void *safemalloc(size_t n, size_t size)
 {
     void *p;
+
+    if (n > INT_MAX / size) {
+	p = NULL;
+    } else {
+	size *= n;
 #ifdef MINEFIELD
-    p = minefield_c_malloc(size);
+	p = minefield_c_malloc(size);
 #else
-    p = malloc(size);
+	p = malloc(size);
 #endif
+    }
+
     if (!p) {
 	char str[200];
 #ifdef MALLOC_LOG
@@ -382,22 +423,29 @@ void *safemalloc(size_t size)
     return p;
 }
 
-void *saferealloc(void *ptr, size_t size)
+void *saferealloc(void *ptr, size_t n, size_t size)
 {
     void *p;
-    if (!ptr) {
+
+    if (n > INT_MAX / size) {
+	p = NULL;
+    } else {
+	size *= n;
+	if (!ptr) {
 #ifdef MINEFIELD
-	p = minefield_c_malloc(size);
+	    p = minefield_c_malloc(size);
 #else
-	p = malloc(size);
+	    p = malloc(size);
 #endif
-    } else {
+	} else {
 #ifdef MINEFIELD
-	p = minefield_c_realloc(ptr, size);
+	    p = minefield_c_realloc(ptr, size);
 #else
-	p = realloc(ptr, size);
+	    p = realloc(ptr, size);
 #endif
+	}
     }
+
     if (!p) {
 	char str[200];
 #ifdef MALLOC_LOG