forked from pool/systemd
Marcus Meissner
656aca6436
- Add 0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch: fix acpi memleak. - Add 0002-fix-lingering-references-to-var-lib-backlight-random.patch: fix invalid path in documentation. - Add 0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch: fix invalid memory free. - Add 0004-systemctl-fix-name-mangling-for-sysv-units.patch: fix name mangling for sysv units. - Add 0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch: fix OOM handling. - Add 0006-journald-add-missing-error-check.patch: add missing error check. - Add 0007-bus-fix-potentially-uninitialized-memory-access.patch: fix uninitialized memory access. - Add 0008-dbus-fix-return-value-of-dispatch_rqueue.patch: fix return value. - Add 0009-modules-load-fix-error-handling.patch: fix error handling. - Add 0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch: fix incorrect memory access. - Add 0011-strv-don-t-access-potentially-NULL-string-arrays.patch: fix incorrect memory access. - Add 0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch: fix invalid pointer. - Add 0014-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch: OBS-URL: https://build.opensuse.org/request/show/202117 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=452
27 lines
780 B
Diff
27 lines
780 B
Diff
From 62678deda2dcd43954bf02f783da01e48c7f8fce Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 2 Oct 2013 19:38:09 +0200
|
|
Subject: [PATCH 10/15] efi: never call qsort on potentially NULL arrays
|
|
|
|
---
|
|
src/shared/efivars.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
|
|
index 1d5b6f9..c015b16 100644
|
|
--- a/src/shared/efivars.c
|
|
+++ b/src/shared/efivars.c
|
|
@@ -384,7 +384,8 @@ int efi_get_boot_options(uint16_t **options) {
|
|
list[count ++] = id;
|
|
}
|
|
|
|
- qsort(list, count, sizeof(uint16_t), cmp_uint16);
|
|
+ if (list)
|
|
+ qsort(list, count, sizeof(uint16_t), cmp_uint16);
|
|
|
|
*options = list;
|
|
return count;
|
|
--
|
|
1.8.4
|
|
|