Handle RLP to string UTF-8 decoding errors (#2217)

openethereum · Sep 21, 2016 · 8dd0220 · 8dd0220
1 parent df61b1b
commit 8dd0220
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/util/src/rlp/bytes.rs b/util/src/rlp/bytes.rs
@@ -174,6 +174,8 @@ pub enum FromBytesError {
 	DataIsTooLong,
 	/// Integer-representation is non-canonically prefixed with zero byte(s).
 	ZeroPrefixedInt,
+	/// String representation is not utf-8
+	InvalidUtf8,
 }
 
 impl StdError for FromBytesError {
@@ -199,7 +201,7 @@ pub trait FromBytes: Sized {
 
 impl FromBytes for String {
 	fn from_bytes(bytes: &[u8]) -> FromBytesResult<String> {
-		Ok(::std::str::from_utf8(bytes).unwrap().to_owned())
+		::std::str::from_utf8(bytes).map(|s| s.to_owned()).map_err(|_| FromBytesError::InvalidUtf8)
 	}
 }