Fix possible NULL pointer dereferences

diff --git a/argconfig.c b/argconfig.c
index 984b3d0506cef5c58e7dca71e4ee88d2be48a68e..55bef7f0540948a37e384568d66b296e03e7726b 100644 (file)
--- a/argconfig.c
+++ b/argconfig.c
@@ -390,6 +390,8 @@ int argconfig_parse_subopt_string(char *string, char **options,
        }
 
        tmp = calloc(strlen(string) + 2, 1);
+       if (!tmp)
+               return 1;
        strcpy(tmp, string);
 
        toklen = strcspn(tmp, "=");

diff --git a/nvme.c b/nvme.c
index e88d19940df55628da5e5f88d73dbfc928fec44e..d86466200516e9ce7caab97585b261f8e450d280 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -1334,10 +1334,9 @@ static char *get_nvme_subsnqn(char *path)
                                strerror(errno));
                free(subsysnqn);
                subsysnqn = NULL;
-       }
-
-       if (subsysnqn[strlen(subsysnqn) - 1] == '\n')
+       } else if (subsysnqn[strlen(subsysnqn) - 1] == '\n') {
                subsysnqn[strlen(subsysnqn) - 1] = '\0';
+       }
 
 close_fd:
        close(fd);