aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-multipart.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2009-03-13 22:06:48 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2009-03-13 22:06:48 +0000
commit62f60df6b4966d4e3d7f478284768115ef150b20 (patch)
tree259b574936077d87b88ed6d0429ba317078e0fcc /epan/dissectors/packet-multipart.c
parent7ed615f165fcb0cc87c2aba1921fb87a8a384ca5 (diff)
From Jakub Zawadzki (bug 3331):
g_free() is NULL safe, so we don't need check against it. svn path=/trunk/; revision=27718
Diffstat (limited to 'epan/dissectors/packet-multipart.c')
-rw-r--r--epan/dissectors/packet-multipart.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index e10af37a0e..b41bfdd594 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -435,8 +435,7 @@ cleanup_multipart_info(void *data)
{
multipart_info_t *m_info = data;
if (m_info) {
- if (m_info->boundary)
- g_free(m_info->boundary);
+ g_free(m_info->boundary);
g_free(m_info);
}
}
@@ -792,10 +791,8 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary,
}
}
- if(filename)
- g_free(filename);
- if(typename)
- g_free(typename);
+ g_free(filename);
+ g_free(typename);
return boundary_start + boundary_line_len;
}