osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1675 (warning: cast from pointer to integer of different size) and, presumably, display of PER encoded IPv4 addresses by copying the IP address into a guint32 and passing that to proto_tree_add_ipv4(). 

svn path=/trunk/; revision=22328
This commit is contained in:
Jeff Morriss 2007-07-16 21:37:07 +00:00
parent 4285f239f0
commit 520296ca02
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1838,7 +1838,11 @@ DEBUG_ENTRY("dissect_per_octet_string");
} else if (hfi->type==FT_BYTES) {
actx->created_item = proto_tree_add_bytes(tree, hf_index, tvb, val_start, val_length, pbytes);
} else if (hfi->type==FT_IPv4) {
actx->created_item = proto_tree_add_ipv4(tree, hf_index, tvb, val_start, val_length, (guint32)pbytes);
guint32 ipa;
/* Not sure if pbytes is aligned enough to reference it as a guint32 */
memcpy(&ipa, pbytes, 4);
actx->created_item = proto_tree_add_ipv4(tree, hf_index, tvb, val_start, val_length, ipa);
} else if (hfi->type==FT_IPv6) {
actx->created_item = proto_tree_add_ipv6(tree, hf_index, tvb, val_start, val_length, pbytes);
} else {