talons

commit 463abe4effd5dedc7e41332a6f9cbe185f0bb738
parent 52551ae80da337c0d266374b154b118d535befd7
Author: Michael Rasmussen <mir@datanom.net>
Date:   Tue, 14 Jul 2015 20:57:00 +0200

Added FreeBSD patch, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=167460. Fixes claws-mail bug #3457

Diffstat:
M
src/plugins/tnef_parse/ytnef.c
 | 
9
+++++++++

1 file changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/plugins/tnef_parse/ytnef.c b/src/plugins/tnef_parse/ytnef.c
@@ -444,6 +444,13 @@ void TNEFFillMapi(TNEFStruct *TNEF, BYTE *data, DWORD size, MAPIProps *p) {
                 d += num + ((num % 4) ? (4 - num%4) : 0);
                 break;
 
+	    case PT_CLSID:
+		vl->size = 16; /* Size of struct GUID */
+		vl->data = calloc(vl->size, sizeof(WORD));
+		memcpy(vl->data, &d, vl->size);
+		d += 16; /* Size of struct GUID */
+		break;
+
             case PT_I2:
                 // Read in 2 bytes, but proceed by 4 bytes
                 vl->size = 2;
@@ -473,6 +480,8 @@ void TNEFFillMapi(TNEFStruct *TNEF, BYTE *data, DWORD size, MAPIProps *p) {
                 memcpy(vl->data, &temp_ddword, vl->size);
                 d+=8;
                 break;
+	    default:
+		fprintf(stderr, "%s: Fatal BUG: unknown MAPI ID type (%u), (%u)\n", __func__, PROP_TYPE(mp->id), mp->id);
         }
         if (count == (mp->count-1)) {
             count = -1;