diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-08 18:55:46 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-08 18:55:46 +0000 |
commit | 13bd7f95bf5efb4e4acf274baf20636682ea4b58 (patch) | |
tree | 52be8506db2e6b18b44caf403a9a7fcc02030ee6 /src/map/map.c | |
parent | 0d24db22f0c4aeef985588da3b852078045cdda2 (diff) | |
download | hercules-13bd7f95bf5efb4e4acf274baf20636682ea4b58.tar.gz hercules-13bd7f95bf5efb4e4acf274baf20636682ea4b58.tar.bz2 hercules-13bd7f95bf5efb4e4acf274baf20636682ea4b58.tar.xz hercules-13bd7f95bf5efb4e4acf274baf20636682ea4b58.zip |
- Changed the map_freeblock_unlock code so that when there's an "already free'd pointer" error, the memory manager will print out the invoking function rather than map_freeblock_unlock, this should help fix it up next time it happens.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8189 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
-rw-r--r-- | src/map/map.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c index 2428cc6e2..71af45530 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -290,13 +290,15 @@ int map_freeblock_lock (void) * バッファにたまっていたblockを全部削除 *------------------------------------------ */ -int map_freeblock_unlock (void) +//int map_freeblock_unlock (void) +int map_freeblock_unlock_sub(char *file, int lineno) { if ((--block_free_lock) == 0) { int i; for (i = 0; i < block_free_count; i++) { //Directly calling aFree shouldn't be a leak, as Free remembers the size the original pointed to memory was allocated with? [Skotlex] - aFree(block_free[i]); +// aFree(block_free[i]); + _mfree(block_free[i], file, lineno, __func__); block_free[i] = NULL; } block_free_count = 0; |