summaryrefslogtreecommitdiff
path: root/FatPkg/EnhancedFatDxe
diff options
context:
space:
mode:
authorAndrew Fish <afish@apple.com>2009-12-15 22:15:22 +0000
committerJordan Justen <jordan.l.justen@intel.com>2016-04-06 23:22:43 -0700
commitdcc3386bd1e7239cc38afa3febe28a8c08c011e5 (patch)
treeee30f0d23532feb0628931bacb34dd7fd5c367bf /FatPkg/EnhancedFatDxe
parent05bcb9e8dd7da31f1b612aed4dfb3f3160abec94 (diff)
downloadedk2-platforms-dcc3386bd1e7239cc38afa3febe28a8c08c011e5.tar.xz
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 <jordan.l.justen@intel.com> Reviewed-by: Andrew Fish <afish@apple.com> Acked-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'FatPkg/EnhancedFatDxe')
-rw-r--r--FatPkg/EnhancedFatDxe/UnicodeCollation.c2
1 files changed, 1 insertions, 1 deletions
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
);