Re: [PATCH] staging: speakup: i18n: fix spelling mistake "phoneticly" -> "phonetically"

[Christopher Brannon]

Samuel Thibault writes:
> Hello,
>
> Colin King, le mer. 28 nov. 2018 16:12:32 +, a ecrit:
> > From: Colin Ian King 
> > 
> > There is a spelling mistake in array speakup_default_msgs at index
> > MSG_FUNCNAME_SPELL_WORD_PHONETICALLY, fix this.
> > 
> > Signed-off-by: Colin Ian King 
>
> We never got any feedback from the speakup mailing list, I guess fixing
> the typo is fine.

I'm sure there were deliberate mis-spellings in Speakup error
messages to accomodate pronunciation issues with older synths, but I
have no idea whether this is one of them.  It's probably fine either way.

-- Chris
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] staging: speakup: kobjects.c: Use correct values when changing voice.

[Christopher Brannon]

When a new voice is selected, we set volume and pitch appropriate for
the voice.  We need to use the numeric index corresponding to the
voice when indexing into the volume and pitch tables, rather than
the raw user input that was used to select the voice.
Note that using the raw input can also lead to an invalid memory read
in the case of invalid or malicious user input.

Signed-off-by: Christopher Brannon 
---
 drivers/staging/speakup/kobjects.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/speakup/kobjects.c 
b/drivers/staging/speakup/kobjects.c
index 51bdea3..55aeeb2 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -652,7 +652,10 @@ ssize_t spk_var_store(struct kobject *kobj, struct 
kobj_attribute *attr,
 * If voice was just changed, we might need to reset our default
 * pitch and volume.
 */
-   if (strcmp(attr->attr.name, "voice") == 0) {
+   if (strcmp(attr->attr.name, "voice") == 0 &&
+   (ret == 0 || ret == -ERESTART)) {
+   var_data = param->data;
+   value = var_data->u.n.value;
if (synth && synth->default_pitch) {
param = spk_var_header_by_name("pitch");
if (param)  {
-- 
1.8.1.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] staging: speakup: kobjects.c: Use correct values when changing voice.

[Christopher Brannon]

When a new voice is selected, we set volume and pitch appropriate for
the voice.  We need to use the numeric index corresponding to the
voice when indexing into the volume and pitch tables, rather than
the raw user input that was used to select the voice.
Note that using the raw input can also lead to an invalid memory read
in the case of invalid or malicious user input.

Signed-off-by: Christopher Brannon 
---
 drivers/staging/speakup/kobjects.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/speakup/kobjects.c 
b/drivers/staging/speakup/kobjects.c
index 61a3f7a..f31afa2 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -651,7 +651,10 @@ ssize_t spk_var_store(struct kobject *kobj, struct 
kobj_attribute *attr,
* If voice was just changed, we might need to reset our default
* pitch and volume.
*/
-   if (param->var_id == VOICE) {
+   if (param->var_id == VOICE && synth &&
+   (ret == 0 || ret == -ERESTART)) {
+   var_data = param->data;
+   value = var_data->u.n.value;
spk_reset_default_value("pitch", synth->default_pitch,
value);
spk_reset_default_value("vol", synth->default_vol,
-- 
1.8.1.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel