Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/provider/provider_tracking.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,26 +291,26 @@ static umf_result_t trackingAllocationMerge(void *hProvider, void *lowPtr,
tracker_alloc_info_t *lowValue = (tracker_alloc_info_t *)critnib_get(
provider->hTracker->alloc_segments_map, (uintptr_t)lowPtr);
if (!lowValue) {
LOG_ERR("no left value");
LOG_FATAL("no left value");
ret = UMF_RESULT_ERROR_INVALID_ARGUMENT;
goto err;
goto err_assert;
}
tracker_alloc_info_t *highValue = (tracker_alloc_info_t *)critnib_get(
provider->hTracker->alloc_segments_map, (uintptr_t)highPtr);
if (!highValue) {
LOG_ERR("no right value");
LOG_FATAL("no right value");
ret = UMF_RESULT_ERROR_INVALID_ARGUMENT;
goto err;
goto err_assert;
}
if (lowValue->pool != highValue->pool) {
LOG_ERR("pool mismatch");
LOG_FATAL("pool mismatch");
ret = UMF_RESULT_ERROR_INVALID_ARGUMENT;
goto err;
goto err_assert;
}
if (lowValue->size + highValue->size != totalSize) {
LOG_ERR("lowValue->size + highValue->size != totalSize");
LOG_FATAL("lowValue->size + highValue->size != totalSize");
ret = UMF_RESULT_ERROR_INVALID_ARGUMENT;
goto err;
goto err_assert;
}

ret = umfMemoryProviderAllocationMerge(provider->hUpstream, lowPtr, highPtr,
Expand Down Expand Up @@ -342,7 +342,7 @@ static umf_result_t trackingAllocationMerge(void *hProvider, void *lowPtr,

return UMF_RESULT_SUCCESS;

err:
err_assert:
assert(0);

not_merged:
Expand Down
Loading