summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Walton <bwalton@artsci.utoronto.ca>2009-08-17 11:19:48 +0200
committerDaniel Veillard <veillard@redhat.com>2009-08-17 11:19:48 +0200
commit75a4778f7e955c24f3c1e3fb659c204fd7df7b40 (patch)
tree5d4807d9b333dde5a0762fe0c29c973a8da84a3f
parent807fdba3dde9073f177c989ede9ca20c989eddc8 (diff)
downloadlibxslt-75a4778f7e955c24f3c1e3fb659c204fd7df7b40.tar.gz
Fix potential crash on debug of extensions Solaris
* libxslt/extensions.c: avoid a printf("%s", NULL) in special circumstances
-rw-r--r--libxslt/extensions.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/libxslt/extensions.c b/libxslt/extensions.c
index 530516b9..3b99de85 100644
--- a/libxslt/extensions.c
+++ b/libxslt/extensions.c
@@ -375,16 +375,17 @@ xsltExtModuleRegisterDynamic(const xmlChar * URI)
/* determine module directory */
ext_directory = (xmlChar *) getenv("LIBXSLT_PLUGINS_PATH");
+ if (NULL == ext_directory) {
+ ext_directory = BAD_CAST LIBXSLT_DEFAULT_PLUGINS_PATH();
+ if (NULL == ext_directory)
+ return (-1);
+ }
#ifdef WITH_XSLT_DEBUG_EXTENSIONS
- xsltGenericDebug(xsltGenericDebugContext,
- "LIBXSLT_PLUGINS_PATH is %s\n", ext_directory);
+ else
+ xsltGenericDebug(xsltGenericDebugContext,
+ "LIBXSLT_PLUGINS_PATH is %s\n", ext_directory);
#endif
- if (NULL == ext_directory)
- ext_directory = BAD_CAST LIBXSLT_DEFAULT_PLUGINS_PATH();
- if (NULL == ext_directory)
- return (-1);
-
/* build the module filename, and confirm the module exists */
xmlStrPrintf((xmlChar *) module_filename, sizeof(module_filename),
BAD_CAST "%s/%s%s",