Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 1 | From 6e7e52de7afe29597016952a7317faf9c3ea3268 Mon Sep 17 00:00:00 2001 |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 30 Nov 2019 18:50:34 -0800 |
| 4 | Subject: [PATCH] Do not use getsubopt |
| 5 | |
| 6 | POSIX says that behavior when subopts list is empty is undefined. |
| 7 | musl libs will set value to NULL which leads to crash. |
| 8 | |
| 9 | Simply avoid getsubopt, since we cannot rely on it. |
| 10 | |
| 11 | Imported from Alpine Linux |
| 12 | |
| 13 | Upstream-Status: Pending |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 14 | |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 16 | |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 17 | Adapt patch to 1.23.0. |
| 18 | |
| 19 | (v4l-utils rev fd544473800d02e90bc289434cc44e5aa8fadd0f). |
| 20 | |
| 21 | %% original patch: 0007-Do-not-use-getsubopt.patch |
| 22 | |
| 23 | Signed-off-by: Daniel Gomez <daniel@qtec.com> |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 24 | --- |
| 25 | utils/v4l2-ctl/v4l2-ctl-common.cpp | 18 ++++++++++-------- |
| 26 | 1 file changed, 10 insertions(+), 8 deletions(-) |
| 27 | |
| 28 | diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 29 | index d77f7104..838c297d 100644 |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 30 | --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp |
| 31 | +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 32 | @@ -994,15 +994,17 @@ static bool parse_subset(char *optarg) |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 33 | |
| 34 | static bool parse_next_subopt(char **subs, char **value) |
| 35 | { |
| 36 | - static char *const subopts[] = { |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 37 | - nullptr |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 38 | - }; |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 39 | - int opt = v4l_getsubopt(subs, subopts, value); |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 40 | + char *p = *subs; |
| 41 | + *value = *subs; |
| 42 | |
| 43 | - if (opt < 0 || *value) |
| 44 | - return false; |
| 45 | - fprintf(stderr, "Missing suboption value\n"); |
| 46 | - return true; |
| 47 | + while (*p && *p != ',') |
| 48 | + p++; |
| 49 | + |
| 50 | + if (*p) |
| 51 | + *p++ = '\0'; |
| 52 | + |
| 53 | + *subs = p; |
| 54 | + return false; |
| 55 | } |
| 56 | |
| 57 | void common_cmd(const std::string &media_bus_info, int ch, char *optarg) |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 58 | -- |
| 59 | 2.35.1 |
| 60 | |