From dcc3386bd1e7239cc38afa3febe28a8c08c011e5 Mon Sep 17 00:00:00 2001 From: Andrew Fish Date: Tue, 15 Dec 2009 22:15:22 +0000 Subject: [PATCH] Fix bug in Unicode colloation that causes ASSERT on BeagleBoard. PlatformLang or Lang variables are not processed correctly. NULL pointer is passed if no variable exists. (based on FatPkg commit 0e3c94b9ac164caf705cc512a0e865fa0811b531) [jordan.l.justen@intel.com: Use script to relicense to 2-clause BSD] Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen Reviewed-by: Andrew Fish Acked-by: Laszlo Ersek --- FatPkg/EnhancedFatDxe/UnicodeCollation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FatPkg/EnhancedFatDxe/UnicodeCollation.c b/FatPkg/EnhancedFatDxe/UnicodeCollation.c index 5427f6701d..69d9eaf405 100644 --- a/FatPkg/EnhancedFatDxe/UnicodeCollation.c +++ b/FatPkg/EnhancedFatDxe/UnicodeCollation.c @@ -87,7 +87,7 @@ InitializeUnicodeCollationSupportWorker ( BestLanguage = GetBestLanguage ( Uci->SupportedLanguages, Iso639Language, - (Language == NULL) ? Language : "", + (Language == NULL) ? "" : Language, DefaultLanguage, NULL );