diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-09-22 00:51:11 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-09-22 00:51:11 +0000 |
| commit | c5b0fc27d756b57eba29031524e8ff78ed3e9f38 (patch) | |
| tree | ed92c81d739bb9048f631131a0b33642c48efb1a /epan/dissectors/packet-x411.c | |
| parent | 7ce6e5ebcdc095ce2bd9d56203d43fcd000d5264 (diff) | |
| download | wireshark-c5b0fc27d756b57eba29031524e8ff78ed3e9f38.tar.gz wireshark-c5b0fc27d756b57eba29031524e8ff78ed3e9f38.tar.bz2 wireshark-c5b0fc27d756b57eba29031524e8ff78ed3e9f38.zip | |
Fix a bunch of places where we were calling "dissect_ber_octet_string()"
with a non-null pointer-to-pointer-to-tvbuff and not checking whether
the returned tvbuff pointer was non-null.
svn path=/trunk/; revision=15948
Diffstat (limited to 'epan/dissectors/packet-x411.c')
| -rw-r--r-- | epan/dissectors/packet-x411.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index cb68d995e0..350d70ba56 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -840,8 +840,7 @@ static int dissect_initiator_credentials_impl(packet_info *pinfo, proto_tree *tr static int dissect_x411_SecurityPolicyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); return offset; } @@ -890,8 +889,7 @@ static int dissect_privacy_mark(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_x411_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); return offset; } @@ -1818,8 +1816,7 @@ static int dissect_teletex_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_x411_ExtendedEncodedInformationType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); return offset; } @@ -2548,7 +2545,8 @@ dissect_x411_Content(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe /* we can do this now constructed octet strings are supported */ offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, offset, hf_index, &next_tvb); - (void) call_ber_oid_callback(object_identifier_id, next_tvb, 0, pinfo, tree); + if (next_tvb) + (void) call_ber_oid_callback(object_identifier_id, next_tvb, 0, pinfo, tree); return offset; @@ -5117,8 +5115,7 @@ dissect_x411_RecipientNumberForAdvice(gboolean implicit_tag _U_, tvbuff_t *tvb, static int dissect_x411_PhysicalRenditionAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); return offset; } |