mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed dmix crashes by Clemens Ladisch <clemens@ladisch.de>:

Browse source 
pcm->name can be NULL (when an unnamed pcm node is embedded in another
  pcm)
This commit is contained in:
Takashi Iwai 2003-08-07 14:20:32 +00:00
parent 7058054471
commit 18927bfe9a
4 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pcm/pcm_dmix.c
View file

@ -414,9 +414,11 @@ static int snd_pcm_dmix_info(snd_pcm_t *pcm, snd_pcm_info_t * info)
info->stream = pcm->stream; info->stream = pcm->stream;
info->card = -1; info->card = -1;
/* FIXME: fill this with something more useful: we know the hardware name */ /* FIXME: fill this with something more useful: we know the hardware name */
strncpy(info->id, pcm->name, sizeof(info->id)); if (pcm->name) {
strncpy(info->name, pcm->name, sizeof(info->name)); strncpy(info->id, pcm->name, sizeof(info->id));
strncpy(info->subname, pcm->name, sizeof(info->subname)); strncpy(info->name, pcm->name, sizeof(info->name));
strncpy(info->subname, pcm->name, sizeof(info->subname));
}
info->subdevices_count = 1; info->subdevices_count = 1;
return 0; return 0;
} }

8
src/pcm/pcm_dshare.c
View file

@ -201,9 +201,11 @@ static int snd_pcm_dshare_info(snd_pcm_t *pcm, snd_pcm_info_t * info)
info->stream = pcm->stream; info->stream = pcm->stream;
info->card = -1; info->card = -1;
/* FIXME: fill this with something more useful: we know the hardware name */ /* FIXME: fill this with something more useful: we know the hardware name */
strncpy(info->id, pcm->name, sizeof(info->id)); if (pcm->name) {
strncpy(info->name, pcm->name, sizeof(info->name)); strncpy(info->id, pcm->name, sizeof(info->id));
strncpy(info->subname, pcm->name, sizeof(info->subname)); strncpy(info->name, pcm->name, sizeof(info->name));
strncpy(info->subname, pcm->name, sizeof(info->subname));
}
info->subdevices_count = 1; info->subdevices_count = 1;
return 0; return 0;
} }

8
src/pcm/pcm_dsnoop.c
View file

@ -184,9 +184,11 @@ static int snd_pcm_dsnoop_info(snd_pcm_t *pcm, snd_pcm_info_t * info)
info->stream = pcm->stream; info->stream = pcm->stream;
info->card = -1; info->card = -1;
/* FIXME: fill this with something more useful: we know the hardware name */ /* FIXME: fill this with something more useful: we know the hardware name */
strncpy(info->id, pcm->name, sizeof(info->id)); if (pcm->name) {
strncpy(info->name, pcm->name, sizeof(info->name)); strncpy(info->id, pcm->name, sizeof(info->id));
strncpy(info->subname, pcm->name, sizeof(info->subname)); strncpy(info->name, pcm->name, sizeof(info->name));
strncpy(info->subname, pcm->name, sizeof(info->subname));
}
info->subdevices_count = 1; info->subdevices_count = 1;
return 0; return 0;
} }

8
src/pcm/pcm_null.c
View file

@ -70,9 +70,11 @@ static int snd_pcm_null_info(snd_pcm_t *pcm, snd_pcm_info_t * info)
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
info->stream = pcm->stream; info->stream = pcm->stream;
info->card = -1; info->card = -1;
strncpy(info->id, pcm->name, sizeof(info->id)); if (pcm->name) {
strncpy(info->name, pcm->name, sizeof(info->name)); strncpy(info->id, pcm->name, sizeof(info->id));
strncpy(info->subname, pcm->name, sizeof(info->subname)); strncpy(info->name, pcm->name, sizeof(info->name));
strncpy(info->subname, pcm->name, sizeof(info->subname));
}
info->subdevices_count = 1; info->subdevices_count = 1;
return 0; return 0;
} }