From: Corne' Cornelius <nobbie@php.net>
Date: Wed, 5 Mar 2003 09:38:00 +0000 (+0000)
Subject: - Changed malloc() and free() to emalloc() and efree()
X-Git-Tag: RELEASE_0_5~610
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e25dabc74767690180670f9ed36444fe821c4573;p=php

- Changed malloc() and free() to emalloc() and efree()
---

diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index c52d439640..549c1fdf65 100644
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -308,7 +308,7 @@ EXEC SQL END DECLARE SECTION;
 		EXEC SQL close database;
 		EXEC SQL DISCONNECT CURRENT;
 	}
-	free(link);
+	efree(link);
 	IFXG(num_persistent)--;
 	IFXG(num_links)--;
 }
@@ -495,7 +495,7 @@ EXEC SQL END DECLARE SECTION;
 			}
 
 			/* create the link */
-			ifx = (char *) malloc(sizeof(IFX));
+			ifx = (char *) emalloc(sizeof(IFX));
 			IFXG(connectionid)++;
 			sprintf(ifx, "%s%x", SAFE_STRING(user), IFXG(connectionid));
 			
@@ -504,7 +504,7 @@ EXEC SQL END DECLARE SECTION;
 			if (ifx_check() == IFX_ERROR) {
 				IFXG(sv_sqlcode) = SQLCODE;
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ifx_error(ifx));
-				free(ifx);
+				efree(ifx);
 				efree(hashed_details);
 				RETURN_FALSE;
 			}
@@ -513,7 +513,7 @@ EXEC SQL END DECLARE SECTION;
 			new_le.type = le_plink;
 			new_le.ptr = ifx;
 			if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length + 1, (void *) &new_le, sizeof(list_entry), NULL) == FAILURE) {
-				free(ifx);
+				efree(ifx);
 				efree(hashed_details);
 				RETURN_FALSE;
 			}
@@ -2406,7 +2406,7 @@ $endif;
 						php_printf("<td>%s</td>", nullstr);
 					} else {
 						/* need an extra byte for string terminator */
-						copy_content = malloc(lg + 1);
+						copy_content = emalloc(lg + 1);
 						if (copy_content == NULL) {
 							php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not enough memory for TEXT column");
 							RETURN_FALSE;
@@ -2414,7 +2414,7 @@ $endif;
 						memcpy(copy_content, content, lg);
 						copy_content[lg] = 0;
 						php_printf("<td>%s</td>", copy_content);
-						free(copy_content);
+						efree(copy_content);
 					}
 					break;