Author: wlux
Date: Fri Sep 16 14:28:05 2016
New Revision: 40086
URL: http://svn.gna.org/viewcvs/gnustep?rev=40086&view=rev
Log:
Add missing checks to avoid calling caseInsensitiveCompare: with nil
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Source/Additions/GSMime.m
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=40086&r1=40085&r2=40086&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Fri Sep 16 14:28:05 2016
@@ -1,3 +1,9 @@
+2016-09-16 Wolfgang Lux <[email protected]>
+
+ * Source/Additions/GSMime.m (convertTo7BitSafe):
+ Add missing checks to avoid calling caseInsensitiveCompare: with a
+ nil argument.
+
2016-09-16 Niels Grewe <[email protected]>
* Source/GSTLS.m: Fix bug removing mapped certificates.
Modified: libs/base/trunk/Source/Additions/GSMime.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/Additions/GSMime.m?rev=40086&r1=40085&r2=40086&view=diff
==============================================================================
--- libs/base/trunk/Source/Additions/GSMime.m (original)
+++ libs/base/trunk/Source/Additions/GSMime.m Fri Sep 16 14:28:05 2016
@@ -5854,8 +5854,9 @@
* When there is a header, there are trwo possible 8bit encodings
* that we need to deal with...
*/
- if ([CteBinary caseInsensitiveCompare: v] == NSOrderedSame
- || [Cte8bit caseInsensitiveCompare: v] == NSOrderedSame)
+ if (v != nil
+ && ([CteBinary caseInsensitiveCompare: v] == NSOrderedSame
+ || [Cte8bit caseInsensitiveCompare: v] == NSOrderedSame))
{
GSMimeHeader *t = [self headerNamed: @"content-type"];
NSString *charset = [t parameterForKey: @"charset"];
@@ -5945,8 +5946,9 @@
GSMimeHeader *h = [self headerNamed: @"content-transfer-encoding"];
NSString *v = [h value];
- if ([CteBase64 caseInsensitiveCompare: v] == NSOrderedSame
- || [CteQuotedPrintable caseInsensitiveCompare: v] == NSOrderedSame)
+ if (v != nil
+ && ([CteBase64 caseInsensitiveCompare: v] == NSOrderedSame
+ || [CteQuotedPrintable caseInsensitiveCompare: v] == NSOrderedSame))
{
[h setValue: CteBinary];
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
