mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-27 07:58:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: parser: Fix snprintf usage

Browse source 
There is no need to manually 0 terminate the buffer with snprintf,
only strncpy has the very unfortunate behavior of not guaranteeing 0
termination.

Likewise there is no need to substract one from the buffer size of
the buffer passed to snprintf.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Hans de Goede 2019-11-19 11:48:22 +01:00 • committed by Jaroslav Kysela
parent b3a02322d4
commit 8c4301e7a8
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ucm/parser.c
View file

@ -71,7 +71,6 @@ static void configuration_filename2(char *fn, size_t fn_len, int format,
snprintf(fn, fn_len, "%s/ucm%s/%s/%s%s", snprintf(fn, fn_len, "%s/ucm%s/%s/%s%s",
snd_config_topdir(), format >= 2 ? "2" : "", snd_config_topdir(), format >= 2 ? "2" : "",
dir, file, suffix); dir, file, suffix);
fn[fn_len-1] = '\0';
} }
static void configuration_filename(snd_use_case_mgr_t *uc_mgr, static void configuration_filename(snd_use_case_mgr_t *uc_mgr,
@ -96,7 +95,6 @@ static void configuration_filename(snd_use_case_mgr_t *uc_mgr,
} }
if (env) { if (env) {
snprintf(fn, fn_len, "%s/%s/%s%s", env, dir, file, suffix); snprintf(fn, fn_len, "%s/%s/%s%s", env, dir, file, suffix);
fn[fn_len-1] = '\0';
return; return;
} }
@ -1712,11 +1710,10 @@ int uc_mgr_scan_master_configs(const char **_list[])
struct dirent **namelist; struct dirent **namelist;
if (env) if (env)
snprintf(filename, sizeof(filename)-1, "%s", env); snprintf(filename, sizeof(filename), "%s", env);
else else
snprintf(filename, sizeof(filename)-1, "%s/ucm2", snprintf(filename, sizeof(filename), "%s/ucm2",
snd_config_topdir()); snd_config_topdir());
filename[sizeof(filename)-1] = '\0';
#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(ANDROID) #if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(ANDROID)
#define SORTFUNC versionsort #define SORTFUNC versionsort