---

yaml
---
r: 127030
b: refs/heads/snap-stage3
c: dac9a1c
h: refs/heads/master
v: v3

Author: apoelstra

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 7be8f0af0393dcdb077c2f6b1653836fd3fba235
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 5bd8edc1121a5736994d69b2dc9cf3efb6fbc116
+refs/heads/snap-stage3: dac9a1c5207cb33a0b40813896b74d00bbbd1d36
 refs/heads/try: 502e4c045236682e9728539dc0d2b3d0b237f55c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libuuid/lib.rs

@@ -501,7 +501,10 @@ impl<T: Encoder<E>, E> Encodable<T, E> for Uuid {
 impl<T: Decoder<E>, E> Decodable<T, E> for Uuid {
     /// Decode a UUID from a string
     fn decode(d: &mut T) -> Result<Uuid, E> {
-        Ok(from_str(try!(d.read_str()).as_slice()).unwrap())
+        match from_str(try!(d.read_str()).as_slice()) {
+            Some(decode) => Ok(decode),
+            None => Err(d.error("Unable to decode UUID"))
+        }
     }
 }
 
@@ -802,6 +805,23 @@ mod test {
         assert_eq!(u, u2);
     }
 
+    #[test]
+    fn test_bad_decode() {
+        use serialize::json;
+        use serialize::{Encodable, Decodable};
+
+        let js_good = json::String("a1a2a3a4a5a6a7a8a1a2a3a4a5a6a7a8".to_string());
+        let js_bad1 = json::String("a1a2a3a4a5a6a7a8a1a2a3a4a5a6a7ah".to_string());
+        let js_bad2 = json::String("a1a2a3a4a5a6a7a8a1a2a3a4a5a6a7a".to_string());
+
+        let u_good: Result<Uuid, _> = Decodable::decode(&mut json::Decoder::new(js_good));
+        let u_bad1: Result<Uuid, _> = Decodable::decode(&mut json::Decoder::new(js_bad1));
+        let u_bad2: Result<Uuid, _> = Decodable::decode(&mut json::Decoder::new(js_bad2));
+        assert!(u_good.is_ok());
+        assert!(u_bad1.is_err());
+        assert!(u_bad2.is_err());
+    }
+
     #[test]
     fn test_iterbytes_impl_for_uuid() {
         use std::collections::HashSet;