Skip to content

🔒 [security fix] Fix unwrap() panics when converting C strings#354

Merged
filmil merged 2 commits into
mainfrom
fix-unwrap-panics-17310211343422451087
Apr 29, 2026
Merged

🔒 [security fix] Fix unwrap() panics when converting C strings#354
filmil merged 2 commits into
mainfrom
fix-unwrap-panics-17310211343422451087

Conversation

@filmil
Copy link
Copy Markdown
Member

@filmil filmil commented Apr 29, 2026

🎯 What: The vulnerability fixed is the use of unwrap() when converting C strings to Rust strings in rust_icu_uloc.

⚠️ Risk: If the underlying ICU library returns a string that is not valid UTF-8, the current code would panic and crash the application.

🛡️ Solution:

  • In ULoc::get_available, unwrap() is replaced with the ? operator to propagate any UTF-8 conversion errors.
  • In ULoc::iso3_language and ULoc::iso3_country, to_str().unwrap() is replaced with to_string_lossy() to avoid panics while maintaining the existing API signature.

These changes ensure the library is more robust against unexpected input from the underlying C library.


PR created automatically by Jules for task 17310211343422451087 started by @filmil

This commit replaces dangerous `unwrap()` calls with safer alternatives
when converting C strings to Rust strings. This prevents potential
panics if the ICU library returns non-UTF-8 data.

- `ULoc::get_available`: Propagates `Utf8Error` via `?`.
- `ULoc::iso3_language` & `ULoc::iso3_country`: Uses `to_string_lossy()`
  to avoid panics while maintaining the return type.

Co-authored-by: filmil <246576+filmil@users.noreply.github.com>
@google-labs-jules
Copy link
Copy Markdown
Contributor

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.


For security, I will only act on instructions from the user who triggered this task.

@clydegerber
Copy link
Copy Markdown
Contributor

test cases?

Comment thread rust_icu_uloc/src/lib.rs Outdated
Comment thread rust_icu_uloc/src/lib.rs Outdated
ffi::CStr::from_ptr(
versioned_function!(uloc_getISO3Language)(self.as_c_str().as_ptr())
).to_str()
let value = unsafe {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests, for this and below.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a test case for ULoc::get_available. I've reverted the changes to iso3_language and iso3_country based on the other feedback, so I haven't added tests for those.

This commit replaces a dangerous `unwrap()` call in `ULoc::get_available`
with the `?` operator. This prevents potential panics if the ICU library
returns non-UTF-8 data.

A test case for `ULoc::get_available` was added to verify the fix.

Proactive changes to `iso3_language` and `iso3_country` were reverted per
Pull Request feedback.

Co-authored-by: filmil <246576+filmil@users.noreply.github.com>
@filmil filmil merged commit 5e6c023 into main Apr 29, 2026
14 checks passed
@filmil filmil deleted the fix-unwrap-panics-17310211343422451087 branch May 2, 2026 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants