Skip to contentSkip to conversation

staging/speakup: fix get_word non-space look-ahead

PATCH New Samuel Thibault 1 participant 1 message Mar 6, 2020 Staging

lore
Share & tools
lore

Samuel Thibault

author
#0 lore raw

PATCH 1/1 staging/speakup: fix get_word non-space look-ahead

get_char was erroneously given the address of the pointer to the text instead of the address of the text, thus leading to random crashes when the user requests speaking a word while the current position is on a space character and say_word_ctl is not enabled.

Cc: [email protected]
Reported-on: https://github.com/bytefire/speakup/issues/1

Reported-by Kirk Reiser <[email protected]>
Reported-by Janina Sajka <[email protected]>
Reported-by Alexandr Epaneshnikov <[email protected]>
Reported-by Gregory Nowak <[email protected]>
Reported-by deedra waters <[email protected]>
Signed-off-by Samuel Thibault <[email protected]>
Tested-by Alexandr Epaneshnikov <[email protected]>
Tested-by Gregory Nowak <[email protected]>
Tested-by Michael Taboada <[email protected]>
---
 drivers/staging/speakup/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/speakup/main.c +1 -1
index 488f2539aa9a..81ecfd1a200d 100644
@@ -561,7 +561,7 @@ static u_long get_word(struct vc_data *vc)
 		return 0;
 	} else if (tmpx < vc->vc_cols - 2 &&
 		   (ch == SPACE || ch == 0 || (ch < 0x100 && IS_WDLM(ch))) &&
-		   get_char(vc, (u_short *)&tmp_pos + 1, &temp) > SPACE) {
+		   get_char(vc, (u_short *)tmp_pos + 1, &temp) > SPACE) {
 		tmp_pos += 2;
 		tmpx++;
 	} else {
Signature · 1 line
2.20.1