commit | 9bf5b3eb10ec7f5c46d8275de2fa37f95df941cc | [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 | b17081a000da0baa58d45496d2ee68894e8bf435 | |
parent | c1227742bdbd2d961bf1c6cf1856f9ffee6f8c83 [diff] | |
parent | 7664bc06e522d5841ee2737633e390eafabf77f0 [diff] |
Merge cherrypicks of [16730965] into rvc-platform-release. Change-Id: I45d4804b49ddc914707fef2e7dd802bf45516f75
diff --git a/libselinux/src/label_backends_android.c b/libselinux/src/label_backends_android.c index eaca594..df8101d 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];