* [PATCH lib] Replace unsafe characters with _ in card name
@ 2015-06-27 14:32 Alexander E. Patrakov
2015-06-29 15:41 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Alexander E. Patrakov @ 2015-06-27 14:32 UTC (permalink / raw)
To: alsa-devel; +Cc: tiwai, Alexander E. Patrakov
Otherwise, they get misinterpreted as argument separators
in USB-Audio PCM definitions, and thus prevent SPDIF blacklist entries
from working.
While at it, add my Logitec C910 webcam to the SPDIF blacklist.
Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
---
I did not send this patch earlier because of hesitation whether to send
it as it is or to implement proper escaping, and then forgot about it.
include/conf.h | 1 +
src/conf.c | 32 ++++++++++++++++++++++++++++++++
src/conf/cards/USB-Audio.conf | 3 ++-
src/confmisc.c | 2 +-
4 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/include/conf.h b/include/conf.h
index ff270f6..087c05d 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -126,6 +126,7 @@ int snd_config_imake_integer(snd_config_t **config, const char *key, const long
int snd_config_imake_integer64(snd_config_t **config, const char *key, const long long value);
int snd_config_imake_real(snd_config_t **config, const char *key, const double value);
int snd_config_imake_string(snd_config_t **config, const char *key, const char *ascii);
+int snd_config_imake_safe_string(snd_config_t **config, const char *key, const char *ascii);
int snd_config_imake_pointer(snd_config_t **config, const char *key, const void *ptr);
snd_config_type_t snd_config_get_type(const snd_config_t *config);
diff --git a/src/conf.c b/src/conf.c
index bb256e7..e72a58a 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -2228,6 +2228,38 @@ int snd_config_imake_string(snd_config_t **config, const char *id, const char *v
return 0;
}
+int snd_config_imake_safe_string(snd_config_t **config, const char *id, const char *value)
+{
+ int err;
+ snd_config_t *tmp;
+ char *c;
+
+ err = snd_config_make(&tmp, id, SND_CONFIG_TYPE_STRING);
+ if (err < 0)
+ return err;
+ if (value) {
+ tmp->u.string = strdup(value);
+ for (c = tmp->u.string; *c; c++) {
+ if (*c == ' ' || *c == '-' || *c == '_' ||
+ (*c >= '0' && *c <= '9') ||
+ (*c >= 'a' && *c <= 'z') ||
+ (*c >= 'A' && *c <= 'Z'))
+ continue;
+ *c = '_';
+ }
+
+ if (!tmp->u.string) {
+ snd_config_delete(tmp);
+ return -ENOMEM;
+ }
+ } else {
+ tmp->u.string = NULL;
+ }
+ *config = tmp;
+ return 0;
+}
+
+
/**
* \brief Creates a pointer configuration node with the given initial value.
* \param[out] config The function puts the handle to the new node at
diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
index 031bee0..e365f29 100644
--- a/src/conf/cards/USB-Audio.conf
+++ b/src/conf/cards/USB-Audio.conf
@@ -57,7 +57,8 @@ USB-Audio.pcm.iec958_device {
"Scarlett 2i4 USB" 999
"Sennheiser USB headset" 999
"SWTOR Gaming Headset by Razer" 999
- "USB Device 0x46d:0x992" 999
+ "USB Device 0x46d_0x821" 999
+ "USB Device 0x46d_0x992" 999
}
# Second iec958 device number, if any.
diff --git a/src/confmisc.c b/src/confmisc.c
index 1fb4f28..ae0275f 100644
--- a/src/confmisc.c
+++ b/src/confmisc.c
@@ -935,7 +935,7 @@ int snd_func_card_name(snd_config_t **dst, snd_config_t *root,
}
err = snd_config_get_id(src, &id);
if (err >= 0)
- err = snd_config_imake_string(dst, id,
+ err = snd_config_imake_safe_string(dst, id,
snd_ctl_card_info_get_name(info));
__error:
if (ctl)
--
2.4.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH lib] Replace unsafe characters with _ in card name
2015-06-27 14:32 [PATCH lib] Replace unsafe characters with _ in card name Alexander E. Patrakov
@ 2015-06-29 15:41 ` Takashi Iwai
2015-06-29 17:44 ` Alexander E. Patrakov
0 siblings, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2015-06-29 15:41 UTC (permalink / raw)
To: Alexander E. Patrakov; +Cc: alsa-devel
At Sat, 27 Jun 2015 19:32:49 +0500,
Alexander E. Patrakov wrote:
>
> Otherwise, they get misinterpreted as argument separators
> in USB-Audio PCM definitions, and thus prevent SPDIF blacklist entries
> from working.
>
> While at it, add my Logitec C910 webcam to the SPDIF blacklist.
>
> Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
> ---
> I did not send this patch earlier because of hesitation whether to send
> it as it is or to implement proper escaping, and then forgot about it.
I find the idea is fine. Just small nitpicking:
> include/conf.h | 1 +
> src/conf.c | 32 ++++++++++++++++++++++++++++++++
> src/conf/cards/USB-Audio.conf | 3 ++-
> src/confmisc.c | 2 +-
> 4 files changed, 36 insertions(+), 2 deletions(-)
>
> diff --git a/include/conf.h b/include/conf.h
> index ff270f6..087c05d 100644
> --- a/include/conf.h
> +++ b/include/conf.h
> @@ -126,6 +126,7 @@ int snd_config_imake_integer(snd_config_t **config, const char *key, const long
> int snd_config_imake_integer64(snd_config_t **config, const char *key, const long long value);
> int snd_config_imake_real(snd_config_t **config, const char *key, const double value);
> int snd_config_imake_string(snd_config_t **config, const char *key, const char *ascii);
> +int snd_config_imake_safe_string(snd_config_t **config, const char *key, const char *ascii);
> int snd_config_imake_pointer(snd_config_t **config, const char *key, const void *ptr);
>
> snd_config_type_t snd_config_get_type(const snd_config_t *config);
> diff --git a/src/conf.c b/src/conf.c
> index bb256e7..e72a58a 100644
> --- a/src/conf.c
> +++ b/src/conf.c
> @@ -2228,6 +2228,38 @@ int snd_config_imake_string(snd_config_t **config, const char *id, const char *v
> return 0;
> }
>
> +int snd_config_imake_safe_string(snd_config_t **config, const char *id, const char *value)
> +{
> + int err;
> + snd_config_t *tmp;
> + char *c;
> +
> + err = snd_config_make(&tmp, id, SND_CONFIG_TYPE_STRING);
> + if (err < 0)
> + return err;
> + if (value) {
> + tmp->u.string = strdup(value);
The NULL check is put in a wrong place.
> + for (c = tmp->u.string; *c; c++) {
> + if (*c == ' ' || *c == '-' || *c == '_' ||
> + (*c >= '0' && *c <= '9') ||
> + (*c >= 'a' && *c <= 'z') ||
> + (*c >= 'A' && *c <= 'Z'))
> + continue;
Can the last three be isalnum()?
> + *c = '_';
> + }
> +
> + if (!tmp->u.string) {
> + snd_config_delete(tmp);
> + return -ENOMEM;
> + }
This should be before conversion.
thanks,
Takashi
> + } else {
> + tmp->u.string = NULL;
> + }
> + *config = tmp;
> + return 0;
> +}
> +
> +
> /**
> * \brief Creates a pointer configuration node with the given initial value.
> * \param[out] config The function puts the handle to the new node at
> diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
> index 031bee0..e365f29 100644
> --- a/src/conf/cards/USB-Audio.conf
> +++ b/src/conf/cards/USB-Audio.conf
> @@ -57,7 +57,8 @@ USB-Audio.pcm.iec958_device {
> "Scarlett 2i4 USB" 999
> "Sennheiser USB headset" 999
> "SWTOR Gaming Headset by Razer" 999
> - "USB Device 0x46d:0x992" 999
> + "USB Device 0x46d_0x821" 999
> + "USB Device 0x46d_0x992" 999
> }
>
> # Second iec958 device number, if any.
> diff --git a/src/confmisc.c b/src/confmisc.c
> index 1fb4f28..ae0275f 100644
> --- a/src/confmisc.c
> +++ b/src/confmisc.c
> @@ -935,7 +935,7 @@ int snd_func_card_name(snd_config_t **dst, snd_config_t *root,
> }
> err = snd_config_get_id(src, &id);
> if (err >= 0)
> - err = snd_config_imake_string(dst, id,
> + err = snd_config_imake_safe_string(dst, id,
> snd_ctl_card_info_get_name(info));
> __error:
> if (ctl)
> --
> 2.4.4
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH lib] Replace unsafe characters with _ in card name
2015-06-29 15:41 ` Takashi Iwai
@ 2015-06-29 17:44 ` Alexander E. Patrakov
2015-06-29 18:33 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Alexander E. Patrakov @ 2015-06-29 17:44 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel
29.06.2015 20:41, Takashi Iwai wrote:
> At Sat, 27 Jun 2015 19:32:49 +0500,
> Alexander E. Patrakov wrote:
>>
>> Otherwise, they get misinterpreted as argument separators
>> in USB-Audio PCM definitions, and thus prevent SPDIF blacklist entries
>> from working.
>>
>> While at it, add my Logitec C910 webcam to the SPDIF blacklist.
>>
>> Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
>> ---
>> I did not send this patch earlier because of hesitation whether to send
>> it as it is or to implement proper escaping, and then forgot about it.
>
> I find the idea is fine. Just small nitpicking:
Thanks for the review, I will send a new version soon.
>
>
>> include/conf.h | 1 +
>> src/conf.c | 32 ++++++++++++++++++++++++++++++++
>> src/conf/cards/USB-Audio.conf | 3 ++-
>> src/confmisc.c | 2 +-
>> 4 files changed, 36 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/conf.h b/include/conf.h
>> index ff270f6..087c05d 100644
>> --- a/include/conf.h
>> +++ b/include/conf.h
>> @@ -126,6 +126,7 @@ int snd_config_imake_integer(snd_config_t **config, const char *key, const long
>> int snd_config_imake_integer64(snd_config_t **config, const char *key, const long long value);
>> int snd_config_imake_real(snd_config_t **config, const char *key, const double value);
>> int snd_config_imake_string(snd_config_t **config, const char *key, const char *ascii);
>> +int snd_config_imake_safe_string(snd_config_t **config, const char *key, const char *ascii);
>> int snd_config_imake_pointer(snd_config_t **config, const char *key, const void *ptr);
>>
>> snd_config_type_t snd_config_get_type(const snd_config_t *config);
>> diff --git a/src/conf.c b/src/conf.c
>> index bb256e7..e72a58a 100644
>> --- a/src/conf.c
>> +++ b/src/conf.c
>> @@ -2228,6 +2228,38 @@ int snd_config_imake_string(snd_config_t **config, const char *id, const char *v
>> return 0;
>> }
>>
>> +int snd_config_imake_safe_string(snd_config_t **config, const char *id, const char *value)
>> +{
>> + int err;
>> + snd_config_t *tmp;
>> + char *c;
>> +
>> + err = snd_config_make(&tmp, id, SND_CONFIG_TYPE_STRING);
>> + if (err < 0)
>> + return err;
>> + if (value) {
>> + tmp->u.string = strdup(value);
>
> The NULL check is put in a wrong place.
I don't see what's wrong, could you please elaborate? And if this is
wrong, then snd_config_imake_string() has the same bug.
>
>> + for (c = tmp->u.string; *c; c++) {
>> + if (*c == ' ' || *c == '-' || *c == '_' ||
>> + (*c >= '0' && *c <= '9') ||
>> + (*c >= 'a' && *c <= 'z') ||
>> + (*c >= 'A' && *c <= 'Z'))
>> + continue;
>
> Can the last three be isalnum()?
No. isalnum() is locale-dependent.
>
>> + *c = '_';
>> + }
>> +
>> + if (!tmp->u.string) {
>> + snd_config_delete(tmp);
>> + return -ENOMEM;
>> + }
>
> This should be before conversion.
Oops...
--
Alexander E. Patrakov
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH lib] Replace unsafe characters with _ in card name
2015-06-29 17:44 ` Alexander E. Patrakov
@ 2015-06-29 18:33 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2015-06-29 18:33 UTC (permalink / raw)
To: Alexander E. Patrakov; +Cc: alsa-devel
At Mon, 29 Jun 2015 22:44:47 +0500,
Alexander E. Patrakov wrote:
>
> 29.06.2015 20:41, Takashi Iwai wrote:
> > At Sat, 27 Jun 2015 19:32:49 +0500,
> > Alexander E. Patrakov wrote:
> >>
> >> Otherwise, they get misinterpreted as argument separators
> >> in USB-Audio PCM definitions, and thus prevent SPDIF blacklist entries
> >> from working.
> >>
> >> While at it, add my Logitec C910 webcam to the SPDIF blacklist.
> >>
> >> Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
> >> ---
> >> I did not send this patch earlier because of hesitation whether to send
> >> it as it is or to implement proper escaping, and then forgot about it.
> >
> > I find the idea is fine. Just small nitpicking:
>
> Thanks for the review, I will send a new version soon.
>
> >
> >
> >> include/conf.h | 1 +
> >> src/conf.c | 32 ++++++++++++++++++++++++++++++++
> >> src/conf/cards/USB-Audio.conf | 3 ++-
> >> src/confmisc.c | 2 +-
> >> 4 files changed, 36 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/include/conf.h b/include/conf.h
> >> index ff270f6..087c05d 100644
> >> --- a/include/conf.h
> >> +++ b/include/conf.h
> >> @@ -126,6 +126,7 @@ int snd_config_imake_integer(snd_config_t **config, const char *key, const long
> >> int snd_config_imake_integer64(snd_config_t **config, const char *key, const long long value);
> >> int snd_config_imake_real(snd_config_t **config, const char *key, const double value);
> >> int snd_config_imake_string(snd_config_t **config, const char *key, const char *ascii);
> >> +int snd_config_imake_safe_string(snd_config_t **config, const char *key, const char *ascii);
> >> int snd_config_imake_pointer(snd_config_t **config, const char *key, const void *ptr);
> >>
> >> snd_config_type_t snd_config_get_type(const snd_config_t *config);
> >> diff --git a/src/conf.c b/src/conf.c
> >> index bb256e7..e72a58a 100644
> >> --- a/src/conf.c
> >> +++ b/src/conf.c
> >> @@ -2228,6 +2228,38 @@ int snd_config_imake_string(snd_config_t **config, const char *id, const char *v
> >> return 0;
> >> }
> >>
> >> +int snd_config_imake_safe_string(snd_config_t **config, const char *id, const char *value)
> >> +{
> >> + int err;
> >> + snd_config_t *tmp;
> >> + char *c;
> >> +
> >> + err = snd_config_make(&tmp, id, SND_CONFIG_TYPE_STRING);
> >> + if (err < 0)
> >> + return err;
> >> + if (value) {
> >> + tmp->u.string = strdup(value);
> >
> > The NULL check is put in a wrong place.
>
> I don't see what's wrong, could you please elaborate?
The check of strdup() is done after accessing tmp->u.string.
> And if this is
> wrong, then snd_config_imake_string() has the same bug.
>
> >
> >> + for (c = tmp->u.string; *c; c++) {
> >> + if (*c == ' ' || *c == '-' || *c == '_' ||
> >> + (*c >= '0' && *c <= '9') ||
> >> + (*c >= 'a' && *c <= 'z') ||
> >> + (*c >= 'A' && *c <= 'Z'))
> >> + continue;
> >
> > Can the last three be isalnum()?
>
> No. isalnum() is locale-dependent.
Hm, OK, then we should keep open-coded.
thanks,
Takashi
> >
> >> + *c = '_';
> >> + }
> >> +
> >> + if (!tmp->u.string) {
> >> + snd_config_delete(tmp);
> >> + return -ENOMEM;
> >> + }
> >
> > This should be before conversion.
>
> Oops...
>
> --
> Alexander E. Patrakov
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-29 18:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-27 14:32 [PATCH lib] Replace unsafe characters with _ in card name Alexander E. Patrakov
2015-06-29 15:41 ` Takashi Iwai
2015-06-29 17:44 ` Alexander E. Patrakov
2015-06-29 18:33 ` 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.