Fix Coverity CID 280809 (formerly CID 809): Uninitialized scalar variable.

svn path=/trunk/; revision=42399

diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index b1223b18f8b22c74a4fa96e919a1974c33754d58..60f57e2d8acc0b2c2541f2e2854995c37e2cd677 100644 (file)
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -1446,6 +1446,7 @@ static void dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
   switch(itype){
 
                case LOGON_SAM_LOGON_RESPONSE:
+                       bc = tvb_length_remaining(tvb, offset);
                        /* logon server name */
                        fn = get_unicode_or_ascii_string(tvb,&offset,TRUE,&fn_len,FALSE,FALSE,&bc);
                        proto_tree_add_string(tree, hf_mscldap_nb_hostname, tvb,offset, fn_len, fn);

diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index d6ce20cdee8d66c4e225f7563683d41a4323f556..e957cb8df83d4fc1e8d61eb126ad99533f922fd8 100644 (file)
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -4411,6 +4411,7 @@ static void dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
   switch(itype){
 
                case LOGON_SAM_LOGON_RESPONSE:
+                       bc = tvb_length_remaining(tvb, offset);
                        /* logon server name */
                        fn = get_unicode_or_ascii_string(tvb,&offset,TRUE,&fn_len,FALSE,FALSE,&bc);
                        proto_tree_add_string(tree, hf_mscldap_nb_hostname, tvb,offset, fn_len, fn);
@@ -5767,7 +5768,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-ldap-hfarr.c ---*/
-#line 2225 "../../asn1/ldap/packet-ldap-template.c"
+#line 2226 "../../asn1/ldap/packet-ldap-template.c"
   };
 
   /* List of subtrees */
@@ -5842,7 +5843,7 @@ void proto_register_ldap(void) {
     &ett_ldap_T_warning,
 
 /*--- End of included file: packet-ldap-ettarr.c ---*/
-#line 2238 "../../asn1/ldap/packet-ldap-template.c"
+#line 2239 "../../asn1/ldap/packet-ldap-template.c"
   };
   /* UAT for header fields */
   static uat_field_t custom_attribute_types_uat_fields[] = {
@@ -5999,7 +6000,7 @@ proto_reg_handoff_ldap(void)
 
 
 /*--- End of included file: packet-ldap-dis-tab.c ---*/
-#line 2378 "../../asn1/ldap/packet-ldap-template.c"
+#line 2379 "../../asn1/ldap/packet-ldap-template.c"
 
 
 }