From 3c8bc5c15717e5025f803af7ca7399d722e5643d Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 29 Nov 2011 14:18:25 +0000 Subject: [PATCH] Monotone-Parent: c494bd8edc3f42328eeae244084d2d97828732b9 Monotone-Revision: 05b2de9f911d3fd0fc4d6ffdd99cb5e065864668 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-11-29T14:18:25 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ OpenChange/MAPIStoreTypes.m | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7394d3700..8f361f562 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-11-29 Wolfgang Sourdeau + + * OpenChange/MAPIStoreTypes.m (NSObjectFromSPropValue): set the + resulting string to @"" when the unicode or string pointers are + NULL. + 2011-11-28 Wolfgang Sourdeau * OpenChange/MAPIStoreContext.m diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m index ac439bc90..ba8ed926a 100644 --- a/OpenChange/MAPIStoreTypes.m +++ b/OpenChange/MAPIStoreTypes.m @@ -188,10 +188,14 @@ NSObjectFromSPropValue (const struct SPropValue *value) result = [NSNumber numberWithDouble: value->value.dbl]; break; case PT_UNICODE: - result = [NSString stringWithUTF8String: value->value.lpszW]; + result = (value->value.lpszW + ? [NSString stringWithUTF8String: value->value.lpszW] + : @""); break; case PT_STRING8: - result = [NSString stringWithUTF8String: value->value.lpszA]; + result = (value->value.lpszA + ? [NSString stringWithUTF8String: value->value.lpszA] + : @""); break; case PT_SYSTIME: result = [NSCalendarDate dateFromFileTime: &(value->value.ft)];