Signed-off-by: Sean Young <email address hidden>
(cherry picked from commit 0fed77f778b8ae2f3bc5ec264e73b1b7d065b228)
5fa4eb4...
by
Matthias Reichl <email address hidden>
keytable: fix segfault when reading legacy keymaps
Since commit ae1492611432 ("keytable: remove line length limits")
ir-keytable crashes when reading keymaps in legacy (non-toml) format
and valgrind reports an UMR:
valgrind ir-keytable -w /etc/rc_keymaps/hiastest
...
==83788== Conditional jump or move depends on uninitialised value(s)
==83788== at 0x48E8B8C: getdelim (iogetdelim.c:59)
==83788== by 0x1105C6: getline (stdio.h:120)
==83788== by 0x1105C6: parse_plain_keymap (keymap.c:98)
==83788== by 0x1105C6: parse_keymap (keymap.c:533)
==83788== by 0x112798: parse_opt (keytable.c:569)
==83788== by 0x4986E50: group_parse (argp-parse.c:257)
==83788== by 0x4986E50: parser_parse_opt (argp-parse.c:747)
==83788== by 0x4986E50: parser_parse_next (argp-parse.c:867)
==83788== by 0x4986E50: argp_parse (argp-parse.c:921)
==83788== by 0x10E470: main (keytable.c:2071)
Fix this by properly initializing line to NULL so getline will allocate
a buffer instead of using some random memory locations.
Signed-off-by: Matthias Reichl <email address hidden>
Signed-off-by: Sean Young <email address hidden>
(cherry picked from commit f105c1eff03489f9e317009c4d9f56a61171ee5f)
f14126e...
by
Rudi Heitbaum <email address hidden>
keytable: meson not passing rc_keymaps system directory
In the meson build ir_keytable_system_dir is used as the parent directory
for both rc_keymaps and rules.d, whereas udevrulesdir was defined
sepeartely in the configure script. Update the -DIR_KEYTABLE_SYSTEM_DIR
to include the rc_keymaps subdirectory aligning with the install_data
functions.
Signed-off-by: Rudi Heitbaum <email address hidden>
Signed-off-by: Sean Young <email address hidden>
(cherry picked from commit 7823e3dc0dcf88f114514b42b945941cc4d0729d)
Signed-off-by: Gregor Jasny <email address hidden>
Signed-off-by: Sean Young <email address hidden>
(cherry picked from commit ae1492611432bb158e3be292ed10ed95541893b4)
Signed-off-by: Gregor Jasny <email address hidden>
Signed-off-by: Sean Young <email address hidden>
(cherry picked from commit f7e4ee2b571505102328cb3c76bbd44ddb3c9c90)
Signed-off-by: Gregor Jasny <email address hidden>
- libv4lconvert helpers (v4lconvert_helper_decompress,
v4lconvert_helper_cleanup, ...) need fork() support, so add additional
dependency for HAVE_LIBV4LCONVERT_HELPERS
Fixes:
FAILED: contrib/test/v4l2grab
.../bootlin-armv7m-uclibc/host/bin/arm-linux-gcc -o contrib/test/v4l2grab contrib/test/v4l2grab.p/v4l2grab.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,-elf2flt=-r -static -Wl,--start-group lib/libv4l2/libv4l2.a lib/libv4lconvert/libv4lconvert.a -largp -pthread -ldl -lm -lrt -Wl,--end-group
.../bootlin-armv7m-uclibc/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: lib/libv4lconvert/libv4lconvert.a(libv4lconvert.c.o): in function `v4lconvert_destroy':
libv4lconvert.c:(.text+0x5c0): undefined reference to `v4lconvert_helper_cleanup'
.../bootlin-armv7m-uclibc/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: lib/libv4lconvert/libv4lconvert.a(libv4lconvert.c.o): in function `v4lconvert_convert_pixfmt':
libv4lconvert.c:(.text+0x1450): undefined reference to `v4lconvert_helper_decompress'
collect2: error: ld returned 1 exit status
Signed-off-by: Peter Seiderer <email address hidden>
Signed-off-by: Hans Verkuil <email address hidden>
(cherry picked from commit b22a2838ca31ea066f8bbc4561c3a602bd274441)
Signed-off-by: Gregor Jasny <email address hidden>
- fix meson has_function('fork') detection, needs suitable include to avoid
false positive (see [1] for details)
Fixes:
.../bootlin-armv7m-uclibc/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: lib/libv4lconvert/libv4lconvert.a(helper.c.o): in function `v4lconvert_helper_decompress':
helper.c:(.text+0x14e): undefined reference to `fork'
collect2: error: ld returned 1 exit status
media-info: add missing sys/stat.h include (for dev_t)
Fixes musl libc compile failure:
In file included from ../utils/v4l2-tracer/v4l2-tracer-common.h:11, from ../utils/v4l2-tracer/trace.h:9, from ../utils/v4l2-tracer/trace-helper.cpp:6:
../utils/common/media-info.h:40:34: error: ‘dev_t’ has not been declared
40 | int mi_get_dev_t_from_fd(int fd, dev_t *dev);
| ^~~~~
../utils/common/media-info.h:48:39: error: ‘dev_t’ was not declared in this scope; did you mean ‘div_t’?
48 | std::string mi_get_devpath_from_dev_t(dev_t dev);
| ^~~~~
| div_t
Signed-off-by: Peter Seiderer <email address hidden>
Signed-off-by: Hans Verkuil <email address hidden>
(cherry picked from commit b66b50001d299222d089820ec4c48a0577a482c1)
Signed-off-by: Gregor Jasny <email address hidden>
