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

From Sean Yunjnz: 

Problem in packet-per.c for ASN.1 PER Encoding.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3733

svn path=/trunk/; revision=29124
This commit is contained in:
Anders Broman 2009-07-16 21:09:18 +00:00
parent fcac7c5695
commit af3ad92c81
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,6 +160,17 @@ static const guint16 bit_mask16[] = {
0x01ff
};
static const guint16 bit_mask16_unalligned[] = {
0xff00,
0x8000,
0xc000,
0xe000,
0xf000,
0xf800,
0xfc00,
0xfe00
};
/* Fetch a number of bits to a new tvb right adjusted to the nearest number of bytes.
* (add proceeding zeros in case of aligned PER)
*/
@ -223,8 +234,12 @@ tvbuff_t *new_octet_aligned_subset_bits(tvbuff_t *tvb, guint32 offset, asn1_ctx_
}
}
/* get the 'odd' bits */
word = tvb_get_ntohs(tvb,boffset+i) << shift1;
word = word & ~bit_mask16[remainder];
if ((no_of_bits - 8*i) > shift0){
word = tvb_get_ntohs(tvb,boffset+i) << shift1;
}else{
word = tvb_get_guint8(tvb,boffset+i) << (shift1 + 8);
}
word = word & bit_mask16_unalligned[remainder];
word = word >> 8;
buf[i] = (guint8) (word & 0x00ff);
}