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/reassemble.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/reassemble.c')
| -rw-r--r-- | epan/reassemble.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/reassemble.c b/epan/reassemble.c index e3d21e6a3f..7b75c21076 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -850,8 +850,7 @@ fragment_add_work(fragment_data *fd_head, tvbuff_t *tvb, int offset, } } - if( old_data ) - g_free(old_data); + g_free(old_data); /* mark this packet as defragmented. allows us to skip any trailing fragments */ fd_head->flags |= FD_DEFRAGMENTED; @@ -1134,9 +1133,7 @@ fragment_defragment_and_free (fragment_data *fd_head, fragment_data *fd, g_free(fd_i->data); fd_i->data=NULL; } - - if( old_data ) - g_free(old_data); + g_free(old_data); /* mark this packet as defragmented. allows us to skip any trailing fragments */ |