osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't pass a null value to strcmp(). Fixes bug 540. 

svn path=/trunk/; revision=16262
This commit is contained in:
Gerald Combs 2005-10-18 13:36:32 +00:00
parent 39fb4b8378
commit f4eaf40648
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
asn1/acse/packet-acse-template.c
View File

@ -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,

11
epan/dissectors/packet-acse.c
View File

@ -1893,11 +1893,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,