From 2202bbf4ab179e2c67f0448bcfaec81bb27ddb04 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 16 Jan 2007 18:05:37 +0000 Subject: r20838: Small fix from Jiri.Sasek@Sun.COM to fix null pointer deref. Jeremy (This used to be commit 34d891c81ad4226bb1f0e26902c4e4afaba6d62f) --- source3/lib/adt_tree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/adt_tree.c b/source3/lib/adt_tree.c index 05a470bc49..acd61ee477 100644 --- a/source3/lib/adt_tree.c +++ b/source3/lib/adt_tree.c @@ -334,7 +334,7 @@ static void pathtree_print_children( TREE_NODE *node, int debug, const char *pat void* pathtree_find( SORTED_TREE *tree, char *key ) { - char *keystr, *base, *str, *p; + char *keystr, *base = NULL, *str = NULL, *p; TREE_NODE *current; void *result = NULL; @@ -383,7 +383,8 @@ static void pathtree_print_children( TREE_NODE *node, int debug, const char *pat trim_tree_keypath( p, &base, &str ); DEBUG(11,("pathtree_find: [loop] base => [%s], new_path => [%s]\n", - base, str)); + base ? base : "", + str ? str : "")); /* iterate to the next child */ -- cgit