Better memory management during string construction

This commit is contained in:
Xavi Artigas 2012-09-04 17:10:40 +02:00
parent 1947de8006
commit 7b3c680da5

View file

@ -22,32 +22,35 @@ jstring
Java_com_gst_1sdk_1tutorials_tutorial_11_Tutorial1_gstVersion (JNIEnv* env, Java_com_gst_1sdk_1tutorials_tutorial_11_Tutorial1_gstVersion (JNIEnv* env,
jobject thiz ) jobject thiz )
{ {
char buffer[8192] = ""; jstring ret;
char *buffer, *tmp;
GList *original_plugin_list = gst_registry_get_plugin_list (gst_registry_get_default()); GList *original_plugin_list = gst_registry_get_plugin_list (gst_registry_get_default());
GList *plugin_list = original_plugin_list; GList *plugin_list = original_plugin_list;
g_strlcat (buffer, gst_version_string(), sizeof (buffer)); buffer = g_strdup_printf ("Version: %s\n", gst_version_string());
g_strlcat (buffer, "\n", sizeof (buffer));
while (plugin_list) { while (plugin_list) {
GstPlugin *plugin = (GstPlugin *)plugin_list->data; GstPlugin *plugin = (GstPlugin *)plugin_list->data;
GList *original_features_list, *features_list; GList *original_features_list, *features_list;
plugin_list = plugin_list->next; plugin_list = plugin_list->next;
g_strlcat (buffer, gst_plugin_get_name (plugin), sizeof (buffer)); tmp = g_strdup_printf ("%sPlugin: %s\n", buffer, gst_plugin_get_name (plugin));
g_strlcat (buffer, "\n", sizeof (buffer)); g_free (buffer);
buffer = tmp;
original_features_list = features_list = gst_registry_get_feature_list_by_plugin (gst_registry_get_default(), plugin->desc.name); original_features_list = features_list = gst_registry_get_feature_list_by_plugin (gst_registry_get_default(), plugin->desc.name);
while (features_list) { while (features_list) {
GstPluginFeature *feature = (GstPluginFeature *)features_list->data; GstPluginFeature *feature = (GstPluginFeature *)features_list->data;
features_list = features_list->next; features_list = features_list->next;
g_strlcat (buffer, " ", sizeof (buffer)); tmp = g_strdup_printf ("%s %s\n", buffer, gst_plugin_feature_get_name (feature));
g_strlcat (buffer, gst_plugin_feature_get_name (feature), sizeof (buffer)); g_free (buffer);
g_strlcat (buffer, "\n", sizeof (buffer)); buffer = tmp;
} }
gst_plugin_feature_list_free (original_features_list); gst_plugin_feature_list_free (original_features_list);
} }
gst_plugin_list_free (original_plugin_list); gst_plugin_list_free (original_plugin_list);
return (*env)->NewStringUTF(env, buffer); ret = (*env)->NewStringUTF(env, buffer);
g_free (buffer);
return ret;
} }