* [PATCH] fix dmix crashes
@ 2003-08-07 9:27 Clemens Ladisch
2003-08-07 14:20 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Clemens Ladisch @ 2003-08-07 9:27 UTC (permalink / raw)
To: alsa-devel
pcm->name can be NULL (when an unnamed pcm node is embedded in another
pcm)
Index: alsa-lib/src/pcm/pcm_dmix.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dmix.c,v
retrieving revision 1.40
diff -u -r1.40 pcm_dmix.c
--- alsa-lib/src/pcm/pcm_dmix.c 25 Jul 2003 17:02:03 -0000 1.40
+++ alsa-lib/src/pcm/pcm_dmix.c 7 Aug 2003 09:20:51 -0000
@@ -414,9 +414,11 @@
info->stream = pcm->stream;
info->card = -1;
/* FIXME: fill this with something more useful: we know the hardware name */
- strncpy(info->id, pcm->name, sizeof(info->id));
- strncpy(info->name, pcm->name, sizeof(info->name));
- strncpy(info->subname, pcm->name, sizeof(info->subname));
+ if (pcm->name) {
+ strncpy(info->id, pcm->name, sizeof(info->id));
+ strncpy(info->name, pcm->name, sizeof(info->name));
+ strncpy(info->subname, pcm->name, sizeof(info->subname));
+ }
info->subdevices_count = 1;
return 0;
}
Index: alsa-lib/src/pcm/pcm_dshare.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dshare.c,v
retrieving revision 1.7
diff -u -r1.7 pcm_dshare.c
--- alsa-lib/src/pcm/pcm_dshare.c 25 Jul 2003 17:02:03 -0000 1.7
+++ alsa-lib/src/pcm/pcm_dshare.c 7 Aug 2003 09:20:52 -0000
@@ -201,9 +201,11 @@
info->stream = pcm->stream;
info->card = -1;
/* FIXME: fill this with something more useful: we know the hardware name */
- strncpy(info->id, pcm->name, sizeof(info->id));
- strncpy(info->name, pcm->name, sizeof(info->name));
- strncpy(info->subname, pcm->name, sizeof(info->subname));
+ if (pcm->name) {
+ strncpy(info->id, pcm->name, sizeof(info->id));
+ strncpy(info->name, pcm->name, sizeof(info->name));
+ strncpy(info->subname, pcm->name, sizeof(info->subname));
+ }
info->subdevices_count = 1;
return 0;
}
Index: alsa-lib/src/pcm/pcm_dsnoop.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dsnoop.c,v
retrieving revision 1.7
diff -u -r1.7 pcm_dsnoop.c
--- alsa-lib/src/pcm/pcm_dsnoop.c 25 Jul 2003 17:02:03 -0000 1.7
+++ alsa-lib/src/pcm/pcm_dsnoop.c 7 Aug 2003 09:20:54 -0000
@@ -184,9 +184,11 @@
info->stream = pcm->stream;
info->card = -1;
/* FIXME: fill this with something more useful: we know the hardware name */
- strncpy(info->id, pcm->name, sizeof(info->id));
- strncpy(info->name, pcm->name, sizeof(info->name));
- strncpy(info->subname, pcm->name, sizeof(info->subname));
+ if (pcm->name) {
+ strncpy(info->id, pcm->name, sizeof(info->id));
+ strncpy(info->name, pcm->name, sizeof(info->name));
+ strncpy(info->subname, pcm->name, sizeof(info->subname));
+ }
info->subdevices_count = 1;
return 0;
}
Index: alsa-lib/src/pcm/pcm_null.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_null.c,v
retrieving revision 1.48
diff -u -r1.48 pcm_null.c
--- alsa-lib/src/pcm/pcm_null.c 25 Jul 2003 17:02:04 -0000 1.48
+++ alsa-lib/src/pcm/pcm_null.c 7 Aug 2003 09:20:55 -0000
@@ -70,9 +70,11 @@
memset(info, 0, sizeof(*info));
info->stream = pcm->stream;
info->card = -1;
- strncpy(info->id, pcm->name, sizeof(info->id));
- strncpy(info->name, pcm->name, sizeof(info->name));
- strncpy(info->subname, pcm->name, sizeof(info->subname));
+ if (pcm->name) {
+ strncpy(info->id, pcm->name, sizeof(info->id));
+ strncpy(info->name, pcm->name, sizeof(info->name));
+ strncpy(info->subname, pcm->name, sizeof(info->subname));
+ }
info->subdevices_count = 1;
return 0;
}
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-08-07 14:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-08-07 9:27 [PATCH] fix dmix crashes Clemens Ladisch
2003-08-07 14:20 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.