Blame 0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch
|
 |
a52f674 |
From 0bf9388b5c3df03a217ec0300cfbba8bbe53b045 Mon Sep 17 00:00:00 2001
|
|
|
794d16c |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
794d16c |
Date: Wed, 2 Oct 2013 19:38:09 +0200
|
|
|
794d16c |
Subject: [PATCH] efi: never call qsort on potentially NULL arrays
|
|
|
794d16c |
|
|
|
794d16c |
---
|
|
|
794d16c |
src/shared/efivars.c | 3 ++-
|
|
|
794d16c |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
794d16c |
|
|
|
794d16c |
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
|
|
|
794d16c |
index 1d5b6f9..c015b16 100644
|
|
|
794d16c |
--- a/src/shared/efivars.c
|
|
|
794d16c |
+++ b/src/shared/efivars.c
|
|
|
794d16c |
@@ -384,7 +384,8 @@ int efi_get_boot_options(uint16_t **options) {
|
|
|
794d16c |
list[count ++] = id;
|
|
|
794d16c |
}
|
|
|
794d16c |
|
|
|
794d16c |
- qsort(list, count, sizeof(uint16_t), cmp_uint16);
|
|
|
794d16c |
+ if (list)
|
|
|
794d16c |
+ qsort(list, count, sizeof(uint16_t), cmp_uint16);
|
|
|
794d16c |
|
|
|
794d16c |
*options = list;
|
|
|
794d16c |
return count;
|