diff options
author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-14 22:05:57 +0000 |
---|---|---|
committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-14 22:05:57 +0000 |
commit | 26e2395f1deee0de518e617df14c015c6c40738f (patch) | |
tree | 3106adc09fdbd3ae99c1eee00e9a8ef3b8ed2dff /epan | |
parent | aa60f5a53927df65691a963e9066f818722cbf26 (diff) |
if reassembly did not give us a new tvb, then dont call any scsi payload subdissector
svn path=/trunk/; revision=19534
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-scsi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index ca9fdba5b9..cc6ac7492a 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -7995,6 +7995,10 @@ dissect_scsi_payload (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissect_the_payload: + if(!next_tvb){ + /* reassembly has not yet finished so we dont have a tvb yet */ + goto end_of_payload; + } if (tree == NULL) { /* * We have to dissect INQUIRY responses, in order to determine the |