27 lines
787 B
Diff
27 lines
787 B
Diff
|
From e0cbed4dbb7c21798b5eecf3d326fb778c4d0be2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Wed, 2 Oct 2013 19:38:09 +0200
|
||
|
|
Subject: [PATCH] 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.652.g0d6e0ce
|
||
|
|
|