haiwen/libsearpc
1
0
Fork 0
mirror of https://github.com/haiwen/libsearpc.git synced 2025-09-01 21:07:24 +00:00
Code Issues Releases Wiki Activity

Fixed memory leaks.

Browse Source
This commit is contained in:
Shuai Lin
2016-06-28 12:16:54 +08:00
parent 53a1663d0d
commit 112a2565e6
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/searpc-client.c
View File

@@ -388,6 +388,8 @@ searpc_client_generic_callback (char *retstr, size_t len,
if (result) g_object_unref ((GObject*)result); if (result) g_object_unref ((GObject*)result);
} else if (strcmp(data->ret_type, "objlist") == 0) { } else if (strcmp(data->ret_type, "objlist") == 0) {
clean_objlist ((GList *)result); clean_objlist ((GList *)result);
} else if (strcmp(data->ret_type, "json") == 0) {
json_decref ((json_t *)result);
} }
} }
g_free (data); g_free (data);

6
lib/searpc-named-pipe-transport.c
View File

@@ -263,6 +263,8 @@ static void* named_pipe_client_handler(void *arg)
g_free (ret_str); g_free (ret_str);
break; break;
} }
g_free (ret_str);
} }
#if !defined(WIN32) #if !defined(WIN32)
@@ -385,7 +387,9 @@ request_to_json (const char *service, const char *fcall_str, size_t fcall_len)
g_free (temp_request); g_free (temp_request);
return json_dumps (object, 0); char *str = json_dumps (object, 0);
json_decref (object);
return str;
} }
static int static int

17
tests/searpc.c
View File

@@ -183,6 +183,7 @@ sample_async_send (void *arg, gchar *fcall_str,
searpc_client_generic_callback (ret, ret_len, rpc_priv, NULL); searpc_client_generic_callback (ret, ret_len, rpc_priv, NULL);
g_free (ret);
return 0; return 0;
} }
@@ -311,7 +312,7 @@ test_searpc__objlist_call (void)
} }
json_t * json_t *
get_maman_bar_json (const char *name, int num, GError **error) simple_json_rpc (const char *name, int num, GError **error)
{ {
json_t * ret = json_object(); json_t * ret = json_object();
json_object_set_new (ret, name, json_integer (num)); json_object_set_new (ret, name, json_integer (num));
@@ -324,11 +325,13 @@ test_searpc__json_return_type (void)
json_t *result; json_t *result;
GError *error = NULL; GError *error = NULL;
result = searpc_client_call__json (client, "get_maman_bar_json", result = searpc_client_call__json (client, "simple_json_rpc",
&error, 2, &error, 2,
"string", "year", "string", "year",
"int", 2016); "int", 2016);
cl_assert (error == NULL); cl_assert (error == NULL);
cl_assert (json_integer_value(json_object_get(result, "year")) == 2016);
json_decref(result);
} }
json_t * json_t *
@@ -362,7 +365,11 @@ test_searpc__json_param_type (void)
cl_assert_ (error == NULL, error ? error->message : ""); cl_assert_ (error == NULL, error ? error->message : "");
int count = json_integer_value(json_object_get((json_t*)result, "number_of_kvs")); int count = json_integer_value(json_object_get((json_t*)result, "number_of_kvs"));
cl_assert_(count == 2, json_dumps(result, JSON_INDENT(2))); char *msg = json_dumps(result, JSON_INDENT(2));
cl_assert_(count == 2, msg);
free (msg);
json_decref(param);
json_decref(result);
} }
@@ -399,7 +406,7 @@ void async_callback_json (void *result, void *user_data, GError *error)
void void
test_searpc__simple_call_async_json (void) test_searpc__simple_call_async_json (void)
{ {
searpc_client_async_call__json (client, "get_maman_bar_json", searpc_client_async_call__json (client, "simple_json_rpc",
async_callback_json, NULL, async_callback_json, NULL,
2, "string", "hello", "int", 10); 2, "string", "hello", "int", 10);
} }
@@ -520,7 +527,7 @@ test_searpc__initialize (void)
searpc_signature_object__string()); searpc_signature_object__string());
searpc_server_register_function ("test", get_maman_bar_list, "get_maman_bar_list", searpc_server_register_function ("test", get_maman_bar_list, "get_maman_bar_list",
searpc_signature_objlist__string_int()); searpc_signature_objlist__string_int());
searpc_server_register_function ("test", get_maman_bar_json, "get_maman_bar_json", searpc_server_register_function ("test", simple_json_rpc, "simple_json_rpc",
searpc_signature_json__string_int()); searpc_signature_json__string_int());
searpc_server_register_function ("test", count_json_kvs, "count_json_kvs", searpc_server_register_function ("test", count_json_kvs, "count_json_kvs",
searpc_signature_json__json()); searpc_signature_json__json());