commit | bb57f72d4b985e19dd4d871828cd363b3803c40b | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Mon Feb 14 23:13:56 2022 +0000 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Mon Feb 14 23:13:56 2022 +0000 |
tree | 2ef35f99409eb08bc6cc14acd2ab436a02eb80ec | |
parent | 2a2a8b42a693be7a7a3f4dc5552406baa598b46a [diff] | |
parent | b6f173c5582a4d8f55b00b17d3cdb91fff809e30 [diff] |
Merge cherrypicks of [16730965] into sc-v2-release. Change-Id: I2110cc40a3d648bb66da62653d6d8a972bf39761
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];