From ace3416cf25d4214e1ebdac55459abd8edee4999 Mon Sep 17 00:00:00 2001
From: Christian Poveda <christianpoveda@protonmail.com>
Date: Mon, 26 Aug 2019 15:18:11 -0500
Subject: [PATCH 1/2] Write name and value for each env var

---
 src/shims/env.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/shims/env.rs b/src/shims/env.rs
index eb5722a5a3d8..988ee61a0e35 100644
--- a/src/shims/env.rs
+++ b/src/shims/env.rs
@@ -16,17 +16,19 @@ impl EnvVars {
     ) {
         if ecx.machine.communicate {
             for (name, value) in std::env::vars() {
-                let value = alloc_env_value(value.as_bytes(), ecx.memory_mut());
-                ecx.machine.env_vars.map.insert(name.into_bytes(), value);
+                let var_ptr = alloc_env_var(name.as_bytes(), value.as_bytes(), ecx.memory_mut());
+                ecx.machine.env_vars.map.insert(name.into_bytes(), var_ptr);
             }
         }
     }
 }
 
-fn alloc_env_value<'mir, 'tcx>(
-    bytes: &[u8],
+fn alloc_env_var<'mir, 'tcx>(
+    name: &[u8],
+    value: &[u8],
     memory: &mut Memory<'mir, 'tcx, Evaluator<'tcx>>,
 ) -> Pointer<Tag> {
+    let bytes = [name, b"=", value].concat();
     let tcx = {memory.tcx.tcx};
     let length = bytes.len() as u64;
     // `+1` for the null terminator.
@@ -57,7 +59,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         let name_ptr = this.read_scalar(name_op)?.not_undef()?;
         let name = this.memory().read_c_str(name_ptr)?;
         Ok(match this.machine.env_vars.map.get(name) {
-            Some(&var) => Scalar::Ptr(var),
+            Some(var_ptr) => Scalar::Ptr(var_ptr.offset(Size::from_bytes(name.len() as u64 + 1), this)?),
             None => Scalar::ptr_null(&*this.tcx),
         })
     }
@@ -80,8 +82,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             }
         }
         if let Some((name, value)) = new {
-            let value_copy = alloc_env_value(&value, this.memory_mut());
-            if let Some(var) = this.machine.env_vars.map.insert(name.to_owned(), value_copy) {
+            let var_ptr = alloc_env_var(&name, &value, this.memory_mut());
+            if let Some(var) = this.machine.env_vars.map.insert(name.to_owned(), var_ptr) {
                 this.memory_mut().deallocate(var, None, MiriMemoryKind::Env.into())?;
             }
             Ok(0)

From 7d93cc7b5efeeec001aa8071b1bc61b8cc111c95 Mon Sep 17 00:00:00 2001
From: Christian Poveda <christianpoveda@protonmail.com>
Date: Tue, 27 Aug 2019 08:45:37 -0500
Subject: [PATCH 2/2] Add docs

---
 src/shims/env.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/shims/env.rs b/src/shims/env.rs
index 988ee61a0e35..8f946a2b5eb1 100644
--- a/src/shims/env.rs
+++ b/src/shims/env.rs
@@ -7,6 +7,8 @@ use crate::*;
 
 #[derive(Default)]
 pub struct EnvVars {
+    /// Stores pointers to the environment variables. These variables must be stored as
+    /// null-terminated C strings with the `"{name}={value}"` format.
     map: HashMap<Vec<u8>, Pointer<Tag>>,
 }
 
@@ -59,6 +61,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         let name_ptr = this.read_scalar(name_op)?.not_undef()?;
         let name = this.memory().read_c_str(name_ptr)?;
         Ok(match this.machine.env_vars.map.get(name) {
+            // The offset is used to strip the "{name}=" part of the string.
             Some(var_ptr) => Scalar::Ptr(var_ptr.offset(Size::from_bytes(name.len() as u64 + 1), this)?),
             None => Scalar::ptr_null(&*this.tcx),
         })