Release-1.8.3.1-20130402

1 files changed, 18 insertions, 10 deletions

diff --git a/src/growbuf.h b/src/growbuf.h
index f1bf315..bc8e4b5 100644
--- a/src/growbuf.h
+++ b/src/growbuf.h
@@ -4,6 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define GROW_AMOUNT 1024
+
 /** Class representing a string buffer optimised for growing. */
 class GrowBuf
 {
@@ -11,21 +13,27 @@ class GrowBuf
     GrowBuf() : str(0), pos(0), len(0) {}
    ~GrowBuf()         { free(str); str=0; pos=0; len=0; }
     void clear()      { pos=0; }
-    void addChar(char c)  { if (pos>=len) { len+=1024; str = (char*)realloc(str,len); } 
+    void addChar(char c)  { if (pos>=len) { len+=GROW_AMOUNT; str = (char*)realloc(str,len); } 
                         str[pos++]=c; 
                       }
     void addStr(const char *s) {
-                        int l=strlen(s);
-                        if (pos+l>=len) { len+=l+1024; str = (char*)realloc(str,len); }
-                        strcpy(&str[pos],s);
-                        pos+=l;
+                        if (s)
+                        {
+                          int l=strlen(s);
+                          if (pos+l>=len) { len+=l+GROW_AMOUNT; str = (char*)realloc(str,len); }
+                          strcpy(&str[pos],s);
+                          pos+=l;
+                        }
                       }
     void addStr(const char *s,int n) {
-                        int l=strlen(s);
-                        if (n<l) l=n;
-                        if (pos+l>=len) { len+=l+1024; str = (char*)realloc(str,len); }
-                        strncpy(&str[pos],s,n);
-                        pos+=l;
+                        if (s)
+                        {
+                          int l=strlen(s);
+                          if (n<l) l=n;
+                          if (pos+l>=len) { len+=l+GROW_AMOUNT; str = (char*)realloc(str,len); }
+                          strncpy(&str[pos],s,n);
+                          pos+=l;
+                        }
                       }
     const char *get()     { return str; }
     int getPos() const    { return pos; }