Skip to content
Snippets Groups Projects
Commit 1cf1064b authored by William Roberts's avatar William Roberts Committed by William C Roberts
Browse files

fc_sort: rectify with upstream

Code review of:
  - https://android-review.googlesource.com/#/c/platform/system/sepolicy/+/512420/

had some comments. These were addressed and upstreamed here:
  - https://github.com/TresysTechnology/refpolicy/commit/65620e0f94541195fed45f34d4fc1218b4e0d6f3



Bring these changes back into the AOSP tree.

Test: verify that output sorted device files did not change hashes when built.

Change-Id: I7f07d3f74923cf731e853629034469784fc669f7
Signed-off-by: default avatarWilliam Roberts <william.c.roberts@intel.com>
parent 151c609b
No related branches found
No related tags found
No related merge requests found
...@@ -357,15 +357,11 @@ int main(int argc, char *argv[]) ...@@ -357,15 +357,11 @@ int main(int argc, char *argv[])
} }
/* Initialize the head of the linked list. */ /* 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) { if (!head) {
fprintf(stderr, "Error: failure allocating memory.\n"); fprintf(stderr, "Error: failure allocating memory.\n");
return 1; return 1;
} }
head->next = NULL;
head->path = NULL;
head->file_type = NULL;
head->context = NULL;
/* Parse the file into a file_context linked list. */ /* Parse the file into a file_context linked list. */
line_buf = NULL; line_buf = NULL;
...@@ -390,15 +386,13 @@ int main(int argc, char *argv[]) ...@@ -390,15 +386,13 @@ int main(int argc, char *argv[])
continue; continue;
/* We have a valid line - allocate a new node. */ /* 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) { if (!temp) {
free(line_buf); free(line_buf);
fprintf(stderr, "Error: failure allocating memory.\n"); fprintf(stderr, "Error: failure allocating memory.\n");
fc_free_file_context_node_list(head); fc_free_file_context_node_list(head);
return 1; return 1;
} }
temp->next = NULL;
memset(temp, 0, sizeof(file_context_node_t));
/* Parse out the regular expression from the line. */ /* Parse out the regular expression from the line. */
start = i; start = i;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment