# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1284414429 25200
# Node ID ab87f9070ed280a36bee70172ece6980b3aa4a01
# Parent  fb66d428347d1c740fd614eedfd5c4c2ff7eb37e
fix to ignore embedded objects that are not email messages

diff -r fb66d428347d -r ab87f9070ed2 ChangeLog
--- a/ChangeLog	Thu Sep 02 12:28:01 2010 -0700
+++ b/ChangeLog	Mon Sep 13 14:47:09 2010 -0700
@@ -1,3 +1,7 @@
+LibPST 0.6.49 (2010-09-13)
+===============================
+    * fix to ignore embedded objects that are not email messages
+
 LibPST 0.6.48 (2010-09-02)
 ===============================
     * fix for broken internet headers from Outlook.
diff -r fb66d428347d -r ab87f9070ed2 NEWS
--- a/NEWS	Thu Sep 02 12:28:01 2010 -0700
+++ b/NEWS	Mon Sep 13 14:47:09 2010 -0700
@@ -1,3 +1,4 @@
+0.6.49  2010-09-13 fix to ignore embedded objects that are not email messages
 0.6.48  2010-09-02 fix for broken internet headers from Outlook, change to mboxrd quoting
 0.6.47  2010-05-07 patches from Kenneth Berland for solaris
 0.6.46  2010-02-13 fixes for fedora 13 change in implicit dso linking semantics
diff -r fb66d428347d -r ab87f9070ed2 configure.in
--- a/configure.in	Thu Sep 02 12:28:01 2010 -0700
+++ b/configure.in	Mon Sep 13 14:47:09 2010 -0700
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(libpst,0.6.48,carl@five-ten-sg.com)
+AC_INIT(libpst,0.6.49,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([src/libpst.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
@@ -19,7 +19,7 @@
 #  6. libtool will build libpst.so.x.y.z where the SONAME is libpst.so.x
 #     and x=current-age, y=age, z=revision
 
-libpst_version_info='4:3:0'
+libpst_version_info='4:4:0'
 AC_SUBST(LIBPST_VERSION_INFO, [$libpst_version_info])
 libpst_so_major='4'
 AC_SUBST(LIBPST_SO_MAJOR, [$libpst_so_major])
@@ -33,6 +33,7 @@
 # 0.6.43    libpst.so.4     libpst.so.4.0.1
 # 0.6.47    libpst.so.4     libpst.so.4.0.2
 # 0.6.48    libpst.so.4     libpst.so.4.0.3
+# 0.6.49    libpst.so.4     libpst.so.4.0.4
 
 
 
diff -r fb66d428347d -r ab87f9070ed2 libpst.spec.in
--- a/libpst.spec.in	Thu Sep 02 12:28:01 2010 -0700
+++ b/libpst.spec.in	Mon Sep 13 14:47:09 2010 -0700
@@ -147,6 +147,10 @@
 
 
 %changelog
+* Mon Sep 13 2010 Carl Byington <carl@five-ten-sg.com> - 0.6.49-1
+- fix to ignore embedded objects that are not email messages
+  fedora bugzilla 633498
+
 * Thu Sep 02 2010 Carl Byington <carl@five-ten-sg.com> - 0.6.48-1
 - fix for broken internet headers from Outlook
 - fix ax_python.m4 to look for python2.7
diff -r fb66d428347d -r ab87f9070ed2 src/readpst.c
--- a/src/readpst.c	Thu Sep 02 12:28:01 2010 -0700
+++ b/src/readpst.c	Mon Sep 13 14:47:09 2010 -0700
@@ -1012,9 +1012,13 @@
     if (!item) {
         DEBUG_WARN(("write_embedded_message: pst_parse_item was unable to parse the embedded message in attachment ID %llu", attach->i_id));
     } else {
-        fprintf(f_output, "\n--%s\n", boundary);
-        fprintf(f_output, "Content-Type: %s\n\n", attach->mimetype.str);
-        write_normal_email(f_output, "", item, MODE_NORMAL, 0, pf, 0, extra_mime_headers);
+        if (!item->email) {
+            DEBUG_WARN(("write_embedded_message: pst_parse_item returned type %d, not an email message", item->type));
+        } else {
+            fprintf(f_output, "\n--%s\n", boundary);
+            fprintf(f_output, "Content-Type: %s\n\n", attach->mimetype.str);
+            write_normal_email(f_output, "", item, MODE_NORMAL, 0, pf, 0, extra_mime_headers);
+        }
         pst_freeItem(item);
     }