mirror of
https://codeberg.org/flk/meta-wayland.git
synced 2024-11-20 04:18:25 +01:00
swaylock: update
mismatched allocation function has already been fixed upstream; remove the patch and update to latest
This commit is contained in:
parent
0b5e34b8fd
commit
310ca4fb9a
@ -1,31 +0,0 @@
|
|||||||
From 3e861934074148dc803e70508ad99dfbd0d14765 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Markus Volk <f_l_k@t-online.de>
|
|
||||||
Date: Fri, 20 Aug 2021 13:42:57 +0200
|
|
||||||
Subject: [PATCH] load_config: fix mismatched allocation function
|
|
||||||
|
|
||||||
| In function 'load_config',
|
|
||||||
| inlined from 'main' at ../git/main.c:1138:23:
|
|
||||||
| ../git/main.c:1060:25: error: 'free' called on pointer returned from a mismatched allocation function [-Werror=mismatched-dealloc]
|
|
||||||
| 1060 | free(config);
|
|
||||||
|
|
||||||
Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
|
||||||
---
|
|
||||||
main.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/main.c b/main.c
|
|
||||||
index c65d68a..7921770 100644
|
|
||||||
--- a/main.c
|
|
||||||
+++ b/main.c
|
|
||||||
@@ -1057,7 +1057,7 @@ static int load_config(char *path, struct swaylock_state *state,
|
|
||||||
char *flag = malloc(nread + 3);
|
|
||||||
if (flag == NULL) {
|
|
||||||
free(line);
|
|
||||||
- free(config);
|
|
||||||
+ fclose(config);
|
|
||||||
swaylock_log(LOG_ERROR, "Failed to allocate memory");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
@ -18,12 +18,11 @@ DEPENDS = " \
|
|||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://github.com/swaywm/swaylock.git;protocol=https \
|
git://github.com/swaywm/swaylock.git;protocol=https \
|
||||||
file://0001-load_config-fix-mismatched-allocation-function.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
PV = "1.5"
|
PV = "1.5+${SRCREV}"
|
||||||
SRCREV = "${PV}"
|
SRCREV = "2bf76009e1d279a4194d37b9ee4f2bf0d9424d62"
|
||||||
|
|
||||||
PACKAGECONFIG[pam] = ",,libpam"
|
PACKAGECONFIG[pam] = ",,libpam"
|
||||||
PACKAGECONFIG[gdk-pixbuf] = ",,gdk-pixbuf"
|
PACKAGECONFIG[gdk-pixbuf] = ",,gdk-pixbuf"
|
||||||
|
Loading…
Reference in New Issue
Block a user