Skip to content

Should return FREE_NOERROR if the config accept NULL pointer #105

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
xiaoxiang781216 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Should return FREE_NOERROR if the config accept NULL pointer #105

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion chunk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2404,8 +2404,10 @@ int _dmalloc_chunk_free(const char *file, const unsigned int line,

#if ALLOW_FREE_NULL == 0
dmalloc_errno = DMALLOC_ERROR_IS_NULL;
#endif
return FREE_ERROR;
#else
return FREE_NOERROR;
#endif
}

update_p = skip_update;
Expand Down
5 changes: 5 additions & 0 deletions dmalloc_t.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1897,8 +1897,13 @@ static int check_special(void)
#endif

/* now test the dmalloc_free function */
#if ALLOW_FREE_NULL
if (dmalloc_free(__FILE__, __LINE__, NULL,
DMALLOC_FUNC_FREE) != FREE_NOERROR) {
#else
if (dmalloc_free(__FILE__, __LINE__, NULL,
DMALLOC_FUNC_FREE) != FREE_ERROR) {
#endif
if (! silent_b) {
loc_printf(" ERROR: free of NULL should have failed.\n");
}
Expand Down