2002-04-24 Gonzalo Paniagua Javier <gonzalo@ximian.com>

* icall.c: * socket-io.c: * unicode.c: free some strings gotten from mono_string_to_utf8 and changed a couple of free () by g_free (). svn path=/trunk/mono/; revision=4021
mono · Apr 24, 2002 · 73e0b71 · 73e0b71
1 parent c61c1b8
commit 73e0b71
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* icall.c:
+	* socket-io.c:
+	* unicode.c: free some strings gotten from mono_string_to_utf8 and
+	changed a couple of free () by g_free ().
+
 2002-04-24	Patrik Torstensson <patrik.torstensson@labs2.com>
 
 	* object.c (mono_runtime_invoke_array) : Bug because of my incompetence.

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
@@ -1694,8 +1694,10 @@ ves_icall_ModuleBuilder_create_modified_type (MonoReflectionTypeBuilder *tb, Mon
 	while (*p) {
 		switch (*p) {
 		case '&':
-			if (isbyref) /* only one level allowed by the spec */
+			if (isbyref) { /* only one level allowed by the spec */
+				g_free (str);
 				return NULL;
+			}
 			isbyref = 1;
 			p++;
 			return mono_type_get_object (mono_domain_get (), &klass->this_arg);
@@ -1713,12 +1715,16 @@ ves_icall_ModuleBuilder_create_modified_type (MonoReflectionTypeBuilder *tb, Mon
 					break;
 				if (*p == ',')
 					rank++;
-				else if (*p != '*') /* '*' means unknown lower bound */
+				else if (*p != '*') { /* '*' means unknown lower bound */
+					g_free (str);
 					return NULL;
+				}
 				++p;
 			}
-			if (*p != ']')
+			if (*p != ']') {
+				g_free (str);
 				return NULL;
+			}
 			p++;
 			klass = mono_array_class_get (&klass->byval_arg, rank);
 			mono_class_init (klass);

diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c
@@ -1281,7 +1281,7 @@ extern gboolean ves_icall_System_Net_Dns_GetHostByName_internal(MonoString *host
 
 	hostname=mono_string_to_utf8(host);
 	he=gethostbyname(hostname);
-	free(hostname);
+	g_free(hostname);
 
 	if(he==NULL) {
 		return(FALSE);
@@ -1337,10 +1337,11 @@ extern gboolean ves_icall_System_Net_Dns_GetHostByAddr_internal(MonoString *addr
 
 	address = mono_string_to_utf8 (addr);
 	if (inet_pton (AF_INET, address, &inaddr) <= 0) {
-		free (address);
+		g_free (address);
 		return FALSE;
 	}
 
+	g_free (address);
 	if ((he = gethostbyaddr ((char *) &inaddr, sizeof (inaddr), AF_INET)) == NULL)
 		return FALSE;
 

diff --git a/mono/metadata/unicode.c b/mono/metadata/unicode.c
@@ -175,6 +175,7 @@ ves_icall_iconv_new_encoder (MonoString *name, MonoBoolean big_endian)
 	cd = iconv_open (n, "UTF-16");
 #endif
 	g_assert (cd != (iconv_t)-1);
+	g_free (n);
 
 	return (gpointer)cd;
 }
@@ -202,6 +203,7 @@ ves_icall_iconv_new_decoder (MonoString *name, MonoBoolean big_endian)
 	cd = iconv_open ("UTF-16", n);
 #endif
 	g_assert (cd != (iconv_t)-1);
+	g_free (n);
 
 	return (gpointer)cd;
 }