Skip to content

fix(profiling/heap): check correctly maximum number of tracked allocs #3162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 24, 2022
Merged

fix(profiling/heap): check correctly maximum number of tracked allocs #3162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88e9cbf
fix(profiling/heap): check correctly maximum number of tracked allocs
jd Jan 24, 2022
39a7c43
Merge branch 'master' into profiling/check-max-allocation-length
brettlangdon Jan 24, 2022
6fdc24a
Merge branch 'master' into profiling/check-max-allocation-length
P403n1x87 Jan 24, 2022
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
6 changes: 4 additions & 2 deletions ddtrace/profiling/collector/_memalloc_heap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,10 @@ memalloc_heap_track(uint16_t max_nframe, void* ptr, size_t size)
if (global_heap_tracker.allocated_memory < global_heap_tracker.current_sample_size)
return false;

/* Cannot add more sample */
if (global_heap_tracker.allocs.count >= TRACEBACK_ARRAY_MAX_COUNT)
/* Check if we can add more samples: the sum of the freezer + alloc tracker
cannot be greater than what the alloc tracker can handle: when the alloc
tracker is thawed, all the allocs in the freezer will be moved there!*/
if ((global_heap_tracker.freezer.allocs.count + global_heap_tracker.allocs.count) >= TRACEBACK_ARRAY_MAX_COUNT)
return false;

traceback_t* tb = memalloc_get_traceback(max_nframe, ptr, global_heap_tracker.allocated_memory);
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/profiler-heap-max-alloc-bugfix-646423cdd7f7811f.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- |
Fix a possible bug in the heap memory profiler that could trigger an
overflow when too many allocations were being tracked.