osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

dissect_per_restricted_character_string() was almost completely broken when it came to PrintableString. 

I am amazed it worked at all and noone complained.

It is little less broken now and handles some of the PrintableStrings  properly.



svn path=/trunk/; revision=12262
This commit is contained in:
Ronnie Sahlberg 2004-10-11 12:00:08 +00:00
parent 512285a434
commit 97a1230136
1 changed files with 64 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
epan/dissectors/packet-per.c
View File

@ -278,6 +278,7 @@ dissect_per_restricted_character_string(tvbuff_t *tvb, guint32 offset, packet_in
guint32 old_offset;
DEBUG_ENTRY("dissect_per_restricted_character_string");
/* xx.x if the length is 0 bytes there will be no encoding */
if(max_len==0){
return offset;
@ -289,46 +290,6 @@ DEBUG_ENTRY("dissect_per_restricted_character_string");
}
/* xx.x */
length=max_len;
if(min_len!=max_len){
proto_tree *etr = NULL;
if(display_internal_per_fields){
etr=tree;
}
offset=dissect_per_constrained_integer(tvb, offset, pinfo,
etr, hf_per_octet_string_length, min_len, max_len,
&length, NULL, FALSE);
}
/* xx.x if length is fixed or constrained to be less than or equal to
two bytes, then it will not be byte aligned. */
byte_aligned=TRUE;
if((min_len==max_len)&&(max_len<=2)){
byte_aligned=FALSE;
}
if(max_len<2){
byte_aligned=FALSE;
}
if(!length){
/* there is no string at all, so dont do any byte alignment */
byte_aligned=FALSE;
}
if(byte_aligned){
if(offset&0x07){
offset=(offset&0xfffffff8)+8;
}
}
if(length>=1024){
PER_NOT_DECODED_YET("restricted char string too long");
length=1024;
}
/* 27.5.2 depending of the alphabet length, find how many bits
are used to encode each character */
/* unaligned PER
@ -360,6 +321,57 @@ DEBUG_ENTRY("dissect_per_restricted_character_string");
bits_per_char=8;
}
byte_aligned=TRUE;
if((min_len==max_len)&&(max_len<=2)){
byte_aligned=FALSE;
}
if((max_len!=-1)&&(max_len<2)){
byte_aligned=FALSE;
}
if(!length){
/* there is no string at all, so dont do any byte alignment */
byte_aligned=FALSE;
}
/* xx.x */
length=max_len;
if(max_len==-1){
proto_tree *etr = NULL;
if(display_internal_per_fields){
etr=tree;
}
offset = dissect_per_length_determinant(tvb, offset, pinfo, etr,
hf_per_octet_string_length, &length);
/* the unconstrained strings are always byte aligned (27.6.3)*/
byte_aligned=TRUE;
} else if(min_len!=max_len){
proto_tree *etr = NULL;
if(display_internal_per_fields){
etr=tree;
}
offset=dissect_per_constrained_integer(tvb, offset, pinfo,
etr, hf_per_octet_string_length, min_len, max_len,
&length, NULL, FALSE);
}
if(byte_aligned){
if(offset&0x07){
offset=(offset&0xfffffff8)+8;
}
}
if(length>=1024){
PER_NOT_DECODED_YET("restricted char string too long");
length=1024;
}
old_offset=offset;
for(char_pos=0;char_pos<length;char_pos++){
guchar val;
@ -371,10 +383,18 @@ DEBUG_ENTRY("dissect_per_restricted_character_string");
offset=dissect_per_boolean(tvb, offset, pinfo, tree, -1, &bit, NULL);
val=(val<<1)|bit;
}
if (val >= alphabet_length)
str[char_pos] = '?'; /* XXX - how to mark this? */
else
str[char_pos]=alphabet[val];
/* ALIGNED PER does not do any remapping of chars if
bitsperchar is 8
*/
if(bits_per_char==8){
str[char_pos]=val;
} else {
if (val < alphabet_length){
str[char_pos]=alphabet[val];
} else {
str[char_pos] = '?'; /* XXX - how to mark this? */
}
}
}
str[char_pos]=0;
proto_tree_add_string(tree, hf_index, tvb, (old_offset>>3), (offset>>3)-(old_offset>>3), str);