ext/ladspa/search.c: Avoid searching (null) paths or crashing on platforms where printing a

Original commit message from CVS:
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.
This commit is contained in:
Brian Cameron 2009-01-08 17:57:19 +00:00 committed by Wim Taymans
parent 672051c5eb
commit c266d310af
2 changed files with 16 additions and 2 deletions

View file

@ -1,3 +1,11 @@
2009-01-08 Wim Taymans <wim.taymans@collabora.co.uk>
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 <jan.schmidt@sun.com> 2009-01-08 Jan Schmidt <jan.schmidt@sun.com>
* ext/resindvd/resindvdbin.c: * ext/resindvd/resindvdbin.c:

View file

@ -98,13 +98,19 @@ LADSPAPluginSearch (LADSPAPluginSearchCallbackFunction fCallbackFunction)
const char *pcEnd; const char *pcEnd;
const char *pcLADSPAPath; const char *pcLADSPAPath;
const char *pcStart; const char *pcStart;
char *search_path;
/* thomasvs: I'm sorry, but I'm going to add glib stuff here. /* thomasvs: I'm sorry, but I'm going to add glib stuff here.
* I'm appending logical values for LADSPA_PATH here * I'm appending logical values for LADSPA_PATH here
*/ */
pcLADSPAPath = g_strdup_printf ("%s:/usr/lib/ladspa:/usr/local/lib/ladspa", search_path = getenv ("LADSPA_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) { if (!pcLADSPAPath) {
/* fprintf(stderr, */ /* fprintf(stderr, */