PR#5004: overflow in Buffer.add_channel

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10216 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Xavier Leroy 2010-03-28 08:16:45 +00:00
parent 18dc114330
commit 8f0185c58d
2 changed files with 3 additions and 0 deletions

View File

@ -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:

View File

@ -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