Quellcode durchsuchen

- Changed the memory manager fatal errors when allocating memory to print out the size request as well as the file and line where they originated.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6165 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex vor 19 Jahren
Ursprung
Commit
a0b8ab2e66
2 geänderte Dateien mit 5 neuen und 2 gelöschten Zeilen
  1. 3 0
      Changelog-Trunk.txt
  2. 2 2
      src/common/malloc.c

+ 3 - 0
Changelog-Trunk.txt

@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/04/18
+	* Changed the memory manager fatal errors when allocating memory to print
+	  out the size request as well as the file and line where they originated.
+	  [Skotlex]
 	* Fixed the delete_timer (@summons, alchemist plants) not invoking
 	  unit_free, hence causing memory leaks and the like. [Skotlex]
 	* Applied jA's patch to fix a bug in the scripting engine in regards to

+ 2 - 2
src/common/malloc.c

@@ -257,7 +257,7 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func ) {
 			*(int*)((char*)p + sizeof(struct unit_head_large) - sizeof(int) + size) = 0xdeadbeaf;
 			return (char *)p + sizeof(struct unit_head_large) - sizeof(int);
 		} else {
-			ShowFatalError("Memory manager::memmgr_alloc failed.\n");
+			ShowFatalError("Memory manager::memmgr_alloc failed (allocating %d+%d bytes at %s:%d).\n", sizeof(struct unit_head_large), size, file, line);
 			exit(1);
 		}
 	}
@@ -317,7 +317,7 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func ) {
 		}
 	}
 	// ここに来てはいけない。
-	ShowFatalError("Memory manager::memmgr_malloc() serious error.\n");
+	ShowFatalError("Memory manager::memmgr_malloc() serious error (allocating %d+%d bytes at %s:%d)\n", sizeof(struct unit_head_large), size, file, line);
 	memmgr_info();
 	exit(1);
 	return NULL;