File multi-device-path-end-by-null.patch of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File multi-device-path-end-by-null.patch of Package systemd

diff -Ppdru systemd-v255.4+suse.22.g56b53b17bc/src/boot/efi/boot.c systemd-v255.4+suse.22.g56b53b17bc-new/src/boot/efi/boot.c
--- systemd-v255.4+suse.22.g56b53b17bc/src/boot/efi/boot.c	2024-04-15 17:14:48.875196190 +0200
+++ systemd-v255.4+suse.22.g56b53b17bc-new/src/boot/efi/boot.c	2024-04-15 17:16:21.718279138 +0200
@@ -1495,7 +1495,6 @@ static void boot_entry_add_type1(
                         );
                         entry->addons[n_addons++] = xstr8_to_path(value);
                         entry->addons[n_addons] = NULL;
-                        continue;
                 } else if (streq8(key, "options")) {
                         _cleanup_free_ char16_t *new = NULL;
 
diff -Ppdru systemd-v255.4+suse.22.g56b53b17bc/src/boot/efi/device-path-util.c systemd-v255.4+suse.22.g56b53b17bc-new/src/boot/efi/device-path-util.c
--- systemd-v255.4+suse.22.g56b53b17bc/src/boot/efi/device-path-util.c	2024-04-15 17:14:48.883196111 +0200
+++ systemd-v255.4+suse.22.g56b53b17bc-new/src/boot/efi/device-path-util.c	2024-04-15 17:16:14.646348991 +0200
@@ -33,7 +33,7 @@ EFI_STATUS make_multiple_file_device_pat
         size_t o_dp_size = (uint8_t *) end_node - (uint8_t *) original_device_path;
 
 
-        *ret_dp = xnew(EFI_DEVICE_PATH*, n_files);
+        *ret_dp = xnew(EFI_DEVICE_PATH*, n_files + 1);
 
         iterator_dp = ret_dp[0];
 
@@ -64,6 +64,7 @@ EFI_STATUS make_multiple_file_device_pat
 
                 iterator_dp++;
         }
+        *iterator_dp = NULL;
 
         return EFI_SUCCESS;
 }
diff: systemd-v255.4+suse.22.g56b53b17bc/test/testdata: recursive directory loop

Places

File multi-device-path-end-by-null.patch of Package systemd

Places