Skip to content

Fix getenv on non-UTF-8 values, strerror_r messages and fgets edge cases #594

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

Closed
lucic71 wants to merge 2 commits into from
Closed

Fix getenv on non-UTF-8 values, strerror_r messages and fgets edge cases #594

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
3c65504
Fix getenv on non-UTF-8 values, strerror_r messages and fgets edge cases
lucic71 Nov 5, 2026
6f9401b
Update tests
lucic71 Nov 5, 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
7 changes: 4 additions & 3 deletions rules/cstdlib/tgt_refcount.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ fn f5(a0: usize, a1: usize) -> AnyPtr {
}

fn f6(a0: Ptr<i8>) -> Ptr<i8> {
match ::std::env::var(a0.to_rust_string()) {
Ok(__val) => Ptr::alloc_c_str(__val.as_bytes()),
Err(_) => Ptr::null(),
use ::std::os::unix::ffi::OsStrExt;
match a0.with_c_bytes(|__name| ::std::env::var_os(::std::ffi::OsStr::from_bytes(__name))) {
Some(__val) => Ptr::alloc_c_str(__val.as_bytes()),
None => Ptr::null(),
}
}

Expand Down
4 changes: 2 additions & 2 deletions rules/cstring/tgt_refcount.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ fn f27(a0: Ptr<i8>, a1: Ptr<i8>) -> i32 {

#[cfg(target_os = "linux")]
fn f28(a0: i32, a1: Ptr<i8>, a2: usize) -> Ptr<i8> {
let __msg = std::io::Error::from_raw_os_error(a0).to_string();
let __msg = nix::errno::Errno::from_raw(a0).desc();
let __len = __msg.len().min(a2.saturating_sub(1));
let mut __p = a1.clone();
for __i in 0..__len {
Expand All @@ -196,7 +196,7 @@ fn f28(a0: i32, a1: Ptr<i8>, a2: usize) -> Ptr<i8> {

#[cfg(target_os = "macos")]
fn f28(a0: i32, a1: Ptr<i8>, a2: usize) -> i32 {
let __msg = std::io::Error::from_raw_os_error(a0).to_string();
let __msg = nix::errno::Errno::from_raw(a0).desc();
let __len = __msg.len().min(a2.saturating_sub(1));
let mut __p = a1.clone();
for __i in 0..__len {
Expand Down
8 changes: 6 additions & 2 deletions rules/stdio/tgt_refcount.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ fn f17(a0: Ptr<i8>, a1: i32, a2: Ptr<CFile>) -> Ptr<i8> {
let mut __dst = a0.clone();
let mut __count: usize = 0;
let __failed = a2.with_mut(|__f| {
let __prev_err = __f.err;
__f.err = false;
while __count < __max {
let __c = __f.getc();
if __c < 0 {
Expand All @@ -111,9 +113,11 @@ fn f17(a0: Ptr<i8>, a1: i32, a2: Ptr<CFile>) -> Ptr<i8> {
break;
}
}
__f.err
let __read_err = __f.err;
__f.err |= __prev_err;
__read_err
});
if __failed || __count == 0 {
if __failed || (__max > 0 && __count == 0) {
Ptr::null()
} else {
__dst.write(0);
Expand Down
209 changes: 193 additions & 16 deletions tests/unit/out/refcount/stdio_nofd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ pub fn test_fgets_getc_2() {
let mut __dst = __tmp_0.clone();
let mut __count: usize = 0;
let __failed = fp.with_mut(|__f| {
let __prev_err = __f.err;
__f.err = false;
while __count < __max {
let __c = __f.getc();
if __c < 0 {
Expand All @@ -185,9 +187,11 @@ pub fn test_fgets_getc_2() {
break;
}
}
__f.err
let __read_err = __f.err;
__f.err |= __prev_err;
__read_err
});
if __failed || __count == 0 {
if __failed || (__max > 0 && __count == 0) {
Ptr::null()
} else {
__dst.write(0);
Expand Down Expand Up @@ -220,6 +224,8 @@ pub fn test_fgets_getc_2() {
let mut __dst = __tmp_1.clone();
let mut __count: usize = 0;
let __failed = fp.with_mut(|__f| {
let __prev_err = __f.err;
__f.err = false;
while __count < __max {
let __c = __f.getc();
if __c < 0 {
Expand All @@ -232,9 +238,11 @@ pub fn test_fgets_getc_2() {
break;
}
}
__f.err
let __read_err = __f.err;
__f.err |= __prev_err;
__read_err
});
if __failed || __count == 0 {
if __failed || (__max > 0 && __count == 0) {
Ptr::null()
} else {
__dst.write(0);
Expand Down Expand Up @@ -263,6 +271,8 @@ pub fn test_fgets_getc_2() {
let mut __dst = __tmp_2.clone();
let mut __count: usize = 0;
let __failed = fp.with_mut(|__f| {
let __prev_err = __f.err;
__f.err = false;
while __count < __max {
let __c = __f.getc();
if __c < 0 {
Expand All @@ -275,9 +285,11 @@ pub fn test_fgets_getc_2() {
break;
}
}
__f.err
let __read_err = __f.err;
__f.err |= __prev_err;
__read_err
});
if __failed || __count == 0 {
if __failed || (__max > 0 && __count == 0) {
Ptr::null()
} else {
__dst.write(0);
Expand Down Expand Up @@ -306,6 +318,8 @@ pub fn test_fgets_getc_2() {
let mut __dst = __tmp_3.clone();
let mut __count: usize = 0;
let __failed = fp.with_mut(|__f| {
let __prev_err = __f.err;
__f.err = false;
while __count < __max {
let __c = __f.getc();
if __c < 0 {
Expand All @@ -318,9 +332,11 @@ pub fn test_fgets_getc_2() {
break;
}
}
__f.err
let __read_err = __f.err;
__f.err |= __prev_err;
__read_err
});
if __failed || __count == 0 {
if __failed || (__max > 0 && __count == 0) {
Ptr::null()
} else {
__dst.write(0);
Expand Down Expand Up @@ -352,7 +368,167 @@ pub fn test_fgets_getc_2() {
!= 0)
);
}
pub fn test_freopen_3() {
pub fn test_fgets_size_one_and_error_flag_3() {
let mut path: Ptr<i8> = Ptr::<i8>::from_string_literal(b"cpp2rust_stdio_nofd_gets_flag.tmp");
let mut fp: Ptr<CFile> = match CFile::open(
&path.to_rust_string(),
&Ptr::<i8>::from_string_literal(b"wb").to_rust_string(),
) {
Some(__f) => Ptr::alloc(__f),
None => Ptr::null(),
};
assert!((((!((fp).is_null())) as i32) != 0));
assert!(
(((match Ptr::<i8>::from_string_literal(b"line1\n")
.with_c_bytes(|__bytes| fp.with_mut(|__f| __f.write(__bytes)) == __bytes.len())
{
true => 0,
false => -1,
} >= 0) as i32)
!= 0)
);
assert!(
((({
let __r = fp.with(|__f| __f.close());
fp.delete();
__r
} == 0) as i32)
!= 0)
);
fp = match CFile::open(
&path.to_rust_string(),
&Ptr::<i8>::from_string_literal(b"rb").to_rust_string(),
) {
Some(__f) => Ptr::alloc(__f),
None => Ptr::null(),
};
assert!((((!((fp).is_null())) as i32) != 0));
let buf: Value<Box<[i8]>> = Rc::new(RefCell::new((0..8).map(|_| 0_i8).collect::<Box<[i8]>>()));
(*buf.borrow_mut())[(0) as usize] = (('x' as i32) as i8);
assert!(
((({
match ({ (buf.as_pointer() as Ptr<i8>) },) {
(mut __tmp_4,) => {
if 1 <= 0 {
Ptr::null()
} else {
let __max = (1 - 1) as usize;
let mut __dst = __tmp_4.clone();
let mut __count: usize = 0;
let __failed = fp.with_mut(|__f| {
let __prev_err = __f.err;
__f.err = false;
while __count < __max {
let __c = __f.getc();
if __c < 0 {
break;
}
__dst.write(__c as i8);
__dst += 1;
__count += 1;
if __c as u8 == b'\n' {
break;
}
}
let __read_err = __f.err;
__f.err |= __prev_err;
__read_err
});
if __failed || (__max > 0 && __count == 0) {
Ptr::null()
} else {
__dst.write(0);
(__tmp_4).clone()
}
}
}
}
} == { (buf.as_pointer() as Ptr::<i8>) }) as i32)
!= 0)
);
assert!(({ (((((*buf.borrow())[(0) as usize] as i32) == ('\0' as i32)) as i32) != 0) }));
assert!(
(((match Ptr::<i8>::from_string_literal(b"x")
.with_c_bytes(|__bytes| fp.with_mut(|__f| __f.write(__bytes)) == __bytes.len())
{
true => 0,
false => -1,
} == (-1_i32)) as i32)
!= 0)
);
assert!((((fp.with(|__f| __f.err) as i32 != 0) as i32) != 0));
assert!(
((({
match ({ (buf.as_pointer() as Ptr<i8>) },) {
(mut __tmp_5,) => {
if 8 <= 0 {
Ptr::null()
} else {
let __max = (8 - 1) as usize;
let mut __dst = __tmp_5.clone();
let mut __count: usize = 0;
let __failed = fp.with_mut(|__f| {
let __prev_err = __f.err;
__f.err = false;
while __count < __max {
let __c = __f.getc();
if __c < 0 {
break;
}
__dst.write(__c as i8);
__dst += 1;
__count += 1;
if __c as u8 == b'\n' {
break;
}
}
let __read_err = __f.err;
__f.err |= __prev_err;
__read_err
});
if __failed || (__max > 0 && __count == 0) {
Ptr::null()
} else {
__dst.write(0);
(__tmp_5).clone()
}
}
}
}
} == { (buf.as_pointer() as Ptr::<i8>) }) as i32)
!= 0)
);
assert!(
(((((buf.as_pointer() as Ptr::<i8>) as Ptr<i8>)
.to_any()
.memcmp(
&Ptr::<i8>::from_string_literal(b"line1\n").to_any(),
7_usize
)
== 0) as i32)
!= 0)
);
assert!((((fp.with(|__f| __f.err) as i32 != 0) as i32) != 0));
assert!(
((({
let __r = fp.with(|__f| __f.close());
fp.delete();
__r
} == 0) as i32)
!= 0)
);
assert!(
(((match nix::unistd::unlink(path.to_rust_string().as_str()) {
Ok(()) => 0,
Err(__e) => {
libcc2rs::cpp2rust_errno().write(__e as i32);
-1
}
} == 0) as i32)
!= 0)
);
}
pub fn test_freopen_4() {
let mut path: Ptr<i8> = Ptr::<i8>::from_string_literal(b"cpp2rust_stdio_nofd_reopen.tmp");
let mut fp: Ptr<CFile> = match CFile::open(
&path.to_rust_string(),
Expand Down Expand Up @@ -429,7 +605,7 @@ pub fn test_freopen_3() {
!= 0)
);
}
pub fn test_fseeko_4() {
pub fn test_fseeko_5() {
let mut path: Ptr<i8> = Ptr::<i8>::from_string_literal(b"cpp2rust_stdio_nofd_seek.tmp");
let mut fp: Ptr<CFile> = match CFile::open(
&path.to_rust_string(),
Expand Down Expand Up @@ -525,7 +701,7 @@ pub fn test_fseeko_4() {
!= 0)
);
}
pub fn test_rename_5() {
pub fn test_rename_6() {
let mut from: Ptr<i8> = Ptr::<i8>::from_string_literal(b"cpp2rust_stdio_nofd_from.tmp");
let mut to: Ptr<i8> = Ptr::<i8>::from_string_literal(b"cpp2rust_stdio_nofd_to.tmp");
let mut fp: Ptr<CFile> = match CFile::open(
Expand Down Expand Up @@ -611,7 +787,7 @@ pub fn test_rename_5() {
!= 0)
);
}
pub fn test_setvbuf_6() {
pub fn test_setvbuf_7() {
let mut path: Ptr<i8> = Ptr::<i8>::from_string_literal(b"cpp2rust_stdio_nofd_vbuf.tmp");
let mut fp: Ptr<CFile> = match CFile::open(
&path.to_rust_string(),
Expand Down Expand Up @@ -658,10 +834,11 @@ fn main_0() -> i32 {
({ test_fputc_fputs_0() });
({ test_puts_1() });
({ test_fgets_getc_2() });
({ test_freopen_3() });
({ test_fseeko_4() });
({ test_rename_5() });
({ test_setvbuf_6() });
({ test_fgets_size_one_and_error_flag_3() });
({ test_freopen_4() });
({ test_fseeko_5() });
({ test_rename_6() });
({ test_setvbuf_7() });
return 0;
}
pub fn __cpp2rust_init_globals() {}
Loading
Loading