diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2009-10-02 13:04:00 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2009-10-02 13:04:00 +0000 |
| commit | ef267649c58196b2173bc76e37eecd65620360ee (patch) | |
| tree | c6fd6cb27be67577c8dae6f2bbd5271bbaf54e2d /epan/dissectors/packet-aim.c | |
| parent | ab99aaf7325cb24e2161e4128a32714b45680ce3 (diff) | |
| download | wireshark-ef267649c58196b2173bc76e37eecd65620360ee.tar.gz wireshark-ef267649c58196b2173bc76e37eecd65620360ee.tar.bz2 wireshark-ef267649c58196b2173bc76e37eecd65620360ee.zip | |
One of those if(check_col)'s was hiding another condition (should have been looking closer). Fixes the fuzz failure in bug 4074.
svn path=/trunk/; revision=30248
Diffstat (limited to 'epan/dissectors/packet-aim.c')
| -rw-r--r-- | epan/dissectors/packet-aim.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index d04927de77..88752fb695 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -749,7 +749,8 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset, pd_save = pinfo->private_data; pinfo->private_data = &aiminfo; - col_set_str(pinfo->cinfo, COL_PROTOCOL, family->name); + if (family) + col_set_str(pinfo->cinfo, COL_PROTOCOL, family->name); if (check_col(pinfo->cinfo, COL_INFO)) { |