diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-13 22:06:48 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-13 22:06:48 +0000 |
| commit | 62f60df6b4966d4e3d7f478284768115ef150b20 (patch) | |
| tree | 259b574936077d87b88ed6d0429ba317078e0fcc /epan/dissectors/packet-rtps.c | |
| parent | 7ed615f165fcb0cc87c2aba1921fb87a8a384ca5 (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-rtps.c')
| -rw-r--r-- | epan/dissectors/packet-rtps.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 2ff4da4a1e..141e6a3dd4 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -1577,9 +1577,8 @@ static gint rtps_util_add_string(proto_tree *tree, /* Can be NULL */ g_snprintf(buffer, buffer_size, "%s", retVal); } } - if (retVal != NULL) { - g_free(retVal); - } + g_free(retVal); + /* NDDS align strings at 4-bytes word. So: * string_length: 4 -> buffer_length = 4; * string_length: 5 -> buffer_length = 8; |