Fix memory allocation and error handling in binfile_utils.cpp and prover.cpp #2
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
ziaptos
requested changes
Apr 3, 2024
| @@ -12,6 +12,11 @@ BinFile::BinFile(const void *fileData, size_t fileSize, std::string _type, uint3 | |||
|
|
|||
| size = fileSize; | |||
| addr = malloc(size); | |||
|
|
|||
| if (addr == nullptr) { | |||
There was a problem hiding this comment.
A better solution is to use unique_ptr<char[]>, or even better - to not copy the data at all (checkout zi/feedback in my fork).
| @@ -24,6 +24,12 @@ static size_t PublicBufferMinSize(size_t count) | |||
| return count * 82 + 4; | |||
| } | |||
|
|
|||
| /** | |||
| * Verifies the given prime numbers. | |||
There was a problem hiding this comment.
These comments are more noise than useful.
| @@ -139,21 +175,21 @@ groth16_prover(const void *zkey_buffer, unsigned long zkey_size, | |||
| } catch (std::exception& e) { | |||
|
|
|||
| if (error_msg) { | |||
| strncpy(error_msg, e.what(), error_msg_maxsize); | |||
| strlcpy(error_msg, e.what(), error_msg_maxsize); | |||
There was a problem hiding this comment.
Error messages are already null terminated, no need to double terminate them. But OK to use them I guess.
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.
I added two checks to ensure no NULL pointer after memory operations, and use of
strlcpyto ensure null terminated strings on error. I also commented on a couple of functions.