to_binary() should never return a null BinaryData #5161
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
RedBeard0531
commented
Dec 6, 2022
| @@ -917,6 919,14 @@ typename T::Value Value<T>::from_mixed(ContextType ctx, std::shared_ptr<Realm> r | |||
| } | |||
| } | |||
|
|
|||
| template <typename T> | |||
| inline OwnedBinaryData Value<T>::to_binary(typename T::Context ctx, const ValueType& value) | |||
There was a problem hiding this comment.
The real fix was introducing making to_binary a wrapper function that makes sure not to return null BinaryData. This felt cleaner to me than adding the logic to all return paths on both implementations.
| binary_data = NodeBinaryManager<Napi::DataView, Napi::Value>{value}.create_binary_blob(); | ||
| legal_conversion = true; | ||
| } | ||
| else if (value.IsBuffer()) { |
There was a problem hiding this comment.
Buffer is a subclass of TypedArray, so this version was redundant with the next.
| @@ -250,33 250,23 @@ inline double node::Value::to_number(Napi::Env env, const Napi::Value& value) | |||
| } | |||
|
|
|||
| template <> | |||
| inline OwnedBinaryData node::Value::to_binary(Napi::Env env, const Napi::Value& value) | |||
There was a problem hiding this comment.
This code and the related node_buffer.hpp was bad enough that I felt a duty to clean it up. If you would prefer, I can split this to a different commit.
There was a problem hiding this comment.
No need to split it as it is a relative small commit
kneth
approved these changes
Dec 6, 2022
| @@ -250,33 250,23 @@ inline double node::Value::to_number(Napi::Env env, const Napi::Value& value) | |||
| } | |||
|
|
|||
| template <> | |||
| inline OwnedBinaryData node::Value::to_binary(Napi::Env env, const Napi::Value& value) | |||
There was a problem hiding this comment.
No need to split it as it is a relative small commit
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What, How & Why?
This closes #5114
☑️ ToDos
[ ] 📝Compatibilitylabel is updated or copied from previous entry[ ] 📝 UpdateCOMPATIBILITY.md[ ] 🔀 Executed flexible sync tests locally if modifying flexible sync[ ] 📦 Updated internal package version in consumingpackage.jsons (if updating internal packages)[ ] 📱 Check the React Native/other sample apps work if necessary[ ] 📝 Public documentation PR created or is not necessary[ ] 💥Breakinglabel has been applied or is not necessaryIf this PR adds or changes public API's:
[ ] typescript definitions file is updated[ ] jsdoc files updated