From f6cb951ae5ee72067fa7cbbe7818641c53374a5c Mon Sep 17 00:00:00 2001 From: spouliot Date: Tue, 9 Mar 2010 20:12:27 +0000 Subject: [PATCH] 2010-03-09 Sebastien Pouliot * assembly.c: Fix crash in moon-unit when aname->culture is NULL instead of an empty string. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@153349 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/metadata/ChangeLog | 5 +++++ mono/metadata/assembly.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 5ea72ae7a..2832f23a4 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,8 @@ +2010-03-09 Sebastien Pouliot + + * assembly.c: Fix crash in moon-unit when aname->culture is NULL + instead of an empty string. + 2010-03-09 Zoltan Varga * sgen-gc.c (safe_object_get_size): Avoid a function call so this can really be diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c index 98af6deef..a33d726d3 100644 --- a/mono/metadata/assembly.c +++ b/mono/metadata/assembly.c @@ -245,7 +245,7 @@ assembly_binding_maps_name (MonoAssemblyBindingInfo *info, MonoAssemblyName *ana if ((info->culture != NULL && info->culture [0]) != (aname->culture != NULL && aname->culture [0])) return FALSE; - if (info->culture && strcmp (info->culture, aname->culture)) + if (info->culture && aname->culture && strcmp (info->culture, aname->culture)) return FALSE; if (!mono_public_tokens_are_equal (info->public_key_token, aname->public_key_token)) -- 2.11.4.GIT