commit | e0293b96838636085de549e134d60f83166c489c | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Feb 23 04:12:35 2022 +0000 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Feb 23 04:12:35 2022 +0000 |
tree | 2ef35f99409eb08bc6cc14acd2ab436a02eb80ec | |
parent | 5d729675672540a5363465ec9652b24c4a017aa7 [diff] | |
parent | 31161cb0726a04c8825b19fd23402a9aadaa2bcb [diff] |
Merge cherrypicks of [16730965] into sc-d2-release. Change-Id: I0dcf5a1e5b8f7fea2491c5ad6f7cae4086fc6953
diff --git a/libselinux/src/label_backends_android.c b/libselinux/src/label_backends_android.c index d81faab..121b52f 100644 --- a/libselinux/src/label_backends_android.c +++ b/libselinux/src/label_backends_android.c
@@ -278,6 +278,12 @@ struct spec *spec; unsigned int i; + if (!data) + return; + + /* make sure successive ->func_close() calls are harmless */ + rec->data = NULL; + if (data->spec_arr) { for (i = 0; i < data->nspec; i++) { spec = &data->spec_arr[i];