[libxslt] Fix potential crash on debug of extensions Solaris
- From: Daniel Veillard <veillard src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libxslt] Fix potential crash on debug of extensions Solaris
- Date: Mon, 17 Aug 2009 09:21:08 +0000 (UTC)
commit 75a4778f7e955c24f3c1e3fb659c204fd7df7b40
Author: Ben Walton <bwalton artsci utoronto ca>
Date: Mon Aug 17 11:19:48 2009 +0200
Fix potential crash on debug of extensions Solaris
* libxslt/extensions.c: avoid a printf("%s", NULL) in special
circumstances
libxslt/extensions.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/libxslt/extensions.c b/libxslt/extensions.c
index 530516b..3b99de8 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",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]