summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Parker <wp02855@gmail.com>2015-08-21 15:13:16 +0200
committerAnders Broman <a.broman58@gmail.com>2015-08-21 15:10:38 +0000
commitf8712aeeda620258b76efd753b5a493c8ecb5a9d (patch)
tree2e40f1f1030e87aff2b68374d33629dc2d5d38a6
parent856bab63e6c28ffc660544bfc23aca0f3d7ea341 (diff)
downloadwireshark-f8712aeeda620258b76efd753b5a493c8ecb5a9d.tar.gz
[Kerberos] Call to 'fseek()' without a check for a return value < 0,
indicating failure. Bug: 11056 Change-Id: Iaa6b7ca07626b78c77e3c1507726ec579764a582 Reviewed-on: https://code.wireshark.org/review/10181 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--asn1/kerberos/packet-kerberos-template.c5
-rw-r--r--epan/dissectors/packet-kerberos.c11
2 files changed, 11 insertions, 5 deletions
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c
index bfcbc0d605..07d7d7ec95 100644
--- a/asn1/kerberos/packet-kerberos-template.c
+++ b/asn1/kerberos/packet-kerberos-template.c
@@ -666,7 +666,10 @@ read_keytab_file(const char *service_key_file)
sk->contents = g_memdup(buf + 2, DES3_KEY_SIZE);
g_snprintf(sk->origin, KRB_MAX_ORIG_LEN, "3DES service key file, key #%d, offset %ld", count, ftell(skf));
service_key_list = g_slist_append(service_key_list, (gpointer) sk);
- fseek(skf, newline_skip, SEEK_CUR);
+ if (fseek(skf, newline_skip, SEEK_CUR) < 0) {
+ fprintf(stderr, "unable to seek...\n");
+ return;
+ }
count++;
}
fclose(skf);
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index ca817988f2..6fa601937d 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -917,7 +917,10 @@ read_keytab_file(const char *service_key_file)
sk->contents = g_memdup(buf + 2, DES3_KEY_SIZE);
g_snprintf(sk->origin, KRB_MAX_ORIG_LEN, "3DES service key file, key #%d, offset %ld", count, ftell(skf));
service_key_list = g_slist_append(service_key_list, (gpointer) sk);
- fseek(skf, newline_skip, SEEK_CUR);
+ if (fseek(skf, newline_skip, SEEK_CUR) < 0) {
+ fprintf(stderr, "unable to seek...\n");
+ return;
+ }
count++;
}
fclose(skf);
@@ -4252,7 +4255,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
/*--- End of included file: packet-kerberos-fn.c ---*/
-#line 1982 "../../asn1/kerberos/packet-kerberos-template.c"
+#line 1985 "../../asn1/kerberos/packet-kerberos-template.c"
/* Make wrappers around exported functions for now */
int
@@ -5290,7 +5293,7 @@ void proto_register_kerberos(void) {
NULL, HFILL }},
/*--- End of included file: packet-kerberos-hfarr.c ---*/
-#line 2363 "../../asn1/kerberos/packet-kerberos-template.c"
+#line 2366 "../../asn1/kerberos/packet-kerberos-template.c"
};
/* List of subtrees */
@@ -5364,7 +5367,7 @@ void proto_register_kerberos(void) {
&ett_kerberos_ChangePasswdData,
/*--- End of included file: packet-kerberos-ettarr.c ---*/
-#line 2379 "../../asn1/kerberos/packet-kerberos-template.c"
+#line 2382 "../../asn1/kerberos/packet-kerberos-template.c"
};
static ei_register_info ei[] = {