mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-27 14:31:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

replace g_alloca by g_malloc/g_free

Browse source 
Original commit message from CVS:
replace g_alloca by g_malloc/g_free
This commit is contained in:
Steve Lhomme 2005-09-09 14:48:00 +00:00
parent 8c21708508
commit 4978042e73
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2005-09-09 Steve Lhomme <steve.lhomme@free.fr>
* gst/gstpad.c:
replace g_alloca by more portable alternatives
2005-09-08 Steve Lhomme <steve.lhomme@free.fr> 2005-09-08 Steve Lhomme <steve.lhomme@free.fr>
* gst/elements/gstpipefilter.c: * gst/elements/gstpipefilter.c:
Try to include config.h first Try to include config.h first

17
gst/gstpad.c
View file

@ -3479,12 +3479,12 @@ gst_pad_collectv (GstPad ** selected, const GList * padlist)
{ {
/* need to use alloca here because we must not leak data */ /* need to use alloca here because we must not leak data */
GstPad **pads; GstPad **pads;
GstPad *test; GstPad *test, *_tmp;
GstElement *element = NULL; GstElement *element = NULL;
int i = 0; int i = 0;
g_return_val_if_fail (padlist != NULL, NULL); g_return_val_if_fail (padlist != NULL, NULL);
pads = g_alloca (sizeof (gpointer) * (g_list_length ((GList *) padlist) + 1)); pads = g_malloc (sizeof (gpointer) * (g_list_length ((GList *) padlist) + 1));
for (; padlist; padlist = g_list_next (padlist)) { for (; padlist; padlist = g_list_next (padlist)) {
test = GST_PAD (padlist->data); test = GST_PAD (padlist->data);
g_return_val_if_fail (GST_IS_PAD (test), NULL); g_return_val_if_fail (GST_IS_PAD (test), NULL);
@ -3498,7 +3498,10 @@ gst_pad_collectv (GstPad ** selected, const GList * padlist)
} }
pads[i] = NULL; pads[i] = NULL;
return gst_pad_collect_array (GST_ELEMENT_SCHED (element), selected, pads); _tmp = gst_pad_collect_array (GST_ELEMENT_SCHED (element), selected, pads);
g_free (pads);
return _tmp;
} }
/** /**
@ -3542,6 +3545,7 @@ GstData *
gst_pad_collect_valist (GstPad ** selected, GstPad * pad, va_list var_args) gst_pad_collect_valist (GstPad ** selected, GstPad * pad, va_list var_args)
{ {
GstPad **padlist; GstPad **padlist;
GstPad *_tmp;
GstElement *element = NULL; GstElement *element = NULL;
gint i = 0, maxlength; gint i = 0, maxlength;
@ -3550,7 +3554,7 @@ gst_pad_collect_valist (GstPad ** selected, GstPad * pad, va_list var_args)
element = gst_pad_get_parent (pad); element = gst_pad_get_parent (pad);
maxlength = element->numsinkpads; maxlength = element->numsinkpads;
/* can we make this list a bit smaller than this upper limit? */ /* can we make this list a bit smaller than this upper limit? */
padlist = g_alloca (sizeof (gpointer) * (maxlength + 1)); padlist = g_malloc (sizeof (gpointer) * (maxlength + 1));
while (pad) { while (pad) {
g_return_val_if_fail (i < maxlength, NULL); g_return_val_if_fail (i < maxlength, NULL);
g_return_val_if_fail (element == gst_pad_get_parent (pad), NULL); g_return_val_if_fail (element == gst_pad_get_parent (pad), NULL);
@ -3558,7 +3562,10 @@ gst_pad_collect_valist (GstPad ** selected, GstPad * pad, va_list var_args)
pad = va_arg (var_args, GstPad *); pad = va_arg (var_args, GstPad *);
} }
padlist[i] = NULL; padlist[i] = NULL;
return gst_pad_collect_array (GST_ELEMENT_SCHED (element), selected, padlist); _tmp = gst_pad_collect_array (GST_ELEMENT_SCHED (element), selected, padlist);
g_free (padlist);
return _tmp;
} }
/** /**