diff options
| author | Thiébaud Weksteen <tweek@google.com> | 2022-02-07 22:43:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-07 22:43:33 +0000 |
| commit | ab88183368f8b4f73b0d3d5a6f1f5371c7656b41 (patch) | |
| tree | 7c6f11d7ded1e58adc1acf627bec847c3a0aca65 | |
| parent | 2d3cc3b458831550a4a1caccd03c98a4a0def064 (diff) | |
| parent | 98fa1b865d52d97c06b754d1c2cfb69315997b65 (diff) | |
| download | selinux-ab88183368f8b4f73b0d3d5a6f1f5371c7656b41.tar.gz | |
Skip closef for property backend am: 98fa1b865d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/selinux/+/16730965
Change-Id: Ifdf2579d4926fa665ccebd055bb7ec5987057a50
| -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 eaca5947..df8101dd 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]; |