diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2014-07-15 12:26:42 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2014-07-15 12:27:09 +0200 |
| commit | 85d1bd151cca1572e39019288cb2b7b35fc0bbda (patch) | |
| tree | a6c49d774d83eb41f0650bfcdd83c344ef33ee23 /external/nss | |
| parent | 6602f904ac1858ef571eab5b2df733be0461e7e3 (diff) | |
fdo#72277: NSS-PEM yet another build fix for MS compiler
Change-Id: I524a14cd124e69e288de5ae8464eb611989dffde
Diffstat (limited to 'external/nss')
| -rw-r--r-- | external/nss/nss-pem.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/external/nss/nss-pem.patch b/external/nss/nss-pem.patch index e24f7897e8d6..bc5abaf14b93 100644 --- a/external/nss/nss-pem.patch +++ b/external/nss/nss-pem.patch @@ -895,10 +895,10 @@ index 0000000..1547bf4 +#endif /* NSSCKBI_H */ diff --git a/a/nss/lib/ckfw/pem/pargs.c b/b/nss/lib/ckfw/pem/pargs.c new file mode 100644 -index 0000000..cff6e87 +index 0000000..21291a8 --- /dev/null +++ b/b/nss/lib/ckfw/pem/pargs.c -@@ -0,0 +1,163 @@ +@@ -0,0 +1,164 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * @@ -947,6 +947,7 @@ index 0000000..cff6e87 +char *pem_StrNdup(const char *instr, PRInt32 inlen) +{ + size_t len = inlen; ++ char *buffer; + if (!instr) { + return NULL; + } @@ -954,7 +955,7 @@ index 0000000..cff6e87 + if (!len) { + return NULL; + } -+ char *buffer = (char *) pem_Malloc(len + 1); ++ buffer = (char *) pem_Malloc(len + 1); + if (!buffer) { + return NULL; + } |