2 files changed, 6 insertions, 4 deletions

diff --git a/lib/output.c b/lib/output.c
index 62e1366d..d650a3c5 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -175,7 +175,7 @@ char *get_subcheck_summary(mp_check check) {
         unsigned int critical = 0;
         unsigned int unknown = 0;
         while (subchecks != NULL) {
-                switch (subchecks->subcheck.state) {
+                switch (mp_compute_subcheck_state(subchecks->subcheck)) {
                 case STATE_OK:
                         ok++;
                         break;
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index db337622..196cac79 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -352,15 +352,17 @@ static int add_option(FILE *filePointer, np_arg_list **optlst) {
         optnew->next = NULL;
 
         read_pos = 0;
-        optnew->arg = malloc(cfg_len + 1);
+        size_t arg_length = cfg_len + 1;
+        optnew->arg = malloc(arg_length);
         /* 1-character params needs only one dash */
         if (opt_len == 1) {
-                strncpy(&optnew->arg[read_pos], "-", 1);
+                strncpy(&optnew->arg[read_pos], "-", arg_length);
                 read_pos += 1;
         } else {
-                strncpy(&optnew->arg[read_pos], "--", 2);
+                strncpy(&optnew->arg[read_pos], "--", arg_length);
                 read_pos += 2;
         }
+
         strncpy(&optnew->arg[read_pos], optptr, opt_len);
         read_pos += opt_len;
         if (value) {