diff options
| author | Andras Timar <andras.timar@collabora.com> | 2022-11-07 14:29:09 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-01-25 12:24:34 +0000 |
| commit | 6053df3ecdf89886a4573a47aac789cacf4df008 (patch) | |
| tree | 6b9f7cfedc04c760d57bf4123de7a4362998b12b /onlineupdate | |
| parent | bb391230db5387d708b6f4fbeec0442fb29d44be (diff) | |
NSS initialization guard
Change-Id: I61a5886d0d13eaef6a61479e35d52a85937075ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142385
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146042
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'onlineupdate')
| -rw-r--r-- | onlineupdate/source/update/updater/updater.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx index 54750afb4218..467f0b67cd1f 100644 --- a/onlineupdate/source/update/updater/updater.cxx +++ b/onlineupdate/source/update/updater/updater.cxx @@ -2919,12 +2919,15 @@ int NS_main(int argc, NS_tchar **argv) // need to initialize NSS at all there. // Otherwise, minimize the amount of NSS we depend on by avoiding all the NSS // databases. - if (NSS_NoDB_Init(NULL) != SECSuccess) + if (!NSS_IsInitialized()) { - PRErrorCode error = PR_GetError(); - fprintf(stderr, "Could not initialize NSS: %s (%d)", - PR_ErrorToName(error), (int) error); - _exit(1); + if (NSS_NoDB_Init(NULL) != SECSuccess) + { + PRErrorCode error = PR_GetError(); + fprintf(stderr, "Could not initialize NSS: %s (%d)", + PR_ErrorToName(error), (int) error); + _exit(1); + } } #endif |