[hackers] [sbase] tar: check if reallocarray failed
Hi,
The patch below is for sbase tar:
>From 2eec3e07a5bd1ed1fa41ca02865297ab7d8b5fa8 Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma
Date: Sat, 17 Jul 2021 21:03:27 +0200
Subject: [PATCH] tar: check if reallocarray failed
---
tar.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tar.c b/tar.c
index b74c134..122f30a 100644
--- a/tar.c
+++ b/tar.c
@@ -78,7 +78,7 @@ static const char *filtertools[] = {
static void
pushdirtime(char *name, time_t mtime)
{
- dirtimes = reallocarray(dirtimes, dirtimeslen + 1, sizeof(*dirtimes));
+ dirtimes = ereallocarray(dirtimes, dirtimeslen + 1, sizeof(*dirtimes));
dirtimes[dirtimeslen].name = strdup(name);
dirtimes[dirtimeslen].mtime = mtime;
dirtimeslen++;
--
2.32.0
--
Kind regards,
Hiltjo
[hackers] [st][PATCH] Add 14th bit to XK_SWITCH_MOD bitmask
From: Petar Kapriš
The bits of uint signal in an XKeyEvent which concern the key group (keyboard
layout) are bits 13 and 14, as documented here:
https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Groups_and_Shift_Levels
In the older version, only bit 13 was marked as part of XK_SWITCH_MOD, this
causes issues for users who have more than two keymaps. the 14th bit is not
in ignoremod, key sequences are not caught by match(), if they switch to a third
or fourth keyboard.
---
x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x.c b/x.c
index 6f11d52..c91552a 100644
--- a/x.c
+++ b/x.c
@@ -48,7 +48,7 @@ typedef struct {
/* X modifiers */
#define XK_ANY_MODUINT_MAX
#define XK_NO_MOD 0
-#define XK_SWITCH_MOD (1<<13)
+#define XK_SWITCH_MOD (0b11<<13)
/* function definitions used in config.h */
static void clipcopy(const Arg *);
--
2.32.0
