diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-11-04 16:08:47 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-11-04 16:08:47 +0000 |
| commit | 3a47213a3d53a02668ff8e83f13b305a01fae569 (patch) | |
| tree | ced784e02aa1cb001767bc9e05fa73923c943a8d /epan/dissectors/packet-dcm.c | |
| parent | 718791f4705dc9e71779410382bd3588b6f64439 (diff) | |
tvb_format_text() always returns a non NULL pointer so don't check return value for NULL pointer
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30821 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dcm.c')
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index c7dfac9bed..f36e4598df 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -5112,8 +5112,8 @@ dissect_dcm_tag_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dcm_s /* 15 ways to represent a string ... */ gchar *vals; - dcm_uid_t *uid = NULL; - guint8 val8; + dcm_uid_t *uid = NULL; + guint8 val8; val8 = tvb_get_guint8(tvb, offset + vl_max - 1); if (val8 == 0x00) { @@ -5124,7 +5124,7 @@ dissect_dcm_tag_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dcm_s vals = tvb_format_text(tvb, offset, vl_max); } - if ((strncmp(vr, "UI", 2) == 0) && vals != NULL) { + if ((strncmp(vr, "UI", 2) == 0)) { /* This is a UID. Attempt a lookup. Will only return something for classes of course */ uid = g_hash_table_lookup(dcm_uid_table, (gpointer) vals); |