X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=ocaml%2Fguestfs_c.c;h=86fa29390d631426e4f233ef207af71c13dd14e3;hp=87139b487277ee1c25060eee16db8cea4dc49062;hb=ab0397017cc26833c09946cca19d86b907822a94;hpb=6f5c3984a7ddfc111287e2ec214ba823db737db4 diff --git a/ocaml/guestfs_c.c b/ocaml/guestfs_c.c index 87139b4..86fa293 100644 --- a/ocaml/guestfs_c.c +++ b/ocaml/guestfs_c.c @@ -111,15 +111,19 @@ ocaml_guestfs_close (value gv) CAMLreturn (Val_unit); } -/* Copy string array value. */ +/* Copy string array value. + * The return value is only 'safe' provided we don't allocate anything + * further on the OCaml heap (ie. cannot trigger the OCaml GC) because + * that could move the strings around. + */ char ** -ocaml_guestfs_strings_val (value sv) +ocaml_guestfs_strings_val (guestfs_h *g, value sv) { CAMLparam1 (sv); char **r; int i; - r = malloc (sizeof (char *) * (Wosize_val (sv) + 1)); + r = guestfs_safe_malloc (g, sizeof (char *) * (Wosize_val (sv) + 1)); for (i = 0; i < Wosize_val (sv); ++i) r[i] = String_val (Field (sv, i)); r[i] = NULL;