aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/pres
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-02 14:42:57 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-02 14:42:57 +0000
commiteef8c02bd73464661c0c979e4c191c2624b4d50c (patch)
tree02c0b683e8b3201ed85d061d836f835fab4d9f34 /asn1/pres
parent2edbeadfc4b0bcd563d746bb50c1fec49418e06d (diff)
Bug 3597 - implicit octet string that is constructed causes PRES/FTAM dissect failure
Introduced some state to remember last dissected Tag/Length so that they can be recalled if an IMPLICIT tag is encountered and stripped. This allows its to be determined if the value has a constructed value - and so can be reassembled. In this case, it is a IMPLICIT constructed OCTET STRING at the presentation layer. Many thanks to Fred Gruman for identifying - and apologies for the delay in commiting. svn path=/trunk/; revision=33048
Diffstat (limited to 'asn1/pres')
-rw-r--r--asn1/pres/pres.cnf2
1 files changed, 1 insertions, 1 deletions
diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf
index bfefbfd120..4e573ef2fd 100644
--- a/asn1/pres/pres.cnf
+++ b/asn1/pres/pres.cnf
@@ -56,7 +56,7 @@ CPR-PPDU/normal-mode-parameters/provider-reason cPR_PPDU__provider-reason
oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier);
if(oid){
- next_tvb = tvb_new_subset_remaining(tvb, offset);
+ dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &next_tvb);
call_ber_oid_callback(oid, next_tvb, offset, actx->pinfo, global_tree);
} else {
if (!pres_try_users_table(presentation_context_identifier, tvb, offset, actx->pinfo)) {