deal with null bytes in buffer from get/setsockopt

Author: avsm

lib_eio_linux/eio_stubs.c

@@ -265,7 +265,7 @@ CAMLprim value caml_eio_sockopt_string_set(value v_fd, value v_level, value v_op
   CAMLparam4(v_fd, v_level, v_option, v_val);
   const char *str = String_val(v_val);
   int ret = setsockopt(Int_val(v_fd), Int_val(v_level), Int_val(v_option),
-                       str, strlen(str) + 1);
+                       str, caml_string_length(v_val));
   if (ret == -1) uerror("setsockopt", Nothing);
   CAMLreturn(Val_unit);
 }
@@ -278,7 +278,6 @@ CAMLprim value caml_eio_sockopt_string_get(value v_fd, value v_level, value v_op
   int ret = getsockopt(Int_val(v_fd), Int_val(v_level), Int_val(v_option),
                        buffer, &len);
   if (ret == -1) uerror("getsockopt", Nothing);
-  buffer[len < sizeof(buffer) ? len : sizeof(buffer) - 1] = '\0';
-  v_result = caml_copy_string(buffer);
+  v_result = caml_alloc_initialized_string(len, buffer);
   CAMLreturn(v_result);
 }