Skip to content

fixes #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
486c merged 2 commits into from
Jan 22, 2026
Merged

fixes #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcb5c5d
fix: update rosu-mem version
486c Jan 22, 2026
8ac4727
fix: apply string limits where possible
486c Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "2.0.1"
edition = "2021"

[dependencies]
rosu-mem = "2.0.0"
rosu-mem = "3.0.0"
async-tungstenite = "0.29.1"
cfg-if = "1.0.0"
clap = { version = "4.5.32", default-features = false, features = ["std", "derive", "env"] }
Expand Down
26 changes: 12 additions & 14 deletions src/reading_loop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ pub fn process_gameplay(
values.gameplay.hit_100 = p.read_i16(score_base + 0x88)?;
values.gameplay.hit_50 = p.read_i16(score_base + 0x8c)?;

values.gameplay.username = p.read_string(score_base + 0x28)?;
values.gameplay.username = p.read_string_with_limit_from_ptr(score_base + 0x28, 30)?;

// TODO batch
values.gameplay.hit_geki = p.read_i16(score_base + 0x8e)?;
Expand Down Expand Up @@ -193,20 +193,17 @@ pub fn process_reading_loop(p: &Process, state: &mut State) -> Result<()> {
// and filled with zeros, the worst case scenario is
// ar, cs, od, hp going to be zero's
values.beatmap.ar = f32::from_le_bytes(beatmap_stats_buff[0..4].try_into().unwrap());

values.beatmap.cs = f32::from_le_bytes(beatmap_stats_buff[4..8].try_into().unwrap());

values.beatmap.hp = f32::from_le_bytes(beatmap_stats_buff[8..12].try_into().unwrap());

values.beatmap.od = f32::from_le_bytes(beatmap_stats_buff[12..].try_into().unwrap());

let plays_addr = p.read_i32(state.addresses.base - 0x33)? + 0xC;
values.plays = p.read_i32(plays_addr)?;

values.beatmap.artist = p.read_string(beatmap_addr + 0x18)?;
values.beatmap.title = p.read_string(beatmap_addr + 0x24)?;
values.beatmap.creator = p.read_string(beatmap_addr + 0x7C)?;
values.beatmap.difficulty = p.read_string(beatmap_addr + 0xAC)?;
values.beatmap.artist = p.read_string_with_limit_from_ptr(beatmap_addr + 0x18, 100)?;
values.beatmap.title = p.read_string_with_limit_from_ptr(beatmap_addr + 0x24, 150)?;
values.beatmap.creator = p.read_string_with_limit_from_ptr(beatmap_addr + 0x7C, 30)?;
values.beatmap.difficulty = p.read_string_with_limit_from_ptr(beatmap_addr + 0xAC, 30)?;
values.beatmap.map_id = p.read_i32(beatmap_addr + 0xC8)?; // TODO batch
values.beatmap.mapset_id = p.read_i32(beatmap_addr + 0xCC)?; // TODO batch
}
Expand All @@ -222,7 +219,7 @@ pub fn process_reading_loop(p: &Process, state: &mut State) -> Result<()> {
let skin_osu_ptr = p.read_i32(state.addresses.skin + 0x7)?;
let skin_osu_base = p.read_i32(skin_osu_ptr)?;

let skin_name = p.read_string(skin_osu_base + 0x44)?;
let skin_name = p.read_string_with_limit_from_ptr(skin_osu_base + 0x44, 300)?;

values.skin_folder = values.osu_path.join("Skin").join(&skin_name);
values.skin = skin_name;
Expand All @@ -233,17 +230,17 @@ pub fn process_reading_loop(p: &Process, state: &mut State) -> Result<()> {
{
let menu_mode_addr = p.read_i32(state.addresses.base - 0x33)?;

let beatmap_file = p.read_string(beatmap_addr + 0x90)?;
let beatmap_folder = p.read_string(beatmap_addr + 0x78)?;
let audio_file = p.read_string(beatmap_addr + 0x64)?;
let beatmap_file = p.read_string_with_limit_from_ptr(beatmap_addr + 0x90, 300)?;
let beatmap_folder = p.read_string_with_limit_from_ptr(beatmap_addr + 0x78, 300)?;
let audio_file = p.read_string_with_limit_from_ptr(beatmap_addr + 0x64, 150)?;
values.menu_mode = p.read_i32(menu_mode_addr)?;

values.beatmap.paths.beatmap_full_path = values.osu_path.join("Songs/");

values.beatmap.paths.beatmap_full_path.push(&beatmap_folder);
values.beatmap.paths.beatmap_full_path.push(&beatmap_file);

values.beatmap.md5 = p.read_string(beatmap_addr + 0x6C)?;
values.beatmap.md5 = p.read_string_with_limit_from_ptr(beatmap_addr + 0x6C, 50)?;

// Check if beatmap changed
if (beatmap_folder != values.beatmap.paths.beatmap_folder
Expand Down Expand Up @@ -322,7 +319,8 @@ pub fn process_reading_loop(p: &Process, state: &mut State) -> Result<()> {
if values.state == GameState::ResultScreen {
let result_base = p.read_i32(ruleset_addr + 0x38)?;

values.result_screen.username = p.read_string(result_base + 0x28)?;
values.result_screen.username =
p.read_string_with_limit_from_ptr(result_base + 0x28, 30)?;

let mods_xor_base = p.read_i32(result_base + 0x1C)?;

Expand Down