Merge branch 'master' of https://github.com/thomasrudin-mt/mapserver

server/colormapping/colormapping.go

@@ -4,11 +4,12 @@ import (
 	"bufio"
 	"bytes"
 	"errors"
-	"github.com/sirupsen/logrus"
 	"image/color"
 	"mapserver/vfs"
 	"strconv"
 	"strings"
+
+	"github.com/sirupsen/logrus"
 )
 
 type ColorMapping struct {
@@ -65,10 +66,10 @@ func (m *ColorMapping) LoadBytes(buffer []byte) (int, error) {
 
 			if len(parts) >= 5 {
 				//with alpha
-				a, err = strconv.ParseInt(parts[4], 10, 32)
+				//a, err = strconv.ParseInt(parts[4], 10, 32)
-				if err != nil {
+				//if err != nil {
-					return 0, err
+				//	return 0, err
-				}
+				//}
 			}
 
 			c := color.RGBA{uint8(r), uint8(g), uint8(b), uint8(a)}

server/colormapping/colormapping_test.go

@@ -21,8 +21,8 @@ func TestNewMapping(t *testing.T) {
 		panic("no color")
 	}
 
-	if c.A != 128 {
+	//if c.A != 128 {
-		panic("wrong alpha")
+	//	panic("wrong alpha")
-	}
+	//}
 
 }

server/mapblockaccessor/legacyblocks.go

@@ -48,6 +48,14 @@ func (a *MapBlockAccessor) FindNextLegacyBlocks(s settings.Settings, layers []*l
 
 		mapblock, err := mapblockparser.Parse(block.Data, block.Mtime, block.Pos)
 		if err != nil {
+			fields := logrus.Fields{
+				"x":   block.Pos.X,
+				"y":   block.Pos.Y,
+				"z":   block.Pos.Z,
+				"err": err,
+			}
+			logrus.WithFields(fields).Error("mapblock-pars")
+
 			return nil, err
 		}
 

server/mapblockparser/metadata.go

@@ -5,10 +5,11 @@ import (
 	"bytes"
 	"compress/zlib"
 	"errors"
-	"github.com/sirupsen/logrus"
 	"io"
 	"strconv"
 	"strings"
+
+	"github.com/sirupsen/logrus"
 )
 
 /*
@@ -95,6 +96,11 @@ func parseMetadata(mapblock *MapBlock, data []byte) (int, error) {
 			valueLength := readU32(metadata, offset)
 			offset += 4
 
+			if len(metadata) <= valueLength+offset {
+				return 0, errors.New("metadata too short: " + strconv.Itoa(len(metadata)) +
+					", valuelength: " + strconv.Itoa(int(valueLength)))
+			}
+
 			value := string(metadata[offset : valueLength+offset])
 			offset += valueLength