diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-03-10 20:48:06 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-03-11 07:07:19 +0000 |
| commit | 14b23203dbbe2efcb3048170072ece7b705816b8 (patch) | |
| tree | 20ecaa75ec127e11e7332cfd65dabcfa8b13d7fc | |
| parent | fdcae1f00e9df3f9143c7df120294d02be124aba (diff) | |
| download | wireshark-14b23203dbbe2efcb3048170072ece7b705816b8.tar.gz wireshark-14b23203dbbe2efcb3048170072ece7b705816b8.tar.bz2 wireshark-14b23203dbbe2efcb3048170072ece7b705816b8.zip | |
QNET6: check that string is not null before accessing to it
Bug: 11048
Change-Id: I7921f19ad378d6d0b6707251a546c84405b8dcf4
Reviewed-on: https://code.wireshark.org/review/7623
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-qnet6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-qnet6.c b/epan/dissectors/packet-qnet6.c index 58f9231b2c..7fdcab2e32 100644 --- a/epan/dissectors/packet-qnet6.c +++ b/epan/dissectors/packet-qnet6.c @@ -1615,7 +1615,7 @@ dissect_qnet6_lr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint * { case QNET_LR_TYPE_REQUEST: p = name[2]; - if (p && (*(p + 1) == QNET_LR_SA_FAMILY_MAC)) + if (p && strlen(p) && (*(p + 1) == QNET_LR_SA_FAMILY_MAC)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Who is \"%s.%s\"? Tell \"%s.%s\"@%02x:%02x:%02x:%02x:%02x:%02x", @@ -1627,7 +1627,7 @@ dissect_qnet6_lr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint * break; case QNET_LR_TYPE_REPLY: p = name[2]; - if (p && (*(p + 1) == QNET_LR_SA_FAMILY_MAC)) + if (p && strlen(p) && (*(p + 1) == QNET_LR_SA_FAMILY_MAC)) { col_add_fstr(pinfo->cinfo, COL_INFO, "To \"%s.%s\", \"%s.%s\" is at %02x:%02x:%02x:%02x:%02x:%02x", |