diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-10-06 08:53:51 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-10-06 08:53:51 +0000 |
| commit | f3d6542e0fd153aa24643e3eea9a62f858c63173 (patch) | |
| tree | 13ccf85c7db18a3c661cee33848fa5c33621bbd0 /epan | |
| parent | 7d2f4603c1fdd21c8ee100f2966cb61fa760fe40 (diff) | |
| download | wireshark-f3d6542e0fd153aa24643e3eea9a62f858c63173.tar.gz wireshark-f3d6542e0fd153aa24643e3eea9a62f858c63173.tar.bz2 wireshark-f3d6542e0fd153aa24643e3eea9a62f858c63173.zip | |
Octest string of (size 2) does not dissplay correctly.
svn path=/trunk/; revision=16141
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-per.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 7f539afe8c..b7c881ba2c 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -1316,7 +1316,7 @@ DEBUG_ENTRY("dissect_per_bit_string"); } } if (hfi) { - proto_tree_add_bytes(tree, hf_index, tvb, old_offset>>3, (min_len+7)/8+(offset&0x07)?1:0, bytes); + proto_tree_add_bytes(tree, hf_index, tvb, old_offset>>3, (min_len+7)/8+((offset&0x07)?1:0), bytes); } return offset; } @@ -1389,7 +1389,6 @@ DEBUG_ENTRY("dissect_per_octet_string"); if(min_len==-1){ min_len=0; } - if (max_len==0) { /* 16.5 if the length is 0 bytes there will be no encoding */ val_start = offset>>3; val_length = 0; @@ -1411,7 +1410,7 @@ DEBUG_ENTRY("dissect_per_octet_string"); bytes[min_len]=0; pbytes = bytes; val_start = old_offset>>3; - val_length = min_len+(offset&0x07)?1:0; + val_length = min_len+((offset&0x07)?1:0); } else if ((min_len==max_len)&&(min_len<65536)) { /* 16.7 if length is fixed and less than to 64k*/ /* align to byte */ |