summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-08-17 12:35:21 -0700
committerHaojian Zhuang <haojian.zhuang@linaro.org>2016-08-18 23:10:21 +0800
commit1ffcfe9a6adefd871122e23a1678d2ee6ac530b5 (patch)
tree60868eb5ed1afda3a1e48ac09400cf2d7ead3625
parent4a07bb2d8f827942ce89bf46571a140e6cc3dc0b (diff)
downloadedk2-1ffcfe9a6adefd871122e23a1678d2ee6ac530b5.tar.gz
hikey: Fix androidboot.serialno= report
Change-Id: Id71e082fde9ba7a6f62672ffcdc4b28bf6e46556 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--ArmPkg/Library/BdsLib/BdsFilePath.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ArmPkg/Library/BdsLib/BdsFilePath.c b/ArmPkg/Library/BdsLib/BdsFilePath.c
index b79ee78e4..248352cb5 100644
--- a/ArmPkg/Library/BdsLib/BdsFilePath.c
+++ b/ArmPkg/Library/BdsLib/BdsFilePath.c
@@ -1367,7 +1367,7 @@ STATIC LoadAndroidBootImg (
ANDROID_BOOTIMG_HEADER *Header;
CHAR16 KernelArgs[BOOTIMG_KERNEL_ARGS_SIZE];
CHAR16 InitrdArgs[64];
- UINTN VariableSize, Length;
+ UINTN VariableSize;
CHAR16 SerialNoArgs[40], DataUnicode[17];
Header = (ANDROID_BOOTIMG_HEADER *) Buffer;
@@ -1436,8 +1436,7 @@ STATIC LoadAndroidBootImg (
if (EFI_ERROR (Status)) {
goto out;
}
- Length = StrLen (DataUnicode);
- DataUnicode[Length] = '\0';
+ DataUnicode[VariableSize / sizeof(CHAR16)] = '\0';
ZeroMem (SerialNoArgs, 40 * sizeof (CHAR16));
UnicodeSPrint (SerialNoArgs, 40 * sizeof(CHAR16), L" androidboot.serialno=%s", DataUnicode);
StrCat (KernelArgs, SerialNoArgs);