]> granicus.if.org Git - php/commitdiff
Remove dead code in libmbfl, memory device
authorGeorge Peter Banyard <girgias@php.net>
Fri, 13 Dec 2019 16:58:37 +0000 (17:58 +0100)
committerGeorge Peter Banyard <girgias@php.net>
Fri, 13 Dec 2019 16:58:37 +0000 (17:58 +0100)
ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c

index 0dd8ea2e664c6c2279f4f789c03faaf99297e701..7b87d645cce701a44a7b5c375b587431067b9192 100644 (file)
@@ -148,14 +148,6 @@ mbfl_memory_device_output(int c, void *data)
                        /* overflow */
                        return -1;
                }
-
-               newlen = device->length + device->allocsz;
-               tmp = (unsigned char *)mbfl_realloc((void *)device->buffer, newlen);
-               if (tmp == NULL) {
-                       return -1;
-               }
-               device->length = newlen;
-               device->buffer = tmp;
        }
 
        device->buffer[device->pos++] = (unsigned char)c;
@@ -176,14 +168,6 @@ mbfl_memory_device_output2(int c, void *data)
                        /* overflow */
                        return -1;
                }
-
-               newlen = device->length + device->allocsz;
-               tmp = (unsigned char *)mbfl_realloc((void *)device->buffer, newlen);
-               if (tmp == NULL) {
-                       return -1;
-               }
-               device->length = newlen;
-               device->buffer = tmp;
        }
 
        device->buffer[device->pos++] = (unsigned char)((c >> 8) & 0xff);
@@ -206,14 +190,6 @@ mbfl_memory_device_output4(int c, void* data)
                        /* overflow */
                        return -1;
                }
-
-               newlen = device->length + device->allocsz;
-               tmp = (unsigned char *)mbfl_realloc((void *)device->buffer, newlen);
-               if (tmp == NULL) {
-                       return -1;
-               }
-               device->length = newlen;
-               device->buffer = tmp;
        }
 
        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
                        /* overflow */
                        return -1;
                }
-
-               newlen = device->length + len + MBFL_MEMORY_DEVICE_ALLOC_SIZE;
-               tmp = (unsigned char *)mbfl_realloc((void *)device->buffer, newlen);
-               if (tmp == NULL) {
-                       return -1;
-               }
-
-               device->length = newlen;
-               device->buffer = tmp;
        }
 
        w = &device->buffer[device->pos];
@@ -307,19 +274,6 @@ mbfl_wchar_device_output(int c, void *data)
                        /* overflow */
                        return -1;
                }
-
-               newlen = device->length + device->allocsz;
-               if (newlen > SIZE_MAX / sizeof(int)) {
-                       /* overflow */
-                       return -1;
-               }
-
-               tmp = (unsigned int *)mbfl_realloc((void *)device->buffer, newlen*sizeof(int));
-               if (tmp == NULL) {
-                       return -1;
-               }
-               device->length = newlen;
-               device->buffer = tmp;
        }
 
        device->buffer[device->pos++] = c;