Skip to content

Commit 612c86d

Browse files
committed
Remove dead code in libmbfl, memory device
1 parent 72a5fde commit 612c86d

File tree

1 file changed

+0
-46
lines changed

1 file changed

+0
-46
lines changed

ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,6 @@ mbfl_memory_device_output(int c, void *data)
148148
/* overflow */
149149
return -1;
150150
}
151-
152-
newlen = device->length + device->allocsz;
153-
tmp = (unsigned char *)mbfl_realloc((void *)device->buffer, newlen);
154-
if (tmp == NULL) {
155-
return -1;
156-
}
157-
device->length = newlen;
158-
device->buffer = tmp;
159151
}
160152

161153
device->buffer[device->pos++] = (unsigned char)c;
@@ -176,14 +168,6 @@ mbfl_memory_device_output2(int c, void *data)
176168
/* overflow */
177169
return -1;
178170
}
179-
180-
newlen = device->length + device->allocsz;
181-
tmp = (unsigned char *)mbfl_realloc((void *)device->buffer, newlen);
182-
if (tmp == NULL) {
183-
return -1;
184-
}
185-
device->length = newlen;
186-
device->buffer = tmp;
187171
}
188172

189173
device->buffer[device->pos++] = (unsigned char)((c >> 8) & 0xff);
@@ -206,14 +190,6 @@ mbfl_memory_device_output4(int c, void* data)
206190
/* overflow */
207191
return -1;
208192
}
209-
210-
newlen = device->length + device->allocsz;
211-
tmp = (unsigned char *)mbfl_realloc((void *)device->buffer, newlen);
212-
if (tmp == NULL) {
213-
return -1;
214-
}
215-
device->length = newlen;
216-
device->buffer = tmp;
217193
}
218194

219195
device->buffer[device->pos++] = (unsigned char)((c >> 24) & 0xff);
@@ -245,15 +221,6 @@ mbfl_memory_device_strncat(mbfl_memory_device *device, const char *psrc, size_t
245221
/* overflow */
246222
return -1;
247223
}
248-
249-
newlen = device->length + len + MBFL_MEMORY_DEVICE_ALLOC_SIZE;
250-
tmp = (unsigned char *)mbfl_realloc((void *)device->buffer, newlen);
251-
if (tmp == NULL) {
252-
return -1;
253-
}
254-
255-
device->length = newlen;
256-
device->buffer = tmp;
257224
}
258225

259226
w = &device->buffer[device->pos];
@@ -307,19 +274,6 @@ mbfl_wchar_device_output(int c, void *data)
307274
/* overflow */
308275
return -1;
309276
}
310-
311-
newlen = device->length + device->allocsz;
312-
if (newlen > SIZE_MAX / sizeof(int)) {
313-
/* overflow */
314-
return -1;
315-
}
316-
317-
tmp = (unsigned int *)mbfl_realloc((void *)device->buffer, newlen*sizeof(int));
318-
if (tmp == NULL) {
319-
return -1;
320-
}
321-
device->length = newlen;
322-
device->buffer = tmp;
323277
}
324278

325279
device->buffer[device->pos++] = c;

0 commit comments

Comments
 (0)