From 4711cd662052cca90469cfe5c1f8469592133b25 Mon Sep 17 00:00:00 2001
From: Emiel Beinema <emiel.beinema@gmail.com>
Date: Wed, 27 Sep 2017 00:49:51 +0200
Subject: [PATCH] Check header of file before loading it in memory

---
 src/png.rs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/png.rs b/src/png.rs
index 455d3d44..276c5183 100644
--- a/src/png.rs
+++ b/src/png.rs
@@ -11,7 +11,7 @@ use itertools::Itertools;
 use reduction::*;
 use std::collections::{HashMap, HashSet};
 use std::fs::File;
-use std::io::Read;
+use std::io::{Read, Seek, SeekFrom};
 use std::iter::Iterator;
 use std::path::Path;
 
@@ -195,8 +195,19 @@ impl PngData {
             Ok(f) => f,
             Err(_) => return Err(PngError::new("Failed to open file for reading")),
         };
-        let mut byte_data: Vec<u8> = Vec::new();
+        // Check file for PNG header
+        let mut header =  [0; 8];
+        if file.read_exact(&mut header).is_err() {
+            return Err(PngError::new("Not a PNG file: too small"));
+        }
+        if !file_header_is_valid(&header) {
+            return Err(PngError::new("Invalid PNG header detected"));
+        }
+        if file.seek(SeekFrom::Start(0)).is_err() {
+            return Err(PngError::new("Failed to read from file"));
+        }
         // Read raw png data into memory
+        let mut byte_data: Vec<u8> = Vec::new();
         match file.read_to_end(&mut byte_data) {
             Ok(_) => (),
             Err(_) => return Err(PngError::new("Failed to read from file")),