X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=misc.c;h=9c8d203935a862f7e02c5b91f82d37f9e2a9edd4;hb=49d2cf19accb059b3b68d1fc2b78e606a578c3e8;hp=fea96a97a27637ce0f634d1e10b9e19cc774da22;hpb=893d187b81991a7b259ede864b7d18ae60c59589;p=PuTTY.git

diff --git a/misc.c b/misc.c
index fea96a97..9c8d2039 100644
--- a/misc.c
+++ b/misc.c
@@ -24,7 +24,7 @@ unsigned long parse_blocksize(const char *bs)
     char *suf;
     unsigned long r = strtoul(bs, &suf, 10);
     if (*suf != '\0') {
-	while (isspace(*suf)) suf++;
+	while (*suf && isspace((unsigned char)*suf)) suf++;
 	switch (*suf) {
 	  case 'k': case 'K':
 	    r *= 1024ul;
@@ -43,6 +43,50 @@ unsigned long parse_blocksize(const char *bs)
     return r;
 }
 
+/*
+ * Parse a ^C style character specification.
+ * Returns NULL in `next' if we didn't recognise it as a control character,
+ * in which case `c' should be ignored.
+ * The precise current parsing is an oddity inherited from the terminal
+ * answerback-string parsing code. All sequences start with ^; all except
+ * ^<123> are two characters. The ones that are worth keeping are probably:
+ *   ^?		    127
+ *   ^@A-Z[\]^_	    0-31
+ *   a-z	    1-26
+ *   <num>	    specified by number (decimal, 0octal, 0xHEX)
+ *   ~		    ^ escape
+ */
+char ctrlparse(char *s, char **next)
+{
+    char c = 0;
+    if (*s != '^') {
+	*next = NULL;
+    } else {
+	s++;
+	if (*s == '\0') {
+	    *next = NULL;
+	} else if (*s == '<') {
+	    s++;
+	    c = (char)strtol(s, next, 0);
+	    if ((*next == s) || (**next != '>')) {
+		c = 0;
+		*next = NULL;
+	    } else
+		(*next)++;
+	} else if (*s >= 'a' && *s <= 'z') {
+	    c = (*s - ('a' - 1));
+	    *next = s+1;
+	} else if ((*s >= '@' && *s <= '_') || *s == '?' || (*s & 0x80)) {
+	    c = ('@' ^ *s);
+	    *next = s+1;
+	} else if (*s == '~') {
+	    c = '^';
+	    *next = s+1;
+	}
+    }
+    return c;
+}
+
 /* ----------------------------------------------------------------------
  * String handling routines.
  */
@@ -397,6 +441,7 @@ void *safemalloc(size_t n, size_t size)
 	p = NULL;
     } else {
 	size *= n;
+	if (size == 0) size = 1;
 #ifdef MINEFIELD
 	p = minefield_c_malloc(size);
 #else