File: fix-ftbfs-s390x.patch

package info (click to toggle)
nss-pem 1.0.8%2B1-1
  • links: PTS, VCS
  • area: main
  • in suites: bookworm
  • size: 209,548 kB
  • sloc: ansic: 894,157; cpp: 89,920; asm: 51,237; sh: 19,659; python: 6,347; xml: 4,807; perl: 2,156; makefile: 2,097; javascript: 1,538; lex: 306; yacc: 79; sed: 19; csh: 10
file content (105 lines) | stat: -rw-r--r-- 3,848 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
Description: Fix FTBFS on s390x
 error: ‘element’ may be used uninitialized in this function
 error: ‘cmpResult’ may be used uninitialized in this function
 error: ‘value’ may be used uninitialized in this function
 error: sprintf may write a terminating nul past the end of the destination
Author: Eduardo Barretto <eduardo.barretto@canonical.com>

--- a/nss/nss/cmd/certutil/certext.c
+++ b/nss/nss/cmd/certutil/certext.c
@@ -327,7 +327,7 @@ AddKeyUsage(void *extHandle, const char
     SECItem bitStringValue;
     unsigned char keyUsage = 0x0;
     char buffer[5];
-    int value;
+    int value = 0;
     char *nextPos = (char *)userSuppliedValue;
     PRBool isCriticalExt = PR_FALSE;
 
@@ -510,7 +510,7 @@ static SECStatus
 AddExtKeyUsage(void *extHandle, const char *userSuppliedValue)
 {
     char buffer[5];
-    int value;
+    int value = 0;
     CERTOidSequence *os;
     SECStatus rv;
     SECItem *item;
@@ -664,7 +664,7 @@ AddNscpCertType(void *extHandle, const c
     SECItem bitStringValue;
     unsigned char keyUsage = 0x0;
     char buffer[5];
-    int value;
+    int value = 0;
     char *nextPos = (char *)userSuppliedValue;
     PRBool isCriticalExt = PR_FALSE;
 
--- a/nss/nss/cmd/modutil/install.c
+++ b/nss/nss/cmd/modutil/install.c
@@ -798,6 +798,7 @@ rm_dash_r(char *path)
     PRDirEntry *entry;
     PRFileInfo fileinfo;
     char filename[240];
+    int count;
 
     if (PR_GetFileInfo(path, &fileinfo) != PR_SUCCESS) {
         /*fprintf(stderr, "Error: Unable to access %s\n", filename);*/
@@ -812,7 +813,11 @@ rm_dash_r(char *path)
 
         /* Recursively delete all entries in the directory */
         while ((entry = PR_ReadDir(dir, PR_SKIP_BOTH)) != NULL) {
-            sprintf(filename, "%s/%s", path, entry->name);
+            count = snprintf(filename, sizeof(filename), "%s/%s", path, entry->name);
+            if (count >= sizeof(filename)) {
+                PR_fprintf(PR_STDERR, "Error: Unable to find filename %s\n", filename);
+                return -1;
+            }
             if (rm_dash_r(filename)) {
                 PR_CloseDir(dir);
                 return -1;
--- a/nss/nss/cmd/signtool/util.c
+++ b/nss/nss/cmd/signtool/util.c
@@ -121,6 +121,7 @@ rm_dash_r(char *path)
     PRDirEntry *entry;
     PRFileInfo fileinfo;
     char filename[FNSIZE];
+    int count;
 
     if (PR_GetFileInfo(path, &fileinfo) != PR_SUCCESS) {
         /*fprintf(stderr, "Error: Unable to access %s\n", filename);*/
@@ -137,7 +138,12 @@ rm_dash_r(char *path)
 
         /* Recursively delete all entries in the directory */
         while ((entry = PR_ReadDir(dir, PR_SKIP_BOTH)) != NULL) {
-            sprintf(filename, "%s/%s", path, entry->name);
+            count = snprintf(filename, sizeof(filename), "%s/%s", path, entry->name);
+            if (count >= sizeof(filename)) {
+                PR_fprintf(errorFD, "Error: Unable to find filename %s.\n", filename);
+                errorCount++;
+                exit(ERRX);
+            }
             if (rm_dash_r(filename)) {
                 PR_CloseDir(dir);
                 return -1;
--- a/nss/nss/lib/libpkix/pkix/util/pkix_list.c
+++ b/nss/nss/lib/libpkix/pkix/util/pkix_list.c
@@ -1535,7 +1535,7 @@ PKIX_List_SetItem(
         PKIX_PL_Object *item,
         void *plContext)
 {
-        PKIX_List *element;
+        PKIX_List *element = NULL;
 
         PKIX_ENTER(LIST, "PKIX_List_SetItem");
         PKIX_NULLCHECK_ONE(list);
--- a/nss/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c
+++ b/nss/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c
@@ -107,7 +107,7 @@ pkix_pl_OID_Equals(
         PKIX_Boolean *pResult,
         void *plContext)
 {
-        PKIX_Int32 cmpResult;
+        PKIX_Int32 cmpResult = 0;
 
         PKIX_ENTER(OID, "pkix_pl_OID_Equals");
         PKIX_NULLCHECK_THREE(first, second, pResult);