mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
Merge pull request #387 from wizzard0/p3519-1-stray-keys
Fix #386: Ignore key codes over 0xf000 on insert
This commit is contained in:
commit
27592f71a1
1 changed files with 16 additions and 12 deletions
|
|
@ -938,18 +938,22 @@ fn main() -> ! {
|
||||||
#[cfg(all(feature="debuginject", not(feature="rawserial")))]
|
#[cfg(all(feature="debuginject", not(feature="rawserial")))]
|
||||||
if let Some(conn) = listener_conn {
|
if let Some(conn) = listener_conn {
|
||||||
if key != '\u{0000}' {
|
if key != '\u{0000}' {
|
||||||
log::info!("injecting key '{}'({:x})", key, key as u32); // always be noisy about this, it's an exploit path
|
if key >= '\u{f700}' && key <= '\u{f8ff}' {
|
||||||
xous::try_send_message(conn,
|
log::info!("ignoring key '{}'({:x})", key, key as u32); // ignore Apple PUA characters
|
||||||
xous::Message::new_scalar(listener_op.unwrap(),
|
} else {
|
||||||
key as u32 as usize,
|
log::info!("injecting key '{}'({:x})", key, key as u32); // always be noisy about this, it's an exploit path
|
||||||
'\u{0000}' as u32 as usize,
|
xous::try_send_message(conn,
|
||||||
'\u{0000}' as u32 as usize,
|
xous::Message::new_scalar(listener_op.unwrap(),
|
||||||
'\u{0000}' as u32 as usize,
|
key as u32 as usize,
|
||||||
)
|
'\u{0000}' as u32 as usize,
|
||||||
).unwrap_or_else(|_| {
|
'\u{0000}' as u32 as usize,
|
||||||
log::info!("Input overflow, dropping keys!");
|
'\u{0000}' as u32 as usize,
|
||||||
xous::Result::Ok
|
)
|
||||||
});
|
).unwrap_or_else(|_| {
|
||||||
|
log::info!("Input overflow, dropping keys!");
|
||||||
|
xous::Result::Ok
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue