jni: fix support for non-direct byte buffers #1950
Merged
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
Signed-off-by: Mike Schore <mike.schore@gmail.com>
carloseltuerto
approved these changes
Nov 29, 2021
| // Returns -1 if the buffer is not a direct buffer. | ||
| jlong data_length = env->GetDirectBufferCapacity(j_data); | ||
|
|
||
| if (data_length < 0) { |
There was a problem hiding this comment.
I really missed a step with my "ultra safe refactoring"...
Thanks!
There was a problem hiding this comment.
No worries - I actually think our integration tests would have caught it; they're just unfortunately turned off at the moment. I intend to fix them up and re-enable them in the near future. :)
There was a problem hiding this comment.
The integration tests do currently run on linux: https://github.com/envoyproxy/envoy-mobile/blob/main/.github/workflows/android_tests.yml#L134
Signed-off-by: Mike Schore <mike.schore@gmail.com>
junr03
approved these changes
Nov 30, 2021
There was a problem hiding this comment.
I have not had the chance to test on the Lyft apps (where I originally encountered the problem). But given @carloseltuerto approval I feel comfortable approving.
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.
Description: #1906 introduced path whereby the check for whether a buffer is direct was skipped, then treated the -1 value returned by the capacity check as an unsigned size for allocation. This fix ensures the check always happens.
Risk Level: Low
Testing: Kotlin integration tests need to be re-enabled.
Signed-off-by: Mike Schore mike.schore@gmail.com