delta/xorg-lib-libXpm.git/src, branch master

Set close-on-exec when opening files

2023-04-22T17:15:24+00:00

Relies on platforms with O_CLOEXEC support following POSIX requirement
to not copy the close-on-exec flag to the new fd in dup2(), but to leave
it unset instead, since that's how fd's are passed to child processes
to handled compressed files.

Signed-off-by: Alan Coopersmith

xpmReadRgbNames: constify filename argument

2023-03-28T01:21:12+00:00

Signed-off-by: Alan Coopersmith

parse.c: remove unused function xstrlcpy()

2023-02-12T21:22:57+00:00

parse.c:74:1: warning: unused function 'xstrlcpy' [-Wunused-function]
xstrlcpy(char *dst, const char *src, size_t dstsize)
^

Signed-off-by: Alan Coopersmith

parse.c: Wrap FREE_CIDX definition in do { ... } while(0)

2023-02-12T18:51:46+00:00

Makes it match the definition in create.c and eliminates
clang warnings:

create.c:2409:13: warning: empty expression statement has no effect;
 remove unnecessary ';' to silence this warning [-Wextra-semi-stmt]
                        FREE_CIDX;
                                 ^
create.c:2440:17: warning: empty expression statement has no effect;
 remove unnecessary ';' to silence this warning [-Wextra-semi-stmt]
                            FREE_CIDX;
                                     ^
create.c:2444:13: warning: empty expression statement has no effect;
 remove unnecessary ';' to silence this warning [-Wextra-semi-stmt]
                        FREE_CIDX;
                                 ^
create.c:2449:15: warning: empty expression statement has no effect;
 remove unnecessary ';' to silence this warning [-Wextra-semi-stmt]
            FREE_CIDX;
                     ^

Signed-off-by: Alan Coopersmith

XpmCreateDataFromXpmImage: Fix misleading indentation

2023-02-12T17:25:10+00:00

CrDatFrI.c: In function ‘XpmCreateDataFromXpmImage’:
CrDatFrI.c:245:13: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
  245 |             if (header[l])
      |             ^~
In file included from CrDatFrI.c:40:
XpmI.h:80:22: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
   80 | #define XpmFree(ptr) free(ptr)
      |                      ^~~~
CrDatFrI.c:247:17: note: in expansion of macro ‘XpmFree’
  247 |                 XpmFree(header);
      |                 ^~~~~~~
CrDatFrI.c: In function ‘CreateColors’:

Signed-off-by: Alan Coopersmith

open-zfile: Make compress & uncompress commands optional

2023-02-05T20:14:43+00:00

If compress is not found, we disable writing to .Z files,
but leave the rest of the compression code active.

If uncompress is not found, we use gzip to read .Z files.

Signed-off-by: Alan Coopersmith

Fix a memleak in ParsePixels error code path

2023-01-23T23:46:34+00:00

In this particular error path we have already allocated cidx[0..256]
with 256 instances of fresh and juicy memory. Freeing that is annoying,
but luckily there's a helpful FREE_CIDX macro that does exactly that.

Fixes f80fa6a:
  Fix CVE-2022-44617: Runaway loop with width of 0 and enormous height

Found by covscan

Signed-off-by: Peter Hutterer

Use gzip -d instead of gunzip

2023-01-16T18:30:39+00:00

GNU gunzip [1] is a shell script that exec's `gzip -d`. Even if we call
/usr/bin/gunzip with the correct built-in path, the actual gzip call
will use whichever gzip it finds first, making our patch pointless.

Fix this by explicitly calling gzip -d instead.

https://git.savannah.gnu.org/cgit/gzip.git/tree/gunzip.in

[Part of the fix for CVE-2022-4883]
Signed-off-by: Peter Hutterer

Prevent a double free in the error code path

2023-01-12T23:47:43+00:00

xpmParseDataAndCreate() calls XDestroyImage() in the error path.
Reproducible with sxpm "zero-width.xpm", that file is in the test/
directory.

The same approach is needed in the bytes_per_line == 0 condition though
here it just plugs a memory leak.

Signed-off-by: Alan Coopersmith

Fix CVE-2022-4883: compression commands depend on $PATH

2023-01-12T23:47:43+00:00

By default, on all platforms except MinGW, libXpm will detect if a
filename ends in .Z or .gz, and will when reading such a file fork off
an uncompress or gunzip command to read from via a pipe, and when
writing such a file will fork off a compress or gzip command to write
to via a pipe.

In libXpm 3.5.14 or older these are run via execlp(), relying on $PATH
to find the commands.  If libXpm is called from a program running with
raised privileges, such as via setuid, then a malicious user could set
$PATH to include programs of their choosing to be run with those
privileges.

Signed-off-by: Alan Coopersmith