From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Thu, 30 Sep 2004 11:04:47 +0000 (+0000)
Subject: fixed OGo #936
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0511ccd86fd1269098a593edd248536c4aef4d5e;p=sope

fixed OGo #936


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@204 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 32bc949d..b0b2b16a 100644
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-30  Helge Hess  <helge.hess@skyrix.com>
+
+	* NGMime: fixed OGo buf #936 (v4.3.182)
+
 2004-09-29  Helge Hess  <helge.hess@skyrix.com>
 
 	* NGImap4: minor improvements (v4.3.181)
diff --git a/sope-mime/NGMime/ChangeLog b/sope-mime/NGMime/ChangeLog
index 2929220e..3d47c3a2 100644
--- a/sope-mime/NGMime/ChangeLog
+++ b/sope-mime/NGMime/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-30  Helge Hess  <helge.hess@skyrix.com>
+
+	* NGMimePartParser.m: fixed an issue with unlimited length parsing,
+	  fixes OGo bug #936 (v4.3.182)
+
 2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* NGMime.xcode: Fixed dependencies to resemble the make process
diff --git a/sope-mime/NGMime/NGMimePartParser.h b/sope-mime/NGMime/NGMimePartParser.h
index c1e005f8..6bc08b02 100644
--- a/sope-mime/NGMime/NGMimePartParser.h
+++ b/sope-mime/NGMime/NGMimePartParser.h
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __NGMime_NGMimePartParser_H__
 #define __NGMime_NGMimePartParser_H__
diff --git a/sope-mime/NGMime/NGMimePartParser.m b/sope-mime/NGMime/NGMimePartParser.m
index 53060d19..67f1b4b1 100644
--- a/sope-mime/NGMime/NGMimePartParser.m
+++ b/sope-mime/NGMime/NGMimePartParser.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "NGMimePartParser.h"
 #include "NGMimeBodyParser.h"
@@ -767,12 +766,11 @@ static NSString *fieldNameForCString(id self, char *_cstring, int _len) {
   NGIOReadMethodType readBytes = NULL;
   NSData             *rbody;
   NSMutableData      *body;
-  
   int  bufCnt;
   char buf[self->bufLen];
   void (*appendBytes)(id,SEL,const void *,unsigned);
   BOOL decodeBase64;
-
+  
   *(&readBytes) = NULL;
   
   if ([self->source respondsToSelector:@selector(methodForSelector:)]) {
@@ -796,7 +794,7 @@ static NSString *fieldNameForCString(id self, char *_cstring, int _len) {
   decodeBase64 = NO;
   appendBytes  = (void(*)(id,SEL,const void *, unsigned))
     [body methodForSelector:@selector(appendBytes:length:)];
-
+  
   NS_DURING {
     while (YES) {
       NSException *e;
@@ -838,7 +836,7 @@ static NSString *fieldNameForCString(id self, char *_cstring, int _len) {
       [localException raise];
   }
   NS_ENDHANDLER;
-  if (bufCnt > 0) {
+  if (bufCnt > 0 && bufCnt != NGStreamError) {
     appendBytes(body, @selector(appendBytes:length:), buf, bufCnt);
     bufCnt = 0;
   }
diff --git a/sope-mime/Version b/sope-mime/Version
index d0b11e1a..627cb44f 100644
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -1,7 +1,7 @@
-# $Id$
+# version file
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=3
-SUBMINOR_VERSION:=181
+SUBMINOR_VERSION:=182
 
 # v4.2.149 requires libNGStreams v4.2.34