From cda239c8b425c1a4530372d4315c8149d213add4 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Mon, 1 Nov 2004 11:45:26 +0000 Subject: added two api precondition guards use g_strdup with getenv to fix crash when using ENVVAR Original commit message from CVS: added two api precondition guards use g_strdup with getenv to fix crash when using ENVVAR --- ChangeLog | 6 ++++++ ext/esd/esdsink.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 41612572..0b6aaad2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-11-01 Stefan Kost + + * ext/esd/esdsink.c: (gst_esdsink_init), (gst_esdsink_link): + added two api precondition guards + use g_strdup with getenv to fix crash when using ENVVAR + 2004-11-01 Jan Schmidt * ext/esd/esdsink.c: (gst_esdsink_class_init), (gst_esdsink_finalize): diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c index c9294424..73a32487 100644 --- a/ext/esd/esdsink.c +++ b/ext/esd/esdsink.c @@ -178,7 +178,7 @@ gst_esdsink_init (GTypeInstance * instance, gpointer g_class) esdsink->channels = 2; esdsink->frequency = 44100; esdsink->bytes_per_sample = esdsink->channels * (esdsink->depth / 8); - esdsink->host = getenv ("ESPEAKER"); + esdsink->host = g_strdup (getenv ("ESPEAKER")); esdsink->provided_clock = gst_audio_clock_new ("esdclock", gst_esdsink_get_time, esdsink); gst_object_set_parent (GST_OBJECT (esdsink->provided_clock), @@ -205,6 +205,9 @@ gst_esdsink_link (GstPad * pad, const GstCaps * caps) GstEsdsink *esdsink; GstStructure *structure; + g_return_val_if_fail (caps != NULL, GST_PAD_LINK_REFUSED); + g_return_val_if_fail (pad != NULL, GST_PAD_LINK_REFUSED); + esdsink = GST_ESDSINK (gst_pad_get_parent (pad)); structure = gst_caps_get_structure (caps, 0); -- cgit