Use '#[repr(C)]' on 'str' wrappers to guarantee correct layout.

Closes #494.
rwf2 · Dec 14, 2017 · 6460be6 · 6460be6
1 parent 94c7a19
commit 6460be6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/src/http/raw_str.rs b/lib/src/http/raw_str.rs
@@ -46,6 +46,7 @@ use http::uncased::UncasedStr;
 ///
 /// [`FromParam`]: /rocket/request/trait.FromParam.html
 /// [`FromFormValue`]: /rocket/request/trait.FromFormValue.html
+#[repr(C)]
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct RawStr(str);
 
@@ -276,7 +277,7 @@ impl RawStr {
 impl<'a> From<&'a str> for &'a RawStr {
     #[inline(always)]
     fn from(string: &'a str) -> &'a RawStr {
-        unsafe { ::std::mem::transmute(string) }
+        unsafe { &*(string as *const str as *const RawStr) }
     }
 }
 

diff --git a/lib/src/http/uncased.rs b/lib/src/http/uncased.rs
@@ -18,6 +18,7 @@ use std::fmt;
 ///
 /// let ascii_ref: &UncasedStr = "Hello, world!".into();
 /// ```
+#[repr(C)]
 #[derive(Debug)]
 pub struct UncasedStr(str);