From 86c8f508ae9f7aa1de082768adfc2a2aaf496d8b Mon Sep 17 00:00:00 2001
From: CaS <CaS@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 21 Jun 2002 17:06:50 +0000
Subject: [PATCH] Minor checks added

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13925 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                 |  6 +++
 Source/Additions/GSMime.m | 79 +++++++++++++++++++++++++++++----------
 2 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ff9bdede..33efeb893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-21  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSMime.m: add a few consistency checks to raise an exception
+	if we try to unparse a GSMimeDocument with inconsistent headers and
+	content.
+
 2002-06-19  Adam Fedor  <fedor@gnu.org>
 
 	* Source/GSLocale.m (GSSetLocaleC): Only set locale for LC_CTYPE.
diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index 5651a32da..de428e65f 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -2588,25 +2588,33 @@ static NSCharacterSet	*tokenSet = nil;
   BOOL		conv = YES;
 
   /*
-   * Capitalise the header name.
+   * Capitalise the header name.  However, the version header is a special
+   * case - it is defined as being literally 'MIME-Version'
    */
   memcpy(buf, [d bytes], l);
-  while (i < l)
+  if (l == 12 && memcmp(buf, "MIME-Version", 12) == 0)
     {
-      if (conv == YES)
-        {
-	  if (islower(buf[i]))
+      memcpy(buf, "MIME-Version", 12);
+    }
+  else
+    {
+      while (i < l)
+	{
+	  if (conv == YES)
 	    {
-	      buf[i] = toupper(buf[i]);
+	      if (islower(buf[i]))
+		{
+		  buf[i] = toupper(buf[i]);
+		}
+	    }
+	  if (buf[i++] == '-')
+	    {
+	      conv = YES;
+	    }
+	  else
+	    {
+	      conv = NO;
 	    }
-	}
-      if (buf[i++] == '-')
-        {
-	  conv = YES;
-	}
-      else
-        {
-	  conv = NO;
 	}
     }
   [md appendBytes: buf length: l];
@@ -3532,6 +3540,7 @@ static NSCharacterSet	*tokenSet = nil;
   GSMimeHeader	*enc;
   GSMimeHeader	*hdr;
   NSData	*boundary;
+  BOOL		is7bit = YES;
 
   if (isOuter == YES)
     {
@@ -3592,11 +3601,26 @@ static NSCharacterSet	*tokenSet = nil;
       NSString	*v;
 
       enc = [self headerNamed: @"content-transfer-encoding"];
-      if (enc != nil)
+      if (enc == nil)
+        {
+	  enc = [GSMimeHeader alloc];
+	  enc = [enc initWithName: @"content-transfer-encoding"
+			    value: @"7bit"
+		       parameters: nil];
+	  [self addHeader: enc];
+	  RELEASE(enc);
+	}
+      else
 	{
-	  [NSException raise: NSInternalInconsistencyException
-	    format: @"[%@ -%@:] content transfer encoding not supported",
-	    NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
+	  v = [enc value];
+	  if ((is7bit = [v isEqual: @"7bit"]) == NO
+	    && [v isEqual: @"8bit"] == NO && [v isEqual: @"binary"] == NO)
+	    {
+	      [NSException raise: NSInternalInconsistencyException
+		format: @"[%@ -%@:] %@ illegal for multipart",
+		NSStringFromClass([self class]), NSStringFromSelector(_cmd),
+		v];
+	    }
 	}
       v = [type parameterForKey: @"boundary"];
       if (v == nil)
@@ -3675,9 +3699,24 @@ static NSCharacterSet	*tokenSet = nil;
       for (i = 0; i < count; i++)
 	{
 	  CREATE_AUTORELEASE_POOL(arp);
-	  NSMutableData	*part = [[content objectAtIndex: i] rawMimeData: NO];
+	  GSMimeDocument	*part = [content objectAtIndex: i];
+	  NSMutableData		*rawPart = [part rawMimeData: NO];
 
-	  [md appendData: part];
+	  if (is7bit == YES)
+	    {
+	      NSString	*v;
+
+	      enc = [part headerNamed: @"content-transport-encoding"];
+	      v = [enc value];
+	      if (v != nil && ([v isEqual: @"8bit"] || [v isEqual: @"binary"]))
+	        {
+		  [NSException raise: NSInternalInconsistencyException
+		    format: @"[%@ -%@:] bad part encoding for 7bit container",
+		    NSStringFromClass([self class]),
+		    NSStringFromSelector(_cmd)];
+		}
+	    }
+	  [md appendData: rawPart];
 	  [md appendBytes: "\r\n--" length: 4];
 	  [md appendData: boundary];
 	  [md appendBytes: "\r\n" length: 2];