From 7264d4f88d70cb7c7b190cd7873df96aba546c49 Mon Sep 17 00:00:00 2001
From: bagyenda <>
Date: Mon, 12 May 2008 18:11:16 +0000
Subject: [PATCH] minor bug fix: unbase64

---
 mbuni/mmlib/mms_util.c | 3 +--
 mbuni/mmlib/mms_util.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c
index fc53ab0..36a7225 100644
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@@ -1025,8 +1025,7 @@ void _mms_fixup_address(Octstr **address, char *unified_prefix, List *strip_pref
 	  typ = NULL;
 
      if (isphonenum(*address) || (typ && octstr_str_compare(typ, "/TYPE=PLMN") == 0)) {
-	  if (unified_prefix)
-	       mms_normalize_phonenum(address, unified_prefix, strip_prefixes);
+	  mms_normalize_phonenum(address, unified_prefix, strip_prefixes);
 	  octstr_append(*address, keep_suffix ? octstr_imm("/TYPE=PLMN") : octstr_imm(""));
      } else if (typ) 
 	  octstr_append(*address, keep_suffix ? typ : octstr_imm(""));     
diff --git a/mbuni/mmlib/mms_util.h b/mbuni/mmlib/mms_util.h
index 7f59aac..49bb6a4 100644
--- a/mbuni/mmlib/mms_util.h
+++ b/mbuni/mmlib/mms_util.h
@@ -59,7 +59,7 @@
 #define MMSC_VERSION MBUNI_VERSION
 #define MMS_NAME PACKAGE
 
-#define DRM_CONTENT_TYPE(ctype) (octstr_case_search(ctype, octstr_imm("application/vnd.oma.drm"), 0) == 0)
+#define DRM_CONTENT_TYPE(ctype) ((ctype) && octstr_case_search(ctype, octstr_imm("application/vnd.oma.drm"), 0) == 0)
 
 /* Message location flags: Used to distinguish fetch-urls */
 enum mms_loc_t {MMS_LOC_MMBOX = 1, MMS_LOC_MQUEUE=2};