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
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
Subject: Fix overflow due to Str.c
Author: Tatsuya Kinoshita <tats@debian.org>
Bug-Chromium: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=31397
Bug-Chromium: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=31467
Bug-Chromium: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=31500
Prevent unintentional integer overflow in Strcat_charp_n
Prevent unintentional integer overflow in Strgrow
One more fix overflow due to Strgrow
Fix potential overflow due to Str.c
Fix integer overflow due to Strgrow
--- a/Str.c
+++ b/Str.c
@@ -21,10 +21,12 @@
#ifdef __EMX__ /* or include "fm.h" for HAVE_BCOPY? */
#include <strings.h>
#endif
+#include <limits.h>
#include "Str.h"
#include "myctype.h"
#define INITIAL_STR_SIZE 32
+#define STR_SIZE_MAX (INT_MAX - 1)
#ifdef STR_DEBUG
/* This is obsolete, because "Str" can handle a '\0' character now. */
@@ -48,8 +50,8 @@ Str
Strnew_size(int n)
{
Str x = GC_MALLOC(sizeof(struct _Str));
- if (n < 0)
- n = 0;
+ if (n < 0 || n >= STR_SIZE_MAX)
+ n = STR_SIZE_MAX - 1;
x->ptr = GC_MALLOC_ATOMIC(n + 1);
x->ptr[0] = '\0';
x->area_size = n + 1;
@@ -67,10 +69,13 @@ Strnew_charp(const char *p)
return Strnew();
x = GC_MALLOC(sizeof(struct _Str));
n = strlen(p) + 1;
+ if (n < 0 || n > STR_SIZE_MAX)
+ n = STR_SIZE_MAX;
x->ptr = GC_MALLOC_ATOMIC(n);
x->area_size = n;
x->length = n - 1;
- bcopy((void *)p, (void *)x->ptr, n);
+ bcopy((void *)p, (void *)x->ptr, n - 1);
+ x->ptr[x->length] = '\0';
return x;
}
@@ -96,6 +101,8 @@ Strnew_charp_n(const char *p, int n)
if (p == NULL)
return Strnew_size(n);
x = GC_MALLOC(sizeof(struct _Str));
+ if (n < 0 || n >= STR_SIZE_MAX)
+ n = STR_SIZE_MAX - 1;
x->ptr = GC_MALLOC_ATOMIC(n + 1);
x->area_size = n + 1;
x->length = n;
@@ -149,15 +156,19 @@ Strcopy_charp(Str x, const char *y)
STR_LENGTH_CHECK(x);
if (y == NULL) {
x->length = 0;
+ x->ptr[0] = '\0';
return;
}
len = strlen(y);
+ if (len < 0 || len >= STR_SIZE_MAX)
+ len = STR_SIZE_MAX - 1;
if (x->area_size < len + 1) {
GC_free(x->ptr);
x->ptr = GC_MALLOC_ATOMIC(len + 1);
x->area_size = len + 1;
}
- bcopy((void *)y, (void *)x->ptr, len + 1);
+ bcopy((void *)y, (void *)x->ptr, len);
+ x->ptr[len] = '\0';
x->length = len;
}
@@ -169,16 +180,19 @@ Strcopy_charp_n(Str x, const char *y, int n)
STR_LENGTH_CHECK(x);
if (y == NULL) {
x->length = 0;
+ x->ptr[0] = '\0';
return;
}
+ if (len < 0 || len >= STR_SIZE_MAX)
+ len = STR_SIZE_MAX - 1;
if (x->area_size < len + 1) {
GC_free(x->ptr);
x->ptr = GC_MALLOC_ATOMIC(len + 1);
x->area_size = len + 1;
}
- bcopy((void *)y, (void *)x->ptr, n);
- x->ptr[n] = '\0';
- x->length = n;
+ bcopy((void *)y, (void *)x->ptr, len);
+ x->ptr[len] = '\0';
+ x->length = len;
}
void
@@ -189,10 +203,18 @@ Strcat_charp_n(Str x, const char *y, int n)
STR_LENGTH_CHECK(x);
if (y == NULL)
return;
+ if (n < 0)
+ n = STR_SIZE_MAX - 1;
newlen = x->length + n + 1;
+ if (newlen < 0 || newlen > STR_SIZE_MAX) {
+ newlen = STR_SIZE_MAX;
+ n = newlen - x->length - 1;
+ }
if (x->area_size < newlen) {
char *old = x->ptr;
- newlen = newlen * 3 / 2;
+ newlen += newlen / 2;
+ if (newlen < 0 || newlen > STR_SIZE_MAX)
+ newlen = STR_SIZE_MAX;
x->ptr = GC_MALLOC_ATOMIC(newlen);
x->area_size = newlen;
bcopy((void *)old, (void *)x->ptr, x->length);
@@ -234,12 +256,18 @@ Strgrow(Str x)
{
char *old = x->ptr;
int newlen;
- newlen = x->area_size * 6 / 5;
+ newlen = x->area_size + x->area_size / 5;
if (newlen == x->area_size)
newlen += 2;
+ if (newlen < 0 || newlen > STR_SIZE_MAX) {
+ newlen = STR_SIZE_MAX;
+ if (x->length + 1 >= newlen)
+ x->length = newlen - 2;
+ }
x->ptr = GC_MALLOC_ATOMIC(newlen);
x->area_size = newlen;
bcopy((void *)old, (void *)x->ptr, x->length);
+ x->ptr[x->length] = '\0';
GC_free(old);
}
@@ -315,6 +343,10 @@ Strdelete(Str s, int pos, int n)
{
int i;
STR_LENGTH_CHECK(s);
+ if (pos < 0 || s->length < pos)
+ return;
+ if (n < 0)
+ n = STR_SIZE_MAX - pos - 1;
if (s->length <= pos + n) {
s->ptr[pos] = '\0';
s->length = pos;
@@ -330,6 +362,8 @@ void
Strtruncate(Str s, int pos)
{
STR_LENGTH_CHECK(s);
+ if (pos < 0 || s->length < pos)
+ return;
s->ptr[pos] = '\0';
s->length = pos;
}
@@ -342,7 +376,7 @@ Strshrink(Str s, int n)
s->length = 0;
s->ptr[0] = '\0';
}
- else {
+ else if (n > 0) {
s->length -= n;
s->ptr[s->length] = '\0';
}
|
