[GLUTEN-8476][VL] Fix allocate and free memory #8477
Merged
+5
−1
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
jkhaliqi
force-pushed
the
jk_cve_allocate
branch
from
2b5814b to
8ba547b
Compare
FelixYBW
approved these changes
Jan 9, 2025
FelixYBW
reviewed
Jan 9, 2025
cpp/core/memory/MemoryAllocator.cc
Outdated
| @@ -172,14 +172,18 @@ bool StdMemoryAllocator::reallocateAligned(void* p, uint64_t alignment, int64_t | |||
| return false; | |||
| } | |||
| memcpy(reallocatedP, p, std::min(size, newSize)); | |||
| std::free(p); | |||
| if (p != nullptr) { | |||
There was a problem hiding this comment.
Let's add the check of p at beginning
if (newSize <= 0 && p==nullptr) {
There was a problem hiding this comment.
Thank you! Will switch the && to ||
FelixYBW
reviewed
Jan 9, 2025
cpp/core/memory/MemoryAllocator.cc
Outdated
| *out = reallocatedP; | ||
| bytes_ += (newSize - size); | ||
| return true; | ||
| } | ||
|
|
||
| bool StdMemoryAllocator::free(void* p, int64_t size) { | ||
| std::free(p); | ||
| if (p != nullptr) { |
There was a problem hiding this comment.
change to
if (p==nullptr) return false;
jkhaliqi
force-pushed
the
jk_cve_allocate
branch
2 times, most recently
from
6a19100 to
d3c9231
Compare
cpp/core/memory/MemoryAllocator.cc
Outdated
| @@ -157,7 +157,7 @@ bool StdMemoryAllocator::reallocate(void* p, int64_t size, int64_t newSize, void | |||
| } | |||
|
|
|||
| bool StdMemoryAllocator::reallocateAligned(void* p, uint64_t alignment, int64_t size, int64_t newSize, void** out) { | |||
| if (newSize <= 0) { | |||
| if (newSize <= 0 || p == nullptr) { | |||
There was a problem hiding this comment.
Can we throw exceptions (and other changes as well)? Since it's not usual to have a nullptr passed in for such functions.
There was a problem hiding this comment.
Could refer to the macros in
if needed
jkhaliqi
force-pushed
the
jk_cve_allocate
branch
from
d3c9231 to
a11df59
Compare
FelixYBW
reviewed
Jan 10, 2025
cpp/core/memory/MemoryAllocator.cc
Outdated
| @@ -157,6 +157,9 @@ bool StdMemoryAllocator::reallocate(void* p, int64_t size, int64_t newSize, void | |||
| } | |||
|
|
|||
| bool StdMemoryAllocator::reallocateAligned(void* p, uint64_t alignment, int64_t size, int64_t newSize, void** out) { | |||
| if (p == nullptr) { | |||
| throw gluten::GlutenException("p is nullptr"); | |||
| } | |||
There was a problem hiding this comment.
Hongze means to use the Macro:
GLUTEN_CHECK(p!=nullptr,"reallocate with nullptr");
There was a problem hiding this comment.
updated, thank you!
FelixYBW
reviewed
Jan 10, 2025
cpp/core/memory/MemoryAllocator.cc
Outdated
| @@ -179,6 +182,9 @@ bool StdMemoryAllocator::reallocateAligned(void* p, uint64_t alignment, int64_t | |||
| } | |||
|
|
|||
| bool StdMemoryAllocator::free(void* p, int64_t size) { | |||
| if (p == nullptr) { | |||
| throw gluten::GlutenException("p is nullptr"); | |||
| } | |||
There was a problem hiding this comment.
GLUTEN_CHECK(p!=nullptr, "free with nullptr");
There was a problem hiding this comment.
updated, thank you!
jkhaliqi
force-pushed
the
jk_cve_allocate
branch
from
a11df59 to
ef83329
Compare
FelixYBW
approved these changes
Jan 10, 2025
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.
What changes were proposed in this pull request?
Allocate and free memory in the same module
(Please fill in changes proposed in this fix)
(Fixes: #8476)