diff options
| author | bcpierce00 <bcpierce00@users.noreply.github.com> | 2016-12-24 16:45:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-24 16:45:18 -0500 |
| commit | d860a697fcd507cabae25dfded22dd03f5a6d920 (patch) | |
| tree | a65dcab6721bf209aec868ae22fe1a6ad9cbe539 /src | |
| parent | 18322845cf589482f0297f8ac5fcb4035dbc123c (diff) | |
| parent | c1ddff13aa96b124680cce61673129aeb563dbf7 (diff) | |
| download | unison-d860a697fcd507cabae25dfded22dd03f5a6d920.zip unison-d860a697fcd507cabae25dfded22dd03f5a6d920.tar.gz unison-d860a697fcd507cabae25dfded22dd03f5a6d920.tar.bz2 | |
Merge pull request #55 from alexmarkley/48-segfault
Fix rare SIGSEGV when transferring large replicas.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bytearray_stubs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bytearray_stubs.c b/src/bytearray_stubs.c index f9b4b51..e64a6ab 100644 --- a/src/bytearray_stubs.c +++ b/src/bytearray_stubs.c @@ -5,6 +5,7 @@ #include "caml/intext.h" #include "caml/bigarray.h" +#include "caml/memory.h" CAMLprim value ml_marshal_to_bigarray(value v, value flags) { @@ -21,9 +22,12 @@ CAMLprim value ml_marshal_to_bigarray(value v, value flags) CAMLprim value ml_unmarshal_from_bigarray(value b, value ofs) { + CAMLparam1(b); /* Holds [b] live until unmarshalling completes. */ + value result; struct caml_bigarray *b_arr = Bigarray_val(b); - return input_value_from_block (Array_data (b_arr, ofs), + result = input_value_from_block (Array_data (b_arr, ofs), b_arr->dim[0] - Long_val(ofs)); + CAMLreturn(result); } CAMLprim value ml_blit_string_to_bigarray |