mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocaml: Use caml_alloc_initialized_string instead of memcpy.

Browse Source 
See this commit in libguestfs-common:
398dc56a6c
This commit is contained in:
Richard W.M. Jones
2020-02-06 10:17:35 +00:00
parent 378b49152d
commit 9f3148c791
5 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
generator/OCaml.ml
View File

@@ -509,12 +509,11 @@ copy_table (char * const * argv)
| name, FString ->
pr " v = caml_copy_string (%s->%s);\n" typ name
| name, FBuffer ->
pr " v = caml_alloc_string (%s->%s_len);\n" typ name;
pr " memcpy (String_val (v), %s->%s, %s->%s_len);\n"
pr " v = caml_alloc_initialized_string (%s->%s_len, %s->%s);\n"
typ name typ name
| name, FUUID ->
pr " v = caml_alloc_string (32);\n";
pr " memcpy (String_val (v), %s->%s, 32);\n" typ name
pr " v = caml_alloc_initialized_string (32, %s->%s);\n"
typ name
| name, (FBytes|FInt64|FUInt64) ->
pr " v = caml_copy_int64 (%s->%s);\n" typ name
| name, (FInt32|FUInt32) ->
@@ -762,8 +761,7 @@ copy_table (char * const * argv)
pr " for (i = 0; r[i] != NULL; ++i) free (r[i]);\n";
pr " free (r);\n";
| RBufferOut _ ->
pr " rv = caml_alloc_string (size);\n";
pr " memcpy (String_val (rv), r, size);\n";
pr " rv = caml_alloc_initialized_string (size, r);\n";
pr " free (r);\n"
);