diff options
| author | Gerald Combs <gerald@wireshark.org> | 2005-10-18 13:36:32 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2005-10-18 13:36:32 +0000 |
| commit | f4eaf406488595c352715d034e1aa6d38af6ac50 (patch) | |
| tree | 65836e28e0c74628399776892f056b8b8aa3cfce /asn1 | |
| parent | 39fb4b837835de20208df8abdac932202d667202 (diff) | |
Don't pass a null value to strcmp(). Fixes bug 540.
svn path=/trunk/; revision=16262
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/acse/packet-acse-template.c | 11 |
1 files changed, 6 insertions, 5 deletions
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, |