aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-07-02 05:54:49 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-07-02 05:54:49 +0800
commit97c10cb025027d60e82691ddfe7090e64f1113f5 (patch)
treef7ee82b83fc35027a3a7a54d3963871883f05a62
parenta6e1e46e4a3fe25796bdd7ebcbe5ed26cf7e7721 (diff)
downloadgsoc2013-evolution-97c10cb025027d60e82691ddfe7090e64f1113f5.tar
gsoc2013-evolution-97c10cb025027d60e82691ddfe7090e64f1113f5.tar.gz
gsoc2013-evolution-97c10cb025027d60e82691ddfe7090e64f1113f5.tar.bz2
gsoc2013-evolution-97c10cb025027d60e82691ddfe7090e64f1113f5.tar.lz
gsoc2013-evolution-97c10cb025027d60e82691ddfe7090e64f1113f5.tar.xz
gsoc2013-evolution-97c10cb025027d60e82691ddfe7090e64f1113f5.tar.zst
gsoc2013-evolution-97c10cb025027d60e82691ddfe7090e64f1113f5.zip
Make sure that cid is non-NULL.
2002-07-01 Jeffrey Stedfast <fejj@ximian.com> * mail-format.c (handle_multipart_related): Make sure that cid is non-NULL. svn path=/trunk/; revision=17338
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-format.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 849ed97315..a0f6e9dc7f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-01 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-format.c (handle_multipart_related): Make sure that cid is
+ non-NULL.
+
2002-07-01 Not Zed <NotZed@Ximian.com>
* mail-folder-cache.c (folder_deleted): Removed. The
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 39d6ec7f84..6b02a17a7f 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1926,7 +1926,7 @@ handle_multipart_related (CamelMimePart *part, const char *mime_type,
body_part = camel_multipart_get_part (mp, i);
cid = camel_mime_part_get_content_id (body_part);
- if (!strncmp (cid, start + 1, len) &&
+ if (cid && !strncmp (cid, start + 1, len) &&
strlen (cid) == len) {
display_part = body_part;
break;