Use strdup(3) instead of allocating memory and then manually copying the
content.
Signed-off-by: Christian Göttsche <cgzones@xxxxxxxxxxxxxx>
---
checkpolicy/checkpolicy.c | 10 ++++------
checkpolicy/policy_define.c | 3 +--
checkpolicy/test/dispol.c | 5 ++---
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c
index 926ce72c..48c31261 100644
--- a/checkpolicy/checkpolicy.c
+++ b/checkpolicy/checkpolicy.c
@@ -1148,12 +1148,11 @@ int main(int argc, char **argv)
FGETS(ans, sizeof(ans), stdin);
ans[strlen(ans) - 1] = 0;
- name = malloc((strlen(ans) + 1) * sizeof(char));
+ name = strdup(ans);
if (name == NULL) {
- fprintf(stderr, "couldn't malloc string.\n");
+ fprintf(stderr, "couldn't strdup string.\n");
break;
}
- strcpy(name, ans);
printf("state? ");
FGETS(ans, sizeof(ans), stdin);
@@ -1296,12 +1295,11 @@ int main(int argc, char **argv)
FGETS(ans, sizeof(ans), stdin);
ans[strlen(ans) - 1] = 0;
- name = malloc((strlen(ans) + 1) * sizeof(char));
+ name = strdup(ans);
if (!name) {
- fprintf(stderr, "couldn't malloc string.\n");
+ fprintf(stderr, "couldn't strdup string.\n");
break;
}
- strcpy(name, ans);
printf("port? ");
FGETS(ans, sizeof(ans), stdin);
diff --git a/checkpolicy/policy_define.c b/checkpolicy/policy_define.c
index 54bb304b..41e44631 100644
--- a/checkpolicy/policy_define.c
+++ b/checkpolicy/policy_define.c
@@ -117,12 +117,11 @@ int insert_id(const char *id, int push)
char *newid = 0;
int error;
- newid = (char *)malloc(strlen(id) + 1);
+ newid = strdup(id);
if (!newid) {
yyerror("out of memory");
return -1;
}
- strcpy(newid, id);
if (push)
error = queue_push(id_queue, (queue_element_t) newid);
else
diff --git a/checkpolicy/test/dispol.c b/checkpolicy/test/dispol.c
index 8ddefb04..36a3362c 100644
--- a/checkpolicy/test/dispol.c
+++ b/checkpolicy/test/dispol.c
@@ -486,12 +486,11 @@ int main(int argc, char **argv)
}
ans[strlen(ans) - 1] = 0;
- name = malloc((strlen(ans) + 1) * sizeof(char));
+ name = strdup(ans);
if (name == NULL) {
- fprintf(stderr, "couldn't malloc string.\n");
+ fprintf(stderr, "couldn't strdup string.\n");
break;
}
- strcpy(name, ans);
printf("state? ");
if (fgets(ans, sizeof(ans), stdin) == NULL) {
--
2.38.1
