Browse Source

vendor: Update calmh/xdr to avoid unexpected string behavior (fixes #2882)

Jakob Borg 9 years ago
parent
commit
8044522691
2 changed files with 3 additions and 11 deletions
  1. 2 10
      vendor/github.com/calmh/xdr/unmarshal.go
  2. 1 1
      vendor/manifest

+ 2 - 10
vendor/github.com/calmh/xdr/unmarshal.go

@@ -4,11 +4,7 @@
 
 package xdr
 
-import (
-	"io"
-	"reflect"
-	"unsafe"
-)
+import "io"
 
 type Unmarshaller struct {
 	Error error
@@ -40,11 +36,7 @@ func (u *Unmarshaller) UnmarshalStringMax(max int) string {
 		return ""
 	}
 
-	var v string
-	p := (*reflect.StringHeader)(unsafe.Pointer(&v))
-	p.Data = uintptr(unsafe.Pointer(&buf[0]))
-	p.Len = len(buf)
-	return v
+	return string(buf)
 }
 
 func (u *Unmarshaller) UnmarshalBytes() []byte {

+ 1 - 1
vendor/manifest

@@ -22,7 +22,7 @@
 		{
 			"importpath": "github.com/calmh/xdr",
 			"repository": "https://github.com/calmh/xdr",
-			"revision": "b6e0c321c9b5b28ba5ee21e828323e4b982c6976",
+			"revision": "f9b9f8f7aa27725f5cabb699bd9099ca7ce09143",
 			"branch": "master"
 		},
 		{