diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-17 17:10:52 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-17 17:10:52 +0000 |
| commit | 30d5ffbe79c4cec2ab5b72d51bd7c9f8962c2bb2 (patch) | |
| tree | 06131502de48f1bf77e35e66dc4bc463a70c8c0d /frame_tvbuff.c | |
| parent | 33cf749c19d76f37a094173b385c7691685be0c8 (diff) | |
| download | wireshark-30d5ffbe79c4cec2ab5b72d51bd7c9f8962c2bb2.tar.gz | |
Revert r50668, remove fd check to fix CID 1050093
svn path=/trunk/; revision=50698
Diffstat (limited to 'frame_tvbuff.c')
| -rw-r--r-- | frame_tvbuff.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/frame_tvbuff.c b/frame_tvbuff.c index 0a3652a17a..27db55765e 100644 --- a/frame_tvbuff.c +++ b/frame_tvbuff.c @@ -201,14 +201,8 @@ frame_tvbuff_new(const frame_data *fd, const guint8 *buf) */ tvb->real_data = buf; - if (fd) { - tvb->length = fd->cap_len; - tvb->reported_length = fd->pkt_len > G_MAXINT ? G_MAXINT : fd->pkt_len; - } else { - tvb->length = 0; - tvb->reported_length = 0; - } - + tvb->length = fd->cap_len; + tvb->reported_length = fd->pkt_len > G_MAXINT ? G_MAXINT : fd->pkt_len; tvb->initialized = TRUE; /* @@ -223,7 +217,7 @@ frame_tvbuff_new(const frame_data *fd, const guint8 *buf) /* don't care, reassemble code was doing whole copy of data, so it'll work the same */ /* XXX, wtap_can_seek() */ - if (fd && cfile.wth && cfile.wth->random_fh) { + if (cfile.wth && cfile.wth->random_fh) { frame_tvb->wth = cfile.wth; frame_tvb->file_off = fd->file_off; frame_tvb->offset = 0; |