From: Marcus Boerger <helly@php.net>
Date: Mon, 4 Nov 2002 13:39:17 +0000 (+0000)
Subject: use ecmalloc/efree functions instead of (c|m)alloc/free
X-Git-Tag: php-4.3.0RC1~296
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02c903b25e2b4e9a0a1c54a2cbdb0ea020d1ea2f;p=php

use ecmalloc/efree functions instead of (c|m)alloc/free
---

diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c
index 7b5d0bcf38..5b628c98f6 100644
--- a/ext/dba/dba_db2.c
+++ b/ext/dba/dba_db2.c
@@ -75,7 +75,7 @@ DBA_OPEN_FUNC(db2)
 		return FAILURE;
 	}
 
-	info->dbf = calloc(sizeof(dba_db2_data), 1);
+	info->dbf = ecalloc(sizeof(dba_db2_data), 1);
 	((dba_db2_data *) info->dbf)->dbp = dbp;
 	return SUCCESS;
 }
@@ -87,7 +87,7 @@ DBA_CLOSE_FUNC(db2)
 	if (dba->cursor) 
 		dba->cursor->c_close(dba->cursor);
 	dba->dbp->close(dba->dbp, 0);
-	free(dba);
+	efree(dba);
 }
 
 DBA_FETCH_FUNC(db2)
diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c
index e31fb39a0f..edade52042 100644
--- a/ext/dba/dba_db3.c
+++ b/ext/dba/dba_db3.c
@@ -77,7 +77,7 @@ DBA_OPEN_FUNC(db3)
 			dbp->open(dbp, info->path, NULL, type, gmode, filemode) == 0) {
 		dba_db3_data *data;
 
-		data = malloc(sizeof(*data));
+		data = emalloc(sizeof(*data));
 		data->dbp = dbp;
 		data->cursor = NULL;
 		info->dbf = data;
@@ -96,7 +96,7 @@ DBA_CLOSE_FUNC(db3)
 	
 	if (dba->cursor) dba->cursor->c_close(dba->cursor);
 	dba->dbp->close(dba->dbp, 0);
-	free(dba);
+	efree(dba);
 }
 
 DBA_FETCH_FUNC(db3)
diff --git a/ext/dba/dba_dbm.c b/ext/dba/dba_dbm.c
index 8ce0b1d397..0eea524ccb 100644
--- a/ext/dba/dba_dbm.c
+++ b/ext/dba/dba_dbm.c
@@ -78,13 +78,13 @@ DBA_OPEN_FUNC(dbm)
 		return FAILURE;
 	}
 
-	info->dbf = calloc(sizeof(dba_dbm_data), 1);
+	info->dbf = ecalloc(sizeof(dba_dbm_data), 1);
 	return SUCCESS;
 }
 
 DBA_CLOSE_FUNC(dbm)
 {
-	free(info->dbf);
+	efree(info->dbf);
 	dbmclose();
 }
 
diff --git a/ext/dba/dba_gdbm.c b/ext/dba/dba_gdbm.c
index 66a6bce709..e462d01b95 100644
--- a/ext/dba/dba_gdbm.c
+++ b/ext/dba/dba_gdbm.c
@@ -59,8 +59,7 @@ DBA_OPEN_FUNC(gdbm)
 	dbf = gdbm_open(info->path, 0, gmode, filemode, NULL);
 	
 	if(dbf) {
-		info->dbf = malloc(sizeof(dba_gdbm_data));
-		memset(info->dbf, 0, sizeof(dba_gdbm_data));
+		info->dbf = ecalloc(sizeof(dba_gdbm_data), 1);
 		((dba_gdbm_data *) info->dbf)->dbf = dbf;
 		return SUCCESS;
 	}
@@ -73,7 +72,7 @@ DBA_CLOSE_FUNC(gdbm)
 	
 	if(dba->nextkey.dptr) free(dba->nextkey.dptr);
 	gdbm_close(dba->dbf);
-	free(dba);
+	efree(dba);
 }
 
 DBA_FETCH_FUNC(gdbm)