Fix ocaml-ssl segfault with multicore #81
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dra27
reviewed
May 3, 2022
There was a problem hiding this comment.
The problem is the out-of-heap pointer - you could instead choose to box it (cf. Interfacing with C in the manual roughly with the two suggestions. The result would be no change on the OCaml side at all.
| @@ -559,11 +559,6 @@ CAMLprim value ocaml_ssl_digest(value vevp, value vcert) | |||
| CAMLreturn(vdigest); | |||
| } | |||
|
|
|||
| CAMLprim value ocaml_ssl_get_client_verify_callback_ptr(value unit) | |||
| { | |||
| return (value)client_verify_callback; | |||
There was a problem hiding this comment.
value v = caml_alloc_small(1, Abstract_tag);
*((int(*) (int, X509_STORE_CTX*)) Data_abstract_val(v)) = client_verify_callback;
return v;| @@ -610,7 +605,7 @@ CAMLprim value ocaml_ssl_ctx_set_verify(value context, value vmode, value vcallb | |||
| } | |||
|
|
|||
| if (Is_block(vcallback)) | |||
| callback = (int(*) (int, X509_STORE_CTX*))Field(vcallback, 0); | |||
| callback = (int(*) (int, X509_STORE_CTX*)) client_verify_callback; | |||
There was a problem hiding this comment.
and then:
Suggested change
| callback = (int(*) (int, X509_STORE_CTX*)) client_verify_callback; | |
| callback = *(int(*) (int, X509_STORE_CTX*)) Data_abstract_val(Field(vcallback, 0)); |
|
Closing this in favor of #83 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #76