From d2206af145611b630d612027486ffd9129bd3e09 Mon Sep 17 00:00:00 2001
From: David Howden <dhowden@gmail.com>
Date: Sat, 17 Feb 2018 13:07:03 +1100
Subject: [PATCH] mp4: fix panic on invalid encoding

---
 mp4.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mp4.go b/mp4.go
index 9071f89..239bcae 100644
--- a/mp4.go
+++ b/mp4.go
@@ -140,6 +140,9 @@ func (m metadataMP4) readAtomData(r io.ReadSeeker, name string, size uint32) err
 	// "data" + size (4 bytes each)
 	b = b[8:]
 
+	if len(b) < 3 {
+		return fmt.Errorf("invalid encoding: expected at least %d bytes, for class, got %d", 3, len(b))
+	}
 	class := getInt(b[1:4])
 	contentType, ok := atomTypes[class]
 	if !ok {
@@ -148,9 +151,16 @@ func (m metadataMP4) readAtomData(r io.ReadSeeker, name string, size uint32) err
 
 	// 4: atom version (1 byte) + atom flags (3 bytes)
 	// 4: NULL (usually locale indicator)
+	if len(b) < 8 {
+		return fmt.Errorf("invalid encoding: expected at least %d bytes, for atom version and flags, got %d", 8, len(b))
+	}
 	b = b[8:]
 
 	if name == "trkn" || name == "disk" {
+		if len(b) < 6 {
+			return fmt.Errorf("invalid encoding: expected at least %d bytes, for track and disk numbers, got %d", 6, len(b))
+		}
+
 		m.data[name] = int(b[3])
 		m.data[name+"_count"] = int(b[5])
 		return nil
@@ -177,6 +187,9 @@ func (m metadataMP4) readAtomData(r io.ReadSeeker, name string, size uint32) err
 		data = string(b)
 
 	case "uint8":
+		if len(b) < 1 {
+			return fmt.Errorf("invalid encoding: expected at least %d bytes, for integer tag data, got %d", 1, len(b))
+		}
 		data = getInt(b[:1])
 
 	case "jpeg", "png":