dissect_ber_choice() returns the index of the taken arm not the tag

value


svn path=/trunk/; revision=23458

1 files changed, 7 insertions, 0 deletions

diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf
index 2cec9df32f..55c417ac0f 100644
--- a/asn1/ldap/ldap.cnf
+++ b/asn1/ldap/ldap.cnf
@@ -80,6 +80,13 @@ ReplControlValue	B "1.2.840.113556.1.4.841" "replControlValue"
 
 #.FN_FTR ProtocolOp
 
+  if (ProtocolOp == -1) {
+    return offset;
+  }
+
+  /* ProtocolOp is the index, not the tag so convert it to the tag value */
+  ProtocolOp = ldap_ProtocolOp_choice_vals[ProtocolOp].value;
+
   lcrp=ldap_match_call_response(tvb, actx->pinfo, tree, MessageID, ProtocolOp);
   if(lcrp){
     tap_queue_packet(ldap_tap, actx->pinfo, lcrp);