From f4eaf406488595c352715d034e1aa6d38af6ac50 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 18 Oct 2005 13:36:32 +0000 Subject: Don't pass a null value to strcmp(). Fixes bug 540. svn path=/trunk/; revision=16262 --- asn1/acse/packet-acse-template.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'asn1') diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c index 7fa57124cf..67d86ed5f3 100644 --- a/asn1/acse/packet-acse-template.c +++ b/asn1/acse/packet-acse-template.c @@ -194,11 +194,12 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) break; case SES_DATA_TRANSFER: oid=find_oid_by_pres_ctx_id(pinfo, indir_ref); - if(strcmp(oid, ACSE_APDU_OID) == 0){ - proto_tree_add_text(parent_tree, tvb, offset, -1, - "Invalid OID: %s", ACSE_APDU_OID); - THROW(ReportedBoundsError); - } else if(oid){ + if(oid){ + if(strcmp(oid, ACSE_APDU_OID) == 0){ + proto_tree_add_text(parent_tree, tvb, offset, -1, + "Invalid OID: %s", ACSE_APDU_OID); + THROW(ReportedBoundsError); + } call_ber_oid_callback(oid, tvb, offset, pinfo, parent_tree); } else { proto_tree_add_text(parent_tree, tvb, offset, -1, -- cgit v1.2.3