From: guido@trentalancia.com (Guido Trentalancia) Date: Wed, 18 Oct 2017 00:08:44 +0200 Subject: [refpolicy] [PATCH] fc_sort: use calloc instead of malloc In-Reply-To: References: <1508264778-13172-1-git-send-email-william.c.roberts@intel.com> Message-ID: To: refpolicy@oss.tresys.com List-Id: refpolicy.oss.tresys.com Thanks for the patch Bill! Acked-by: Guido Trentalancia On the 17th of October 2017 20:28:27 CEST, William Roberts wrote: >Chris and Guido, you may have seen a patch come your way for unrelated >project and a mailing list bounce, whoops. > >This change swaps out those mallocs to callocs for a negative diffstat, >yeah. > > >---------- Forwarded message ---------- >From: >Date: Tue, Oct 17, 2017 at 11:26 AM >Subject: [PATCH] fc_sort: use calloc instead of malloc >To: bill.c.roberts at gmail.com >Cc: William Roberts > > >From: William Roberts > >Rather than using malloc to allocated nodes and setting all the fields, >just use calloc. > >Signed-off-by: William Roberts >--- > support/fc_sort.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > >diff --git a/support/fc_sort.c b/support/fc_sort.c >index 956c37b..bfe28ca 100644 >--- a/support/fc_sort.c >+++ b/support/fc_sort.c >@@ -357,15 +357,11 @@ int main(int argc, char *argv[]) > } > > /* Initialize the head of the linked list. */ >- head = current = >(file_context_node_t*)malloc(sizeof(file_context_node_t)); >+ head = current = (file_context_node_t*)calloc(1, >sizeof(file_context_node_t)); > if (!head) { > fprintf(stderr, "Error: failure allocating memory.\n"); > return 1; > } >- head->next = NULL; >- head->path = NULL; >- head->file_type = NULL; >- head->context = NULL; > > /* Parse the file into a file_context linked list. */ > line_buf = NULL; >@@ -390,15 +386,13 @@ int main(int argc, char *argv[]) > continue; > > /* We have a valid line - allocate a new node. */ >- temp = (file_context_node_t >*)malloc(sizeof(file_context_node_t)); >+ temp = (file_context_node_t *)calloc(1, >sizeof(file_context_node_t)); > if (!temp) { > free(line_buf); > fprintf(stderr, "Error: failure allocating memory.\n"); > fc_free_file_context_node_list(head); > return 1; > } >- temp->next = NULL; >- memset(temp, 0, sizeof(file_context_node_t)); > > /* Parse out the regular expression from the line. */ > start = i; >-- >2.7.4