From 7927e64f35bba463eb8de420454607fe40dca73c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 02:11:13 +0200 Subject: Merging debian version 2.36.1-8+deb11u2. Signed-off-by: Daniel Baumann --- ...-calloc-cal-Werror-calloc-transposed-args.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 debian/patches/upstream/wall-fix-calloc-cal-Werror-calloc-transposed-args.patch (limited to 'debian/patches/upstream/wall-fix-calloc-cal-Werror-calloc-transposed-args.patch') diff --git a/debian/patches/upstream/wall-fix-calloc-cal-Werror-calloc-transposed-args.patch b/debian/patches/upstream/wall-fix-calloc-cal-Werror-calloc-transposed-args.patch new file mode 100644 index 0000000..8d123f0 --- /dev/null +++ b/debian/patches/upstream/wall-fix-calloc-cal-Werror-calloc-transposed-args.patch @@ -0,0 +1,27 @@ +From: Karel Zak +Date: Wed, 17 Jan 2024 12:37:08 +0100 +Subject: wall: fix calloc cal [-Werror=calloc-transposed-args] + +term-utils/wall.c:143:37: error: xcalloc sizes specified with sizeof in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] + 143 | buf->groups = xcalloc(sizeof(*buf->groups), buf->ngroups); + | ^ +term-utils/wall.c:143:37: note: earlier argument should specify number of elements, later size of each element + +Signed-off-by: Karel Zak +--- + term-utils/wall.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/term-utils/wall.c b/term-utils/wall.c +index fa5e027..16dfb1f 100644 +--- a/term-utils/wall.c ++++ b/term-utils/wall.c +@@ -134,7 +134,7 @@ static struct group_workspace *init_group_workspace(const char *group) + + buf->requested_group = get_group_gid(group); + buf->ngroups = sysconf(_SC_NGROUPS_MAX) + 1; /* room for the primary gid */ +- buf->groups = xcalloc(sizeof(*buf->groups), buf->ngroups); ++ buf->groups = xcalloc(buf->ngroups, sizeof(*buf->groups)); + + return buf; + } -- cgit v1.2.3