diff options
author | falkTX <falktx@falktx.com> | 2019-10-06 23:22:40 +0100 |
---|---|---|
committer | falkTX <falktx@falktx.com> | 2019-10-06 23:22:40 +0100 |
commit | ef6ee6a049b9c7fd6f8586f1b95096ce9f6fcead (patch) | |
tree | 83d32e941a7d7ce2f15942a5d8c866120497e7e9 | |
parent | 3c340b81542af0611f03e454ebeca93da7c99349 (diff) | |
parent | 37250ff470277f9947fbf3ba738f943053e30525 (diff) | |
download | jack2-ef6ee6a049b9c7fd6f8586f1b95096ce9f6fcead.tar.gz |
Merge branch 'master' into develop
-rw-r--r-- | linux/alsa/alsa_rawmidi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/alsa/alsa_rawmidi.c b/linux/alsa/alsa_rawmidi.c index 504547f3..311074c0 100644 --- a/linux/alsa/alsa_rawmidi.c +++ b/linux/alsa/alsa_rawmidi.c @@ -411,7 +411,7 @@ void midi_port_init(const alsa_rawmidi_t *midi, midi_port_t *port, snd_rawmidi_i port->id = *id; snprintf(port->dev, sizeof(port->dev), "hw:%d,%d,%d", id->id[0], id->id[1], id->id[3]); - snprintf(port->device_name, sizeof(port->device_name), snd_rawmidi_info_get_name(info)); + strncpy(port->device_name, snd_rawmidi_info_get_name(info), sizeof(port->device_name)); name = snd_rawmidi_info_get_subdevice_name(info); if (!strlen(name)) name = port->device_name; @@ -468,7 +468,7 @@ int midi_port_open(alsa_rawmidi_t *midi, midi_port_t *port) /* Some devices (emu10k1) have subdevs with the same name, * and we need to generate unique port name for jack */ - snprintf(name, sizeof(name), "%s", port->name); + strncpy(name, port->name, sizeof(name)); if (midi_port_open_jack(midi, port, type, name)) { int num; num = port->id.id[3] ? port->id.id[3] : port->id.id[1]; |