aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2005-08-23 08:01:46 +0000
committerGuy Harris <guy@alum.mit.edu>2005-08-23 08:01:46 +0000
commit9fa5d5fd9ec0c9bf0267102348c2a20395ecf68c (patch)
tree15aa97ae4429fa77da403ff59417f9be9c08c596
parent9362605183179e8b5e901b9bc18c4fa9848531c8 (diff)
Fix the parenthesization of an expression.
svn path=/trunk/; revision=15514
-rw-r--r--epan/dissectors/packet-ber.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index a3b08ea078..2e6aeefce1 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -432,9 +432,10 @@ get_ber_length(proto_tree *tree, tvbuff_t *tvb, int offset, guint32 *length, gbo
tmp_offset = offset;
/* ok in here we can traverse the BER to find the length, this will fix most indefinite length issues */
/* Assumption here is that indefinite length is always used on constructed types*/
- while ((tvb_reported_length_remaining(tvb,offset)>0) && ( tvb_get_guint8(tvb, offset)) || (tvb_get_guint8(tvb,offset+1)))
/* check for EOC */
+ while ((tvb_reported_length_remaining(tvb,offset)>0) && ( tvb_get_guint8(tvb, offset) || tvb_get_guint8(tvb,offset+1)))
{
+ /* not an EOC at offset */
s_offset=offset;
offset= get_ber_identifier(tvb, offset, &tclass, &tpc, &ttag);
offset= get_ber_length(tree,tvb,offset, &tmp_len, NULL);