X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d0912d1f5b4c65b0be0c3fba2a264a1cfbf96d08..a5dd84675905dfc4274cf45424e6f3a9e385e1a7:/misc.c

diff --git a/misc.c b/misc.c
index 8edb41a8..09e6db57 100644
--- a/misc.c
+++ b/misc.c
@@ -11,9 +11,12 @@
 
 char *dupstr(const char *s)
 {
-    int len = strlen(s);
-    char *p = smalloc(len + 1);
-    strcpy(p, s);
+    char *p = NULL;
+    if (s) {
+        int len = strlen(s);
+        p = snewn(len + 1, char);
+        strcpy(p, s);
+    }
     return p;
 }
 
@@ -34,7 +37,7 @@ char *dupcat(const char *s1, ...)
     }
     va_end(ap);
 
-    p = smalloc(len + 1);
+    p = snewn(len + 1, char);
     strcpy(p, s1);
     q = p + strlen(p);
 
@@ -76,7 +79,7 @@ char *dupvprintf(const char *fmt, va_list ap)
     char *buf;
     int len, size;
 
-    buf = smalloc(512);
+    buf = snewn(512, char);
     size = 512;
 
     while (1) {
@@ -97,7 +100,7 @@ char *dupvprintf(const char *fmt, va_list ap)
 	     * buffer wasn't big enough, so we enlarge it a bit and hope. */
 	    size += 512;
 	}
-	buf = srealloc(buf, size);
+	buf = sresize(buf, size, char);
     }
 }
 
@@ -178,6 +181,8 @@ void bufchain_add(bufchain *ch, const void *data, int len)
 {
     const char *buf = (const char *)data;
 
+    if (len == 0) return;
+
     ch->buffersize += len;
 
     if (ch->tail && ch->tail->buflen < BUFFER_GRANULE) {
@@ -190,7 +195,7 @@ void bufchain_add(bufchain *ch, const void *data, int len)
     while (len > 0) {
 	int grainlen = min(len, BUFFER_GRANULE);
 	struct bufchain_granule *newbuf;
-	newbuf = smalloc(sizeof(struct bufchain_granule));
+	newbuf = snew(struct bufchain_granule);
 	newbuf->bufpos = 0;
 	newbuf->buflen = grainlen;
 	memcpy(newbuf->buf, buf, grainlen);