From 6fd1aaa92666b6097d6e480741490de28795a833 Mon Sep 17 00:00:00 2001
From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 29 Dec 2004 21:16:05 +0000
Subject: update

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@863 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/common/malloc.c |  2 ++
 src/common/malloc.h | 12 +++++++++++-
 src/map/pet.c       |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/common/malloc.c b/src/common/malloc.c
index fad5183d1..ed5fb2e44 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -1,3 +1,4 @@
+#if !defined(DMALLOC) && !defined(GCOLLECT) && !defined(BCHECK)
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -49,3 +50,4 @@ void * _bcalloc(size_t size, size_t cnt) {
 	memset(ret, 0, size * cnt);
 	return ret;
 }
+#endif
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 7b09d7074..860f8dd7b 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -3,8 +3,18 @@
 
 #include <stdlib.h>
 
-#if defined(GCOLLECT)
+#if defined(DMALLOC)
 
+#include "dmalloc.h"
+
+#define aMalloc(size) \
+  dmalloc_malloc(__FILE__, __LINE__, (size), DMALLOC_FUNC_MALLOC, 0, 0)
+#define aCalloc(count,size) \
+  dmalloc_malloc(__FILE__, __LINE__, (count)*(size), DMALLOC_FUNC_CALLOC, 0, 0)
+#define aRealloc(ptr,size) \
+  dmalloc_realloc(__FILE__, __LINE__, (ptr), (size), DMALLOC_FUNC_REALLOC, 0)
+
+#elif defined(GCOLLECT)
 #include "gc.h"
 #define aMalloc(n) GC_MALLOC(n)
 #define aCalloc(m,n) _bcalloc(m,n)
diff --git a/src/map/pet.c b/src/map/pet.c
index 3c87a91e5..545cc079f 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -955,7 +955,7 @@ int pet_change_name(struct map_session_data *sd,char *name)
 	
 	nullpo_retr(1, sd);
 
-	if(sd->pet.rename_flag == 1 && battle_config.pet_rename == 0)
+	if((sd->pd == NULL) || (sd->pet.rename_flag == 1 && battle_config.pet_rename == 0))
 		return 1;
 
 	for(i=0;i<24 && name[i];i++){
-- 
cgit v1.2.3-70-g09d2