64bit fixes, possible buffer overrun fixes

Author: Peter McCluskey

Changelog

@@ -1,5 +1,21 @@
 Version Changes for Hypermail
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Peter McCluskey (Oct 1, 2007)
+  Changes from Fumihiro Kato to fix bugs on 64 bit systems and some
+   possible buffer overflow problems.
+  Change in rules about whether to escape urls; it now seems to escape them
+   when found in the middle of the line the same way it has been doing when
+   they are at the start of a line.
+
+ Peter McCluskey (Feb 16, 2007)
+  Changes from Rick van der Zwet:
+   cosmetic = tweaking the interface a small bit (right align, the message 
+   numbers, years in the date listing
+   spamify-domain = obfuscate the body of the message as well (will also 
+   obfuscate 'ssh rick@foo.bar' this of course), moved the domain obfuscate 
+   yes/no to the general to make the function more portable
+ Changes from Mike Fabian changing int to size_t.
+
  Peter McCluskey (Mar 27, 2006)
   Add rel="nofollow" to text message URLs (option txtsuffix = 1).
 

src/parse.c

@@ -914,11 +914,12 @@ static char *mdecodeRFC2047(char *string, int length, char *charsetsave)
 		/* base64 decoding */
 		int len;
 #ifdef HAVE_ICONV
+                size_t tmplen;
 		char *output2;
 		base64Decode(ptr, output, &len);
-		output2=i18n_convstring(output,charset,"UTF-8",&len);
-		memcpy(output,output2,len);
-		output += len;
+		output2=i18n_convstring(output,charset,"UTF-8",&tmplen);
+		memcpy(output,output2,tmplen);
+		output += tmplen;
 		free(output2);
 		memcpy(charsetsave,charset,strlen(charset)<255 ? strlen(charset) : 255 );
 #else

src/printfile.c

@@ -46,7 +46,7 @@ int printfile(FILE *fp, char *format, char *label, char *subject,
     register char *aptr;
     char c;
     char *ptr,*tmpptr=NULL;
-    int tmplen;
+    size_t tmplen;
 
     aptr = format;
 

src/string.c

@@ -100,17 +100,20 @@ char *i18n_canonicalize_charset(char *cs){
 char *i18n_convstring(char *string, char *fromcharset, char *tocharset, size_t *len){
 
   size_t origlen,strleft,bufleft;
+  size_t origbuflen;
   char *convbuf,*origconvbuf;
   iconv_t iconvfd;
   size_t ret;
+  int error;
 
   if (string){
     strleft=origlen=strlen(string);
   }else{
     strleft=origlen=0;
   }
-  origconvbuf=convbuf=malloc(origlen*7+1);
-  memset(origconvbuf,0,origlen*7);
+  origbuflen = origlen*7;
+  origconvbuf=convbuf=malloc(origbuflen+1);
+  memset(origconvbuf,0,origbuflen);
   bufleft=origlen*7;
 
   if (!set_i18n || strcasecmp(fromcharset,tocharset)==0){
@@ -130,7 +133,7 @@ char *i18n_convstring(char *string, char *fromcharset, char *tocharset, size_t *
         printf("I18N: libiconv open error.\n");
       }
     }
-    origlen=sprintf(origconvbuf,"(unknown charset) %s",string);
+    origlen=snprintf(origconvbuf,origbuflen, "(unknown charset) %s",string);
     origconvbuf[origlen]=0x0;
     *len=origlen;
     return origconvbuf;
@@ -140,38 +143,51 @@ char *i18n_convstring(char *string, char *fromcharset, char *tocharset, size_t *
   iconv_close(iconvfd);
 
   if (ret==(size_t)-1){
+    error = 1;
     switch (errno){
     case E2BIG:
       if(set_showprogress){
 	printf("I18N: buffer overflow.\n");
       }
+      origlen=snprintf(origconvbuf, origbuflen,"(buffer overflow) %s",string);
+      error = 1;
       break;
     case EILSEQ:
       if(set_showprogress){
 	printf("I18N: invalid multibyte sequence, from %s to %s: %s.\n",fromcharset,tocharset,string);
       }
-      origlen=sprintf(origconvbuf,"(wrong string) %s",string);
+      origlen=snprintf(origconvbuf, origbuflen,"(wrong string) %s",string);
+      error = 1;
       break;
     case EINVAL:
       if(set_showprogress){
-	printf("I18N: incomplete multibyte sqeuence, from %s to %s: %s.\n",fromcharset,tocharset,string);
+	printf("I18N: incomplete multibyte sequence, from %s to %s: %s.\n",fromcharset,tocharset,string);
       }
-      origlen=sprintf(origconvbuf,"(wrong string) %s",string);
+      origlen=snprintf(origconvbuf, origbuflen,"(wrong string) %s",string);
+      error = 1;
       break;
     }
+  } else {
+    error = 0;
   }
 
-  /* hmm... do we really need to do this? (daigo) */
-  if (strncasecmp(tocharset,"ISO-2022-JP",11)==0){
-    *len=origlen*7-bufleft;
-    *(origconvbuf+*len)=0x1b;
-    *(origconvbuf+*len+1)=0x28;
-    *(origconvbuf+*len+2)=0x42;
-    *len+=3;
-  }else{
-    *len=origlen*7-bufleft;
+  if (error) {
+    origconvbuf[origlen]=0x0;
+    *len=origlen;
+  } else {
+    /* hmm... do we really need to do this? (daigo) */
+    if (strncasecmp(tocharset,"ISO-2022-JP",11)==0){
+      *len=origlen*7-bufleft;
+      *(origconvbuf+*len)=0x1b;
+      *(origconvbuf+*len+1)=0x28;
+      *(origconvbuf+*len+2)=0x42;
+      *len+=3;
+    }else{
+      *len=origlen*7-bufleft;
+    }
+    
+    *(origconvbuf+*len)=0x0;
   }
-  *(origconvbuf+*len)=0x0;
 
   return origconvbuf;
 }
@@ -182,7 +198,7 @@ char *i18n_convstring(char *string, char *fromcharset, char *tocharset, size_t *
 char *i18n_utf2numref(char *instr,int escape){
 
   char *ucs,*headofucs;
-  int len;
+  size_t len;
   struct Push buff;
   char strbuf[10];
 
@@ -196,7 +212,8 @@ char *i18n_utf2numref(char *instr,int escape){
   headofucs=ucs=i18n_convstring(instr, "UTF-8", "UCS-2BE", &len);
 
   unsigned int p;
-  for(;len>0; len-=2){
+  int i = (int) len;
+  for(; i > 0; i-=2){
     p=(unsigned char)*ucs*256+(unsigned char)*(ucs+1);
     if (p<128){
       /* keep ASCII characters human readable */

src/uudecode.c

@@ -103,7 +103,7 @@ int uudecode(FILE *input,	/* get file data from (if needed) */
 	}
 
 	n = DEC(*p);
-	for (++p; n > 0; p += 4, n -= 3) {
+	for (++p; (n > 0) && (outlen < 80); p += 4, n -= 3) {
 	    if (n >= 3) {
 
 		if (!(IS_DEC(*p) && IS_DEC(*(p + 1)) && IS_DEC(*(p + 2)) && IS_DEC(*(p + 3))))