diff --git src/base16.c src/base16.c
index 8001cd5..e70c1c5 100644
--- src/base16.c
+++ src/base16.c
@@ -48,7 +48,7 @@ base16_encode(char *src)
     return NULL;
   }               
   
-  memset(dst, len, '\0');
+  memset(dst, len + 1, '\0');
 
   for (i = 0,j = 0; i < (len/2); i++) {
     x1=((unsigned char)src[i])/16;
@@ -69,12 +69,12 @@ base16_decode(char *src)
   unsigned char x1,x2;
 
   len = strlen(src) / 2;
-  ret = malloc(len);
+  ret = malloc(len + 1);
   if (! ret) {
     return NULL;     
   }
 
-  memset(ret, len, '\0');
+  memset(ret, len + 1, '\0');
 
   for ( i=0,j=0; j < len; i+=2,j++ ) {
     x1 = (unsigned char) src[i];
diff --git src/date.c src/date.c
index 0bebe78..c41bc24 100644
--- src/date.c
+++ src/date.c
@@ -148,7 +148,7 @@ date_get(DATE this)
 #define DATESZ 128  
   time_t now;
   char * date;
-  date = malloc(DATESZ);
+  date = malloc(DATESZ+1);
   memset(date, '\0', DATESZ+1);
    
   now = time(NULL);