From: Luca Boccassi <bluca@debian.org>
Date: Mon, 28 Nov 2022 14:49:17 +0000 (+0100)
Subject: Merge pull request #25222 from medhefgo/stub-cmdline
X-Git-Tag: v253-rc1~436
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d3fcb6ccdc60fc023f27583261cecd2ff78b601;p=thirdparty%2Fsystemd.git

Merge pull request #25222 from medhefgo/stub-cmdline

stub: Fix cmdline handling
---

6d3fcb6ccdc60fc023f27583261cecd2ff78b601
diff --cc src/boot/efi/stub.c
index 6ece3cf7334,7c42a16c701..023f8ae2558
--- a/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@@ -140,12 -184,10 +187,11 @@@ EFI_STATUS efi_main(EFI_HANDLE image, E
          EFI_PHYSICAL_ADDRESS linux_base, initrd_base, dt_base;
          _cleanup_(devicetree_cleanup) struct devicetree_state dt_state = {};
          EFI_LOADED_IMAGE_PROTOCOL *loaded_image;
-         UINTN addrs[_UNIFIED_SECTION_MAX] = {}, szs[_UNIFIED_SECTION_MAX] = {};
-         char *cmdline = NULL;
-         _cleanup_free_ char *cmdline_owned = NULL;
+         size_t addrs[_UNIFIED_SECTION_MAX] = {}, szs[_UNIFIED_SECTION_MAX] = {};
+         _cleanup_free_ char16_t *cmdline = NULL;
          int sections_measured = -1, parameters_measured = -1;
          bool sysext_measured = false, m;
 +        uint64_t loader_features = 0;
          EFI_STATUS err;
  
          InitializeLib(image, sys_table);