diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
| commit | f4a12fc67689a830e9da1c87fd11afe5bc09deb3 (patch) | |
| tree | 211ae0cd022a6c11b0026ecc7761a550c584583c /security/nss/lib/util/utilmod.c | |
| parent | f7d30133221896638f7bf4f66c504255c4b14f48 (diff) | |
| download | UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.gz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.lz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.xz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.zip | |
Issue #1338 - Part 2: Update NSS to 3.48-RTM
Diffstat (limited to 'security/nss/lib/util/utilmod.c')
| -rw-r--r-- | security/nss/lib/util/utilmod.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/security/nss/lib/util/utilmod.c b/security/nss/lib/util/utilmod.c index 7d3fcda81..3ed7b3dd6 100644 --- a/security/nss/lib/util/utilmod.c +++ b/security/nss/lib/util/utilmod.c @@ -413,7 +413,10 @@ nssutil_ReadSecmodDB(const char *appName, /* remove the ending newline */ len = PORT_Strlen(line); - if (len && line[len - 1] == '\n') { + if (len >= 2 && line[len - 2] == '\r' && line[len - 1] == '\n') { + len = len - 2; + line[len] = 0; + } else if (len && (line[len - 1] == '\n' || line[len - 1] == '\r')) { len--; line[len] = 0; } |