mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12404 from mudlord/master

Browse Source 
Look into fixing CVE-2021-28927
This commit is contained in:
Autechre 2021-05-16 18:43:34 +02:00 committed by GitHub
commit aebdc8b747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
frontend/drivers/platform_win32.c
View File

@ -1011,13 +1011,13 @@ static bool is_narrator_running_windows(void)
static bool accessibility_speak_windows(int speed, static bool accessibility_speak_windows(int speed,
const char* speak_text, int priority) const char* speak_text, int priority)
{ {
char cmd[1200]; char *cmd = NULL;
const char *voice = get_user_language_iso639_1(true); const char *voice = get_user_language_iso639_1(true);
const char *language = accessibility_win_language_code(voice); const char *language = accessibility_win_language_code(voice);
const char *langid = accessibility_win_language_id(voice); const char *langid = accessibility_win_language_id(voice);
bool res = false; bool res = false;
const char* speeds[10] = {"-10", "-7.5", "-5", "-2.5", "0", "2", "4", "6", "8", "10"}; const char* speeds[10] = {"-10", "-7.5", "-5", "-2.5", "0", "2", "4", "6", "8", "10"};
size_t nbytes_cmd = 0;
if (speed < 1) if (speed < 1)
speed = 1; speed = 1;
else if (speed > 10) else if (speed > 10)
@ -1035,15 +1035,34 @@ static bool accessibility_speak_windows(int speed,
if (USE_POWERSHELL) if (USE_POWERSHELL)
{ {
if (strlen(language) > 0) if (strlen(language) > 0)
snprintf(cmd, sizeof(cmd), {
"powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.SelectVoice(\\\"%s\\\"); $synth.Rate = %s; $synth.Speak(\\\"%s\\\");\"", language, speeds[speed-1], (char*) speak_text); nbytes_cmd = snprintf(NULL, 0,
"powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.SelectVoice(\\\"%s\\\"); $synth.Rate = %s; $synth.Speak(\\\"%s\\\");\"", language, speeds[speed-1], (char*) speak_text) + 1;
cmd = malloc(nbytes_cmd);
if(!cmd)return false;
snprintf(cmd, nbytes_cmd,
"powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.SelectVoice(\\\"%s\\\"); $synth.Rate = %s; $synth.Speak(\\\"%s\\\");\"", language, speeds[speed-1], (char*) speak_text);
}
else else
snprintf(cmd, sizeof(cmd), {
"powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.Rate = %s; $synth.Speak(\\\"%s\\\");\"", speeds[speed-1], (char*) speak_text);
nbytes_cmd = snprintf(NULL, 0,
"powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.Rate = %s; $synth.Speak(\\\"%s\\\");\"", speeds[speed-1], (char*) speak_text) + 1;
cmd = malloc(nbytes_cmd);
if(!cmd)return false;
snprintf(cmd, nbytes_cmd,
"powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.Rate = %s; $synth.Speak(\\\"%s\\\");\"", speeds[speed-1], (char*) speak_text);
}
if (pi_set) if (pi_set)
terminate_win32_process(g_pi); terminate_win32_process(g_pi);
res = create_win32_process(cmd); res = create_win32_process(cmd);
free(cmd);
cmd = NULL;
if (!res) if (!res)
{ {
pi_set = false; pi_set = false;
@ -1096,13 +1115,8 @@ static bool accessibility_speak_windows(int speed,
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
wchar_t *wc = utf8_to_utf16_string_alloc(speak_text); wchar_t *wc = utf8_to_utf16_string_alloc(speak_text);
snprintf(cmd, sizeof(cmd),
"<rate speed=\"%s\"/><volume level=\"80\"/><lang langid=\"%s\"/>%s", speeds[speed], langid, speak_text);
if (!wc) if (!wc)
return false; return false;
hr = ISpVoice_Speak(pVoice, wc, SPF_ASYNC /*SVSFlagsAsync*/, NULL); hr = ISpVoice_Speak(pVoice, wc, SPF_ASYNC /*SVSFlagsAsync*/, NULL);
free(wc); free(wc);
} }