Skip to content

Handle the empty skip_free_list correctly #106

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle the empty skip_free_list correctly #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 30 additions & 45 deletions chunk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2016,23 +2016,18 @@ int _dmalloc_chunk_heap_check(void)
* switch to the free list in the middle after we've checked the
* used pointer slots
*/
if (slot_p == NULL) {
checking_list_c++;
if (checking_list_c == 1) {
slot_p = skip_free_list->sa_next_p[0];
}
if (slot_p == NULL && checking_list_c == 0) {
slot_p = skip_free_list->sa_next_p[0];
checking_list_c = 1;
}
#if FREED_POINTER_DELAY
else if (checking_list_c == 2) {
slot_p = free_wait_list_head;
}
if (slot_p == NULL && checking_list_c == 1) {
slot_p = free_wait_list_head;
checking_list_c = 2;
}
#endif
else {
/* we are done */
break;
}
if (slot_p == NULL) {
break;
}
if (slot_p == NULL) {
break;
}

/* better be in the heap */
Expand Down Expand Up @@ -2852,23 +2847,18 @@ void _dmalloc_chunk_log_changed(const unsigned long mark,
* switch to the free list in the middle after we've checked the
* used pointer slots
*/
if (slot_p == NULL) {
checking_list_c++;
if (checking_list_c == 1) {
slot_p = skip_free_list->sa_next_p[0];
}
if (slot_p == NULL && checking_list_c == 0) {
slot_p = skip_free_list->sa_next_p[0];
checking_list_c = 1;
}
#if FREED_POINTER_DELAY
else if (checking_list_c == 2) {
slot_p = free_wait_list_head;
}
if (slot_p == NULL && checking_list_c == 1) {
slot_p = free_wait_list_head;
checking_list_c = 2;
}
#endif
else {
/* we are done */
break;
}
if (slot_p == NULL) {
break;
}
if (slot_p == NULL) {
break;
}

freed_b = BIT_IS_SET(slot_p->sa_flags, ALLOC_FLAG_FREE);
Expand Down Expand Up @@ -2982,23 +2972,18 @@ unsigned long _dmalloc_chunk_count_changed(const unsigned long mark,
* switch to the free list in the middle after we've checked the
* used pointer slots
*/
if (slot_p == NULL) {
checking_list_c++;
if (checking_list_c == 1) {
slot_p = skip_free_list->sa_next_p[0];
}
if (slot_p == NULL && checking_list_c == 0) {
slot_p = skip_free_list->sa_next_p[0];
checking_list_c = 1;
}
#if FREED_POINTER_DELAY
else if (checking_list_c == 2) {
slot_p = free_wait_list_head;
}
if (slot_p == NULL && checking_list_c == 1) {
slot_p = free_wait_list_head;
checking_list_c = 2;
}
#endif
else {
/* we are done */
break;
}
if (slot_p == NULL) {
break;
}
if (slot_p == NULL) {
break;
}

freed_b = BIT_IS_SET(slot_p->sa_flags, ALLOC_FLAG_FREE);
Expand Down