commit | d981a593c08410aac310838f3d8e33fb287fc1ef | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Fri Feb 18 05:09:05 2022 +0000 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Fri Feb 18 05:09:05 2022 +0000 |
tree | 2ef35f99409eb08bc6cc14acd2ab436a02eb80ec | |
parent | 52ceb57b7551663208d724eddf9e0bea44ec9074 [diff] | |
parent | c62e7b99eedaf3986b8a425cc4ab9f60961fecfa [diff] |
Merge cherrypicks of [16730965] into sc-platform-release. Change-Id: I1c813181e9dfd49b137d64d1ab73f5bdf188652b
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];