3 files changed, 15 insertions, 6 deletions
diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs
index 49fc47e8a68..74ddce1609a 100644
--- a/components/script/dom/blob.rs
+++ b/components/script/dom/blob.rs
@@ -66,6 +66,10 @@ impl DataSlice {
         &self.bytes[self.bytes_start..self.bytes_end]
     }
 
+    pub fn get_all_bytes(&self) -> Arc<Vec<u8>> {
+        self.bytes.clone()
+    }
+
     pub fn size(&self) -> u64 {
         (self.bytes_end as u64) - (self.bytes_start as u64)
     }
diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs
index 8628c0ee6f6..598537cbe00 100644
--- a/components/script/dom/file.rs
+++ b/components/script/dom/file.rs
@@ -18,14 +18,15 @@ pub struct File {
 }
 
 impl File {
-    fn new_inherited(_file_bits: &Blob, name: DOMString) -> File {
+    fn new_inherited(file_bits: &Blob, name: DOMString) -> File {
+      // TODO: FilePropertyBag
+       let mut bytes = Vec::new();
+       bytes.extend_from_slice(file_bits.get_data().get_all_bytes().as_slice());
+
         File {
-            //TODO: get type from the underlying filesystem instead of "".to_string()
-            blob: Blob::new_inherited(Arc::new(Vec::new()), None, None, ""),
+            blob: Blob::new_inherited(Arc::new(bytes), None, None, ""),
             name: name,
         }
-        // XXXManishearth Once Blob is able to store data
-        // the relevant subfields of file_bits should be copied over
     }
 
     pub fn new(global: GlobalRef, file_bits: &Blob, name: DOMString) -> Root<File> {
diff --git a/components/script/dom/filelist.rs b/components/script/dom/filelist.rs
index e60258fa330..ef49e88da6d 100644
--- a/components/script/dom/filelist.rs
+++ b/components/script/dom/filelist.rs
@@ -40,7 +40,11 @@ impl FileListMethods for FileList {
 
     // https://w3c.github.io/FileAPI/#dfn-item
     fn Item(&self, index: u32) -> Option<Root<File>> {
-        Some(Root::from_ref(&*(self.list[index as usize])))
+        if (index as usize) < self.list.len() {
+            Some(Root::from_ref(&*(self.list[index as usize])))
+        } else {
+            None
+        }
     }
 
     // check-tidy: no specs after this line