From 38058fb6d3cf7ee2adfd8dfafe22314df827d779 Mon Sep 17 00:00:00 2001
From: Francesco Mazzoli <f@mazzo.li>
Date: Sat, 3 Jan 2015 04:54:31 +0100
Subject: [PATCH] Perform sanity check when reading enum variant.

---
 src/reader.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/reader.rs b/src/reader.rs
index 6c04648..2cc0cb1 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -74,10 +74,18 @@ impl<'a, R: Reader+Buffer> Decoder<IoError> for DecoderReader<'a, R> {
         F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
             f(self)
         }
-    fn read_enum_variant<T, F>(&mut self, _: &[&str], mut f: F) -> IoResult<T> where
+    fn read_enum_variant<T, F>(&mut self, names: &[&str], mut f: F) -> IoResult<T> where
         F: FnMut(&mut DecoderReader<'a, R>, uint) -> IoResult<T> {
             let id = try!(self.read_uint());
-            f(self, id)
+            if id >= names.len() {
+                Err(IoError {
+                    kind: OtherIoError,
+                    desc: "out of bounds tag when reading enum variant",
+                    detail: Some(format!("Expected tag < {}, got {}", names.len(), id))
+                })
+            } else {
+                f(self, id)
+            }
         }
     fn read_enum_variant_arg<T, F>(&mut self, _: uint, f: F) -> IoResult<T> where
         F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {