diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-23 04:12:35 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-23 04:12:35 +0000 |
| commit | e0293b96838636085de549e134d60f83166c489c (patch) | |
| tree | 2ef35f99409eb08bc6cc14acd2ab436a02eb80ec | |
| parent | 5d729675672540a5363465ec9652b24c4a017aa7 (diff) | |
| parent | 31161cb0726a04c8825b19fd23402a9aadaa2bcb (diff) | |
| download | selinux-android12L-d2-s6-release.tar.gz | |
Merge cherrypicks of [16730965] into sc-d2-release.android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Change-Id: I0dcf5a1e5b8f7fea2491c5ad6f7cae4086fc6953
| -rw-r--r-- | libselinux/src/label_backends_android.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libselinux/src/label_backends_android.c b/libselinux/src/label_backends_android.c index d81faabe..121b52f5 100644 --- a/libselinux/src/label_backends_android.c +++ b/libselinux/src/label_backends_android.c @@ -278,6 +278,12 @@ static void closef(struct selabel_handle *rec) 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]; |