nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

date.c vs MONITOR_HEAP

Browse Source 
I tried building with MONITOR_HEAP defined for the first time in a
while.  It wasn't pretty.

date.c was calling libc's strdup() instead of our dupstr() so alloc.c
wasn't tracking those allocations when/if MONITOR_HEAP is enabled.
Then it called free() which is actually a call to nhfree() in that
situation.  If the file of allocations and releases was subsequently
fed to heaputil, it would complain about freeing pointers that hadn't
been allocated.

Worse, makedefs and tilemap wouldn't link.  For MONITOR_HEAP,
makedefs was undefining free() in order to avoid nhfree() but it now
links with date.o so got nhfree() calls anyway.  And it wouldn't link
because that routine isn't available without alloc.o.  tilemap
doesn't link with date.o but it does call malloc() and free() and it
wasn't undefining free(), so looked for nhfree() when linking and got
the same no-such-routine failure.
This commit is contained in:
PatR
2021-12-15 18:39:29 -08:00
parent d6a1835f0d
commit 0a0ee2d1e6
3 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/date.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 date.c $NHDT-Date: 1608933420 2020/12/25 21:57:00 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.17 $ */
/* NetHack 3.7 date.c $NHDT-Date: 1639622347 2021/12/16 02:39:07 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ */
/* Copyright (c) Michael Allison, 2021. */
/* NetHack may be freely redistributed. See license for details. */
@@ -100,7 +100,7 @@ populate_nomakedefs(struct version_info *version)
t.tm_sec = atoi(tmpbuf2);
timeresult = mktime(&t);
nomakedefs.build_time = (unsigned long) timeresult;
nomakedefs.build_date = strdup(tmpbuf1);
nomakedefs.build_date = dupstr(tmpbuf1);
}
nomakedefs.version_number = version->incarnation;
@@ -111,17 +111,16 @@ populate_nomakedefs(struct version_info *version)
nomakedefs.version_sanity1 = version->entity_count;
nomakedefs.version_sanity2 = version->struct_sizes1;
nomakedefs.version_sanity3 = version->struct_sizes2;
nomakedefs.version_string = strdup(mdlib_version_string(tmpbuf2, "."));
nomakedefs.version_id = strdup(version_id_string(tmpbuf2, sizeof tmpbuf2,
nomakedefs.build_date));
nomakedefs.copyright_banner_c = strdup(bannerc_string(
tmpbuf2, sizeof tmpbuf2,
nomakedefs.build_date));
nomakedefs.version_string = dupstr(mdlib_version_string(tmpbuf2, "."));
nomakedefs.version_id = dupstr(
version_id_string(tmpbuf2, sizeof tmpbuf2, nomakedefs.build_date));
nomakedefs.copyright_banner_c = dupstr(
bannerc_string(tmpbuf2, sizeof tmpbuf2, nomakedefs.build_date));
#ifdef NETHACK_GIT_SHA
nomakedefs.git_sha = strdup(NETHACK_GIT_SHA);
nomakedefs.git_sha = dupstr(NETHACK_GIT_SHA);
#endif
#ifdef NETHACK_GIT_BRANCH
nomakedefs.git_branch = strdup(NETHACK_GIT_BRANCH);
nomakedefs.git_branch = dupstr(NETHACK_GIT_BRANCH);
#endif
}
@@ -129,13 +128,17 @@ void
free_nomakedefs(void)
{
if (nomakedefs.build_date)
free((genericptr_t) nomakedefs.build_date);
free((genericptr_t) nomakedefs.build_date),
nomakedefs.build_date = 0;
if (nomakedefs.version_string)
free((genericptr_t) nomakedefs.version_string);
free((genericptr_t) nomakedefs.version_string),
nomakedefs.version_string = 0;
if (nomakedefs.version_id)
free((genericptr_t) nomakedefs.version_id);
free((genericptr_t) nomakedefs.version_id),
nomakedefs.version_id = 0;
if (nomakedefs.copyright_banner_c)
free((genericptr_t) nomakedefs.copyright_banner_c);
free((genericptr_t) nomakedefs.copyright_banner_c),
nomakedefs.copyright_banner_c = 0;
}
#endif /* __DATE__ && __TIME__ */