[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1047-gb4f6bb8

[simo]

On Thu, 2009-05-21 at 19:28 -0500, Jeremy Allison wrote:
> The branch, v3-4-test has been updated
>        via  b4f6bb84d1bcd5a09d7c20c2a7dac0bfb11f199f (commit)
>       from  dbd5dd808f14b1df0ed3dabd0553baddad2d186b (commit)
> 
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
> 
> 
> - Log -----------------------------------------------------------------
> commit b4f6bb84d1bcd5a09d7c20c2a7dac0bfb11f199f
> Author: Jeremy Allison <jra at samba.org>
> Date:   Thu May 21 17:27:25 2009 -0700
> 
>     Attempt to fix bug #6386 - Samba Panic triggered by Sophos Control Centre.
>     Don't indirect a potentially null pointer.
>     Jeremy.
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  source3/groupdb/mapping_ldb.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> 
> Changeset truncated at 500 lines:
> 
> diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
> index a162c19..fffc684 100644
> --- a/source3/groupdb/mapping_ldb.c
> +++ b/source3/groupdb/mapping_ldb.c
> @@ -276,7 +276,7 @@ static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map)
>  
>  	ret = ldb_search(ldb, talloc_tos(), &res, NULL, LDB_SCOPE_SUBTREE,
>  			 NULL, "(&(ntName=%s)(objectClass=groupMap))", name);
> -	if (ret != LDB_SUCCESS || res->count != 1) {
> +	if (ret != LDB_SUCCESS || (res && res->count != 1)) {
>  		goto failed;
>  	}
>  

Jeremy,
have you really observed a case where ret == LDB_SUCCESS but res is
NULL ?

if that's the case the fix should probably be:
if (ret != LDB_SUCCESS || !res || (res->count != 1)) { ...

but the real bug would be in ldb_search and better fixed there.

Simo.


-- 
Simo Sorce
Samba Team GPL Compliance Officer <simo at samba.org>
Principal Software Engineer at Red Hat, Inc. <simo at redhat.com>