Improve safety by replacing all g_string_free use by lasso_release_gstring

5 files changed, 8 insertions, 7 deletions

diff --git a/lasso/id-wsf-2.0/data_service.c b/lasso/id-wsf-2.0/data_service.c
index 44e0c1fe..38dda51c 100644
--- a/lasso/id-wsf-2.0/data_service.c
+++ b/lasso/id-wsf-2.0/data_service.c
@@ -948,7 +948,7 @@ lasso_idwsf2_data_service_get_query_item_result_content(LassoIdWsf2DataService *
 		xmlFree(content);
 	}
 	result = gstr->str;
-	g_string_free(gstr, FALSE);
+	lasso_release_gstring(gstr, FALSE);
 	return result;
 }
 
diff --git a/lasso/utils.c b/lasso/utils.c
index 5952d1a9..7a97be31 100644
--- a/lasso/utils.c
+++ b/lasso/utils.c
@@ -98,7 +98,7 @@ lasso_safe_prefix_string(const gchar *str, gsize length)
 		break;
 	}
 	ret = output->str;
-	g_string_free(output, FALSE);
+	lasso_release_gstring(output, FALSE);
 	return ret;
 }
 
diff --git a/lasso/xml/samlp_status.c b/lasso/xml/samlp_status.c
index 583c8863..515dc351 100644
--- a/lasso/xml/samlp_status.c
+++ b/lasso/xml/samlp_status.c
@@ -22,6 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "../utils.h"
 #include "private.h"
 #include "samlp_status.h"
 
@@ -72,7 +73,7 @@ build_query(LassoNode *node)
 	}
 
 	t = s->str;
-	g_string_free(s, FALSE);
+	lasso_release_gstring(s, FALSE);
 	return t;
 }
 
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index d6aa5ef5..d311cf15 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -393,7 +393,7 @@ lasso_load_certs_from_pem_certs_chain_file(const char* pem_certs_chain_file)
 				goto cleanup;
 			}
 			certificates++;
-			g_string_free(cert, TRUE);
+			lasso_release_gstring(cert, TRUE);
 			cert = NULL;
 		} else if (cert != NULL && line != NULL && line[0] != '\0') {
 			g_string_append(cert, line);
@@ -408,7 +408,7 @@ cleanup:
 		g_io_channel_unref(gioc);
 	}
 	if (cert)
-		g_string_free(cert, TRUE);
+		lasso_release_gstring(cert, TRUE);
 	if (certificates == 0)
 		lasso_release_key_manager(keys_mngr);
 	lasso_release_string(line);
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index 0541272a..7a846c37 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -2491,7 +2491,7 @@ get_value_by_path(LassoNode *node, char *path, struct XmlSnippet *xml_snippet)
 			value = g_list_next(value);
 		}
 		if (result->len == 0) {
-			g_string_free(result, TRUE);
+			lasso_release_gstring(result, TRUE);
 			return NULL;
 		}
 		return g_string_free(result, FALSE);
@@ -2506,7 +2506,7 @@ get_value_by_path(LassoNode *node, char *path, struct XmlSnippet *xml_snippet)
 			value = value->next;
 		}
 		if (result->len == 0) {
-			g_string_free(result, TRUE);
+			lasso_release_gstring(result, TRUE);
 			return NULL;
 		}
 		return g_string_free(result, FALSE);