Merge pull request #162 from abema/update-for-code-analysis

Update for code analysis

box_info_test.go

@@ -3,7 +3,6 @@ package mp4
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"testing"
 
 	"github.com/orcaman/writerseeker"
@@ -108,7 +107,7 @@ func TestWriteBoxInfo(t *testing.T) {
 			if !c.hasError {
 				require.NoError(t, err)
 				assert.Equal(t, c.expectedBI, bi)
-				b, err := ioutil.ReadAll(w.Reader())
+				b, err := io.ReadAll(w.Reader())
 				require.NoError(t, err)
 				assert.Equal(t, c.expectedBytes, b)
 			} else {

cmd/mp4tool/internal/dump/dump_test.go

@@ -1,7 +1,7 @@
 package dump
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 
@@ -51,7 +51,7 @@ func TestDump(t *testing.T) {
 			os.Stdout = w
 			Main(append(tc.options, tc.file))
 			w.Close()
-			b, err := ioutil.ReadAll(r)
+			b, err := io.ReadAll(r)
 			require.NoError(t, err)
 			assert.Equal(t, tc.wants, string(b))
 		})

cmd/mp4tool/internal/extract/extract_test.go

@@ -1,7 +1,7 @@
 package extract
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 
@@ -46,7 +46,7 @@ func TestExtract(t *testing.T) {
 			os.Stdout = w
 			require.Zero(t, Main([]string{tc.boxType, tc.file}))
 			w.Close()
-			b, err := ioutil.ReadAll(r)
+			b, err := io.ReadAll(r)
 			require.NoError(t, err)
 			assert.Equal(t, tc.expectedSize, len(b))
 			assert.Equal(t, tc.boxType, string(b[4:8]))

cmd/mp4tool/internal/probe/probe_test.go

@@ -1,7 +1,7 @@
 package probe
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 
@@ -44,7 +44,7 @@ func TestProbe(t *testing.T) {
 		os.Stdout = w
 		Main(append(tc.options, tc.file))
 		w.Close()
-		b, err := ioutil.ReadAll(r)
+		b, err := io.ReadAll(r)
 		require.NoError(t, err)
 		assert.Equal(t, tc.wants, string(b))
 	}

cmd/mp4tool/internal/psshdump/psshdump_test.go

@@ -1,7 +1,7 @@
 package psshdump
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 
@@ -54,7 +54,7 @@ func TestPsshdump(t *testing.T) {
 			os.Stdout = w
 			Main(append(tc.options, tc.file))
 			w.Close()
-			b, err := ioutil.ReadAll(r)
+			b, err := io.ReadAll(r)
 			require.NoError(t, err)
 			assert.Equal(t, tc.wants, string(b))
 		})

field.go

@@ -2,6 +2,7 @@ package mp4
 
 import (
 	"fmt"
+	"math"
 	"os"
 	"reflect"
 	"sort"
@@ -179,6 +180,9 @@ func buildField(fieldName string, tag string) *field {
 		if err != nil {
 			panic(err)
 		}
+		if ver > math.MaxUint8 {
+			panic("ver-tag must be <=255")
+		}
 		f.version = uint8(ver)
 	}
 
@@ -188,6 +192,9 @@ func buildField(fieldName string, tag string) *field {
 		if err != nil {
 			panic(err)
 		}
+		if ver > math.MaxUint8 {
+			panic("nver-tag must be <=255")
+		}
 		f.nVersion = uint8(ver)
 	}
 

marshaller.go

@@ -33,11 +33,7 @@ func readerHasSize(reader bitio.ReadSeeker, size uint64) bool {
 	}
 
 	_, err = reader.Seek(pre, io.SeekStart)
-	if err != nil {
-		return false
-	}
-
-	return true
+	return err == nil
 }
 
 type marshaller struct {
@@ -128,8 +124,7 @@ func (m *marshaller) marshalStruct(v reflect.Value, fs []*field) error {
 func (m *marshaller) marshalArray(v reflect.Value, fi *fieldInstance) error {
 	size := v.Type().Size()
 	for i := 0; i < int(size)/int(v.Type().Elem().Size()); i++ {
-		var err error
-		err = m.marshal(v.Index(i), fi)
+		err := m.marshal(v.Index(i), fi)
 		if err != nil {
 			return err
 		}
@@ -414,8 +409,7 @@ func (u *unmarshaller) unmarshalStruct(v reflect.Value, fs []*field) error {
 func (u *unmarshaller) unmarshalArray(v reflect.Value, fi *fieldInstance) error {
 	size := v.Type().Size()
 	for i := 0; i < int(size)/int(v.Type().Elem().Size()); i++ {
-		var err error
-		err = u.unmarshal(v.Index(i), fi)
+		err := u.unmarshal(v.Index(i), fi)
 		if err != nil {
 			return err
 		}

read.go

@@ -192,7 +192,7 @@ func readBoxStructure(r io.ReadSeeker, totalSize uint64, isRoot bool, path BoxPa
 	}
 
 	if totalSize != 0 && !ctx.IsQuickTimeCompatible {
-		return nil, errors.New("Unexpected EOF")
+		return nil, errors.New("unexpected EOF")
 	}
 
 	return vals, nil

write_test.go

@@ -3,7 +3,6 @@ package mp4
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"testing"
 
 	"gopkg.in/src-d/go-billy.v4/memfs"
@@ -110,7 +109,7 @@ func TestWriter(t *testing.T) {
 
 	_, err = output.Seek(0, io.SeekStart)
 	require.NoError(t, err)
-	bin, err := ioutil.ReadAll(output)
+	bin, err := io.ReadAll(output)
 	require.NoError(t, err)
 	assert.Equal(t, []byte{
 		// ftyp