wtay gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/ext/ladspa/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     wtay
Date:           Thu Jan 08 2009  17:57:33 UTC

Log message:
Based on Patch by: Brian Cameron <brian dot cameron at sun dot com>
* ext/ladspa/search.c: (LADSPAPluginSearch):
Avoid searching (null) paths or crashing on platforms where printing a
NULL string segfaults. Fixes #567004.

Modified files:
    .               : ChangeLog
    ext/ladspa      : search.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3866&r2=1.3867
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/ladspa/search.c.diff?r1=1.9&r2=1.10

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3866
retrieving revision 1.3867
diff -u -d -r1.3866 -r1.3867
--- ChangeLog	8 Jan 2009 12:42:16 -0000	1.3866
+++ ChangeLog	8 Jan 2009 17:57:17 -0000	1.3867
@@ -1,3 +1,11 @@
+2009-01-08  Wim Taymans  <[email protected]>
+
+	Based on Patch by: Brian Cameron <brian dot cameron at sun dot com>
+	* ext/ladspa/search.c: (LADSPAPluginSearch):
+	Avoid searching (null) paths or crashing on platforms where printing a
+	NULL string segfaults. Fixes #567004.
 2009-01-08  Jan Schmidt  <[email protected]>
 
 	* ext/resindvd/resindvdbin.c:
Index: search.c
RCS file: /cvs/gstreamer/gst-plugins-bad/ext/ladspa/search.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- search.c	6 Dec 2005 19:44:48 -0000	1.9
+++ search.c	8 Jan 2009 17:57:19 -0000	1.10
@@ -98,13 +98,19 @@
   const char *pcEnd;
   const char *pcLADSPAPath;
   const char *pcStart;
+  char *search_path;
   /* thomasvs: I'm sorry, but I'm going to add glib stuff here.
    * I'm appending logical values for LADSPA_PATH here
    */
-  pcLADSPAPath = g_strdup_printf ("%s:/usr/lib/ladspa:/usr/local/lib/ladspa",
-      getenv ("LADSPA_PATH"));
+  search_path = getenv ("LADSPA_PATH");
+  if (search_path) {
+    pcLADSPAPath = g_strdup_printf ("%s:/usr/lib/ladspa:/usr/local/lib/ladspa",
+        search_path);
+  } else {
+    pcLADSPAPath = g_strdup ("/usr/lib/ladspa:/usr/local/lib/ladspa");
+  }
   if (!pcLADSPAPath) {
 /*    fprintf(stderr, */

------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB