From 4745d8127328f87c05dc80381e91dd76fd79c918 Mon Sep 17 00:00:00 2001
From: shamb0 <r.raajey@gmail.com>
Date: Thu, 5 Dec 2024 17:44:36 +0530
Subject: [PATCH] Improve timezone handling in 'localtime_r()' using
 'allocate_bytes()'

Signed-off-by: shamb0 <r.raajey@gmail.com>
---
 src/shims/time.rs                |  6 +++---
 tests/pass-dep/libc/libc-time.rs | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/shims/time.rs b/src/shims/time.rs
index f001ac2cba..1eb4d113fa 100644
--- a/src/shims/time.rs
+++ b/src/shims/time.rs
@@ -198,7 +198,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 write!(tm_zone, "{:02}", offset_min).unwrap();
             }
 
-            // Add null terminator for C string compatibility
+            // Add null terminator for C string compatibility.
             tm_zone.push('\0');
 
             // Deduplicate and allocate the string.
@@ -208,9 +208,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 MiriMemoryKind::Machine.into(),
                 Mutability::Not,
             )?;
-            
+
             // Write the timezone pointer and offset into the result structure.
-            this.write_pointer(*tm_zone_ptr, &this.project_field_named(&result, "tm_zone")?)?;
+            this.write_pointer(tm_zone_ptr, &this.project_field_named(&result, "tm_zone")?)?;
             this.write_int_fields_named(&[("tm_gmtoff", tm_gmtoff.into())], &result)?;
         }
         interp_ok(result.ptr())
diff --git a/tests/pass-dep/libc/libc-time.rs b/tests/pass-dep/libc/libc-time.rs
index 032f2124c7..3182b6d3e9 100644
--- a/tests/pass-dep/libc/libc-time.rs
+++ b/tests/pass-dep/libc/libc-time.rs
@@ -8,7 +8,7 @@ fn main() {
     test_localtime_r_gmt();
     test_localtime_r_pst();
     test_localtime_r_epoch();
-    // Architecture-specific tests
+    // Architecture-specific tests.
     #[cfg(target_pointer_width = "32")]
     test_localtime_r_future_32b();
     #[cfg(target_pointer_width = "64")]
@@ -53,7 +53,7 @@ fn test_posix_gettimeofday() {
     assert_eq!(is_error, -1);
 }
 
-// Helper function to create an empty tm struct
+// Helper function to create an empty tm struct.
 fn create_empty_tm() -> libc::tm {
     libc::tm {
         tm_sec: 0,
@@ -121,7 +121,7 @@ fn test_localtime_r_gmt() {
     env::remove_var(key);
 }
 
-// PST timezone test (testing different timezone handling)
+// PST timezone test (testing different timezone handling).
 fn test_localtime_r_pst() {
     let key = "TZ";
     env::set_var(key, "PST8PDT");
@@ -158,7 +158,7 @@ fn test_localtime_r_pst() {
     env::remove_var(key);
 }
 
-// Unix epoch test (edge case testing)
+// Unix epoch test (edge case testing).
 fn test_localtime_r_epoch() {
     let key = "TZ";
     env::set_var(key, "GMT");
@@ -195,7 +195,7 @@ fn test_localtime_r_epoch() {
     env::remove_var(key);
 }
 
-// Future date test (testing large values)
+// Future date test (testing large values).
 #[cfg(target_pointer_width = "64")]
 fn test_localtime_r_future_64b() {
     let key = "TZ";