diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2005-02-08 18:49:58 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2005-02-08 18:49:58 +0000 |
| commit | dd9eef5e0baeed22fc6ade3ea5cec1c391c37c27 (patch) | |
| tree | c2aee21c90d510182dd12f4c95e0a99fa49a4e41 | |
| parent | d7b904c47eea90e1e6f5d935e27876cf5a74e845 (diff) | |
| download | lasso-dd9eef5e0baeed22fc6ade3ea5cec1c391c37c27.tar.gz lasso-dd9eef5e0baeed22fc6ade3ea5cec1c391c37c27.tar.xz lasso-dd9eef5e0baeed22fc6ade3ea5cec1c391c37c27.zip | |
allocate query fields memory with glib g_malloc (and free it with g_free)
| -rw-r--r-- | lasso/id-ff/login.c | 2 | ||||
| -rw-r--r-- | lasso/xml/tools.c | 9 | ||||
| -rw-r--r-- | lasso/xml/xml.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c index 16a39073..9b2a4fa4 100644 --- a/lasso/id-ff/login.c +++ b/lasso/id-ff/login.c @@ -1020,7 +1020,7 @@ lasso_login_init_request(LassoLogin *login, gchar *response_msg, artifact_b64 = g_strdup(query_fields[i]+8); xmlFree(query_fields[i]); } - free(query_fields); + g_free(query_fields); } if (response_http_method == LASSO_HTTP_METHOD_POST) { artifact_b64 = g_strdup(response_msg); diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c index 41aa579d..2440ff0f 100644 --- a/lasso/xml/tools.c +++ b/lasso/xml/tools.c @@ -90,7 +90,7 @@ lasso_build_unique_id(unsigned int size) g_assert(size >= 32); - result = malloc(size+2); /* trailing \0 and leading _ */ + result = g_ malloc(size+2); /* trailing \0 and leading _ */ result[0] = '_'; lasso_build_random_sequence(result+1, size); result[size+1] = 0; @@ -111,7 +111,7 @@ lasso_get_current_time() struct tm *tm; char *ret; - ret = malloc(21); + ret = g_malloc(21); now = time(NULL); tm = gmtime(&now); strftime(ret, 21, "%Y-%m-%dT%H:%M:%SZ", tm); @@ -531,7 +531,8 @@ lasso_sha1(const char *str) return SHA1(str, strlen(str), md); } -char** urlencoded_to_strings(const char *str) +char** +urlencoded_to_strings(const char *str) { int i, n=1; char *st, *st2; @@ -543,7 +544,7 @@ char** urlencoded_to_strings(const char *str) n++; } - result = malloc(sizeof(char*)*n+2); + result = g_malloc(sizeof(char*)*n+2); result[n] = NULL; st = (char*)str; diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c index 88c864a8..52e084c2 100644 --- a/lasso/xml/xml.c +++ b/lasso/xml/xml.c @@ -237,7 +237,7 @@ lasso_node_init_from_query(LassoNode *node, const char *query) for (i=0; query_fields[i]; i++) { xmlFree(query_fields[i]); } - free(query_fields); + g_free(query_fields); return rc; } |