diff options
| -rw-r--r-- | meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-fixed-compilation-error-caused-by-strncpy.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-fixed-compilation-error-caused-by-strncpy.patch b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-fixed-compilation-error-caused-by-strncpy.patch deleted file mode 100644 index 64ebdb19c9..0000000000 --- a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-fixed-compilation-error-caused-by-strncpy.patch +++ /dev/null | |||
| @@ -1,69 +0,0 @@ | |||
| 1 | From 639650dd64e483074dd7c3c7ea6dc1b1bd542743 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: alperak <alperyasinak1@gmail.com> | ||
| 3 | Date: Sun, 12 Nov 2023 20:16:55 +0300 | ||
| 4 | Subject: [PATCH] fixed compilation error caused by strncpy | ||
| 5 | |||
| 6 | Issue: | ||
| 7 | https://github.com/tinyalsa/tinyalsa/issues/219 | ||
| 8 | |||
| 9 | Fix: | ||
| 10 | https://github.com/tinyalsa/tinyalsa/pull/220 | ||
| 11 | https://github.com/tinyalsa/tinyalsa/pull/221 | ||
| 12 | |||
| 13 | Upstream-Status: Submitted | ||
| 14 | |||
| 15 | Signed-off-by: alperak <alperyasinak1@gmail.com> | ||
| 16 | --- | ||
| 17 | src/mixer_plugin.c | 8 +++++--- | ||
| 18 | src/pcm_plugin.c | 9 ++++++--- | ||
| 19 | 2 files changed, 11 insertions(+), 6 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/src/mixer_plugin.c b/src/mixer_plugin.c | ||
| 22 | index 34117a9..f608563 100644 | ||
| 23 | --- a/src/mixer_plugin.c | ||
| 24 | +++ b/src/mixer_plugin.c | ||
| 25 | @@ -82,7 +82,8 @@ static int mixer_plug_get_elem_id(struct mixer_plug_data *plug_data, | ||
| 26 | id->iface = ctl->iface; | ||
| 27 | |||
| 28 | strncpy((char *)id->name, (char *)ctl->name, | ||
| 29 | - sizeof(id->name)); | ||
| 30 | + sizeof(id->name) - 1); | ||
| 31 | + ((char *)id->name)[sizeof(id->name) - 1] = '\0'; | ||
| 32 | |||
| 33 | return 0; | ||
| 34 | } | ||
| 35 | @@ -100,8 +101,9 @@ static int mixer_plug_info_enum(struct snd_control *ctl, | ||
| 36 | |||
| 37 | strncpy(einfo->value.enumerated.name, | ||
| 38 | val->texts[einfo->value.enumerated.item], | ||
| 39 | - sizeof(einfo->value.enumerated.name)); | ||
| 40 | - | ||
| 41 | + sizeof(einfo->value.enumerated.name) - 1); | ||
| 42 | + einfo->value.enumerated.name[sizeof(einfo->value.enumerated.name) - 1] = '\0'; | ||
| 43 | + | ||
| 44 | return 0; | ||
| 45 | } | ||
| 46 | |||
| 47 | diff --git a/src/pcm_plugin.c b/src/pcm_plugin.c | ||
| 48 | index 15bfc80..47bf4a5 100644 | ||
| 49 | --- a/src/pcm_plugin.c | ||
| 50 | +++ b/src/pcm_plugin.c | ||
| 51 | @@ -153,9 +153,12 @@ static int pcm_plug_info(struct pcm_plug_data *plug_data, | ||
| 52 | return ret; | ||
| 53 | } | ||
| 54 | |||
| 55 | - strncpy((char *)info->id, name, sizeof(info->id)); | ||
| 56 | - strncpy((char *)info->name, name, sizeof(info->name)); | ||
| 57 | - strncpy((char *)info->subname, name, sizeof(info->subname)); | ||
| 58 | + strncpy((char *)info->id, name, sizeof(info->id) - 1); | ||
| 59 | + ((char *)info->id)[sizeof(info->id) - 1] = '\0'; | ||
| 60 | + strncpy((char *)info->name, name, sizeof(info->name) - 1); | ||
| 61 | + ((char *)info->name)[sizeof(info->name) - 1] = '\0'; | ||
| 62 | + strncpy((char *)info->subname, name, sizeof(info->subname) - 1); | ||
| 63 | + ((char *)info->subname)[sizeof(info->subname) - 1] = '\0'; | ||
| 64 | |||
| 65 | info->subdevices_count = 1; | ||
| 66 | |||
| 67 | -- | ||
| 68 | 2.25.1 | ||
| 69 | |||
