PWN-Hunter/android_system_sepolicy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fc_sort: rectify with upstream" am: adef499d29 am: 9b1affaa07

Browse Source 
am: 6091bbc363

Change-Id: I5e16838c9b81d23b113dc0d0cadf74419d279d38
This commit is contained in:
William Roberts 2017-10-19 19:35:23 +00:00 committed by android-build-merger
commit 71ebf07cfd
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/fc_sort/fc_sort.c
View File

@ -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;