diff options
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | stdlib/buffer.ml | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -58,6 +58,7 @@ Standard library: Bug Fixes: - PR#4775: compiler crash on crazy types (temporary fix) +- PR#5004: problem in Buffer.add_channel with very large lengths. - PR#5008: on AMD64/MSVC port, rare float corruption during GC. Objective Caml 3.11.2: diff --git a/stdlib/buffer.ml b/stdlib/buffer.ml index 088840981..9327aaefb 100644 --- a/stdlib/buffer.ml +++ b/stdlib/buffer.ml @@ -100,6 +100,8 @@ let add_buffer b bs = add_substring b bs.buffer 0 bs.position let add_channel b ic len = + if len < 0 || len > Sys.max_string_length then (* PR#5004 *) + invalid_arg "Buffer.add_channel"; if b.position + len > b.length then resize b len; really_input ic b.buffer b.position len; b.position <- b.position + len |