mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#72277: NSS-PEM yet another build fix for MS compiler

Browse Source 
Change-Id: I524a14cd124e69e288de5ae8464eb611989dffde
This commit is contained in:
Cédric Bosdonnat
2014-07-15 12:26:42 +02:00
parent 6602f904ac
commit 85d1bd151c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
external/nss/nss-pem.patch vendored
View File

@@ -895,10 +895,10 @@ index 0000000..1547bf4
+#endif /* NSSCKBI_H */ +#endif /* NSSCKBI_H */
diff --git a/a/nss/lib/ckfw/pem/pargs.c b/b/nss/lib/ckfw/pem/pargs.c diff --git a/a/nss/lib/ckfw/pem/pargs.c b/b/nss/lib/ckfw/pem/pargs.c
new file mode 100644 new file mode 100644
index 0000000..cff6e87 index 0000000..21291a8
--- /dev/null --- /dev/null
+++ b/b/nss/lib/ckfw/pem/pargs.c +++ b/b/nss/lib/ckfw/pem/pargs.c
@@ -0,0 +1,163 @@ @@ -0,0 +1,164 @@
+/* ***** BEGIN LICENSE BLOCK ***** +/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * 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) +char *pem_StrNdup(const char *instr, PRInt32 inlen)
+{ +{
+ size_t len = inlen; + size_t len = inlen;
+ char *buffer;
+ if (!instr) { + if (!instr) {
+ return NULL; + return NULL;
+ } + }
@@ -954,7 +955,7 @@ index 0000000..cff6e87
+ if (!len) { + if (!len) {
+ return NULL; + return NULL;
+ } + }
+ char *buffer = (char *) pem_Malloc(len + 1); + buffer = (char *) pem_Malloc(len + 1);
+ if (!buffer) { + if (!buffer) {
+ return NULL; + return NULL;
+ } + }