From 97cef99f54160ee819be29ae49bf2293ecb61756 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Wed, 19 Jan 2022 16:53:45 -0600 Subject: [PATCH] iprop: Fix coverity warnings --- lib/kadm5/ipropd_master.c | 13 ++++++++----- lib/kadm5/ipropd_slave.c | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c index dc21b103e..a691fa38d 100644 --- a/lib/kadm5/ipropd_master.c +++ b/lib/kadm5/ipropd_master.c @@ -1435,11 +1435,13 @@ write_master_down(krb5_context context) fp = fopen(slave_stats_temp_file, "w"); if (fp == NULL) return; - krb5_format_time(context, t, str, sizeof(str), TRUE); - fprintf(fp, "master down at %s\n", str); + if (krb5_format_time(context, t, str, sizeof(str), TRUE) == 0) + fprintf(fp, "master down at %s\n", str); + else + fprintf(fp, "master down\n"); if (fclose(fp) != EOF) - rk_rename(slave_stats_temp_file, slave_stats_file); + (void) rk_rename(slave_stats_temp_file, slave_stats_file); } static void @@ -1455,7 +1457,8 @@ write_stats(krb5_context context, slave *slaves, uint32_t current_version) if (fp == NULL) return; - krb5_format_time(context, t, str, sizeof(str), TRUE); + if (krb5_format_time(context, t, str, sizeof(str), TRUE)) + snprintf(str, sizeof(str), ""); fprintf(fp, "Status for slaves, last updated: %s\n\n", str); fprintf(fp, "Master version: %lu\n\n", (unsigned long)current_version); @@ -1509,7 +1512,7 @@ write_stats(krb5_context context, slave *slaves, uint32_t current_version) rtbl_destroy(tbl); if (fclose(fp) != EOF) - rk_rename(slave_stats_temp_file, slave_stats_file); + (void) rk_rename(slave_stats_temp_file, slave_stats_file); } diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c index 5ad1e8331..2b1be00ea 100644 --- a/lib/kadm5/ipropd_slave.c +++ b/lib/kadm5/ipropd_slave.c @@ -184,6 +184,8 @@ ihave(krb5_context context, krb5_auth_context auth_context, krb5_data data; sp = krb5_storage_from_mem(buf, 8); + if (sp == NULL) + krb5_err(context, IPROPD_RESTART_SLOW, ENOMEM, "Out of memory"); ret = krb5_store_uint32(sp, I_HAVE); if (ret == 0) ret = krb5_store_uint32(sp, version);