diff options
| author | Bill Yi <byi@google.com> | 2022-04-07 18:40:55 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2022-04-07 18:40:55 -0700 |
| commit | 3c41e9fae0bfd9f685e575083947d60684ecc72f (patch) | |
| tree | 0ac5f8b919be8431992c69321948d13fdee3ccc6 | |
| parent | e718c7c64d9684c643b7d44719248018b46f1041 (diff) | |
| parent | bb57f72d4b985e19dd4d871828cd363b3803c40b (diff) | |
| download | selinux-3c41e9fae0bfd9f685e575083947d60684ecc72f.tar.gz | |
Merge SP2A.220405.004 to aosp-master - DO NOT MERGE
Merged-In: I01ee936126ca754ea4092feaca04dadc4cb68d6a
Merged-In: I394278532b510e7de035945f6dbf3409e944ddf5
Change-Id: I8c28575a7b1589b231c5bd253dd6e14015ec7907
| -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 b7b176a3..e52b44d4 100644 --- a/libselinux/src/label_backends_android.c +++ b/libselinux/src/label_backends_android.c @@ -284,6 +284,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]; |