aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/asn1
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2006-03-30 15:34:18 +0000
committerGerald Combs <gerald@wireshark.org>2006-03-30 15:34:18 +0000
commit4ea62e57b067f96df69a313b1748a9ceb236687b (patch)
tree0d4846f8c49ca4755204d5380fea8a5f8bc0a992 /plugins/asn1
parentd53b9d72050fe7733c1ced838923512a5f19528e (diff)
Continue to play whack-a-mole with null dereferences. Fixes CID 146.
svn path=/trunk/; revision=17770
Diffstat (limited to 'plugins/asn1')
-rw-r--r--plugins/asn1/packet-asn1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 9fd0c2bb9c..021417ea3d 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -264,7 +264,7 @@ static int asn1_uni_type[] = {
#define TBL_CONSTRUCTED 0x01000000 /* unexpectedly constructed entry */
#define TBL_TYPEmask 0x0000FFFF /* Mask just the type */
-
+/* XXX - Should we use val_to_str here? */
#define TBLTYPE(x) (tbl_types[x&TBL_TYPEmask])
/* text tables for debugging and GUI */
@@ -4650,7 +4650,7 @@ getPDUprops(PDUprops *out, guint offset, guint class, guint tag, guint cons)
}
/* must follow references now */
- if (pos.type == TBL_TYPEREF) {
+ if (pos.type == TBL_TYPEREF && info) {
out->typename = info->typename;
out->type_id = info->typenum;
out->flags |= OUT_FLAG_typename;