From 9ab88037754112999bdf6090d5a3e96441774902 Mon Sep 17 00:00:00 2001
From: Filip Siroky <filip.siroky@nic.cz>
Date: Sun, 15 Jan 2017 11:03:19 +0100
Subject: [PATCH] dnssec: fix coverity errors
---
src/dnssec/lib/event/keystate.c | 2 +-
src/dnssec/tests/keyusage.c | 35 ++++++++++++++++++---------------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/dnssec/lib/event/keystate.c b/src/dnssec/lib/event/keystate.c
index b503c99287..409f756a77 100644
--- a/src/dnssec/lib/event/keystate.c
+++ b/src/dnssec/lib/event/keystate.c
@@ -25,7 +25,7 @@
_public_
key_state_t dnssec_get_key_state(const dnssec_kasp_key_t *key, time_t moment)
{
- if (!key || time <= 0)
+ if (!key || moment <= 0)
{
return DNSSEC_KEY_STATE_INVALID;
}
diff --git a/src/dnssec/tests/keyusage.c b/src/dnssec/tests/keyusage.c
index e7584b8587..59a3dd2506 100644
--- a/src/dnssec/tests/keyusage.c
+++ b/src/dnssec/tests/keyusage.c
@@ -19,13 +19,9 @@
#include <string.h>
#include <stdio.h>
-#include "dnssec/keyusage.h"
-#include "dnssec/error.h"
#include "dnssec.h"
-char *json_path = NULL, *json_file = NULL;
-
-static void test_keyusage_empty(void)
+static void test_keyusage_empty(const char *json_file)
{
diag("%s", __func__);
@@ -75,7 +71,7 @@ static void test_keyusage_basic(void)
dnssec_keyusage_free(k);
}
-static void test_keyusage_file(void)
+static void test_keyusage_file(const char *json_file)
{
dnssec_keyusage_t *k = NULL;
k = dnssec_keyusage_new();
@@ -99,23 +95,30 @@ static void test_keyusage_file(void)
dnssec_keyusage_free(k);
}
-int main(int argc, char *argv[])
+int main(void)
{
plan_lazy();
+ char *json_path = NULL, *json_file = NULL;
+
json_path = test_mkdtemp();
- asprintf(&json_file, "%s/keyusage.json", json_path ? json_path : "/tmp");
+ if (!json_path) {
+ fprintf(stderr, "Failed to create teporary path.");
+ return -1;
+ }
- test_keyusage_empty();
+ int r = asprintf(&json_file, "%s/keyusage.json", json_path);
+ if (r == -1) {
+ fprintf(stderr, "Failed to create teporary file path.");
+ return -1;
+ }
+
+ test_keyusage_empty(json_file);
test_keyusage_basic();
- test_keyusage_file();
+ test_keyusage_file(json_file);
- remove(json_file);
- free(json_file);
- if (json_path) {
- remove(json_path);
- free(json_path);
- }
+ test_rm_rf(json_path);
+ free(json_path);
return 0;
}
--
GitLab