nacl: fix build

TBR=r
CC=golang-dev
https://golang.org/cl/1706044

diff --git a/src/pkg/exp/nacl/av/av.go b/src/pkg/exp/nacl/av/av.go
index 0ed27576042951f20c7b14b86769d153d1cae721..5c8728292d6d9a95e778813fac789a75e7ddc052 100644 (file)
--- a/src/pkg/exp/nacl/av/av.go
+++ b/src/pkg/exp/nacl/av/av.go
@@ -157,7 +157,7 @@ func videoPollEvent(ev []byte) (err os.Error) {
                if r == bridge.share.eq.wi {
                        return noEvents
                }
-               copy(ev, &bridge.share.eq.event[r])
+               copy(ev, bridge.share.eq.event[r][0:])
                bridge.share.eq.ri = (r + 1) % eqsize
                return nil
        }

diff --git a/src/pkg/exp/nacl/srpc/msg.go b/src/pkg/exp/nacl/srpc/msg.go
index b08327ca645dcd1e0770cef28b7ade2e0a8246df..fe36dbdeb5b939d0e9158baad12d13b9c2c5da6a 100644 (file)
--- a/src/pkg/exp/nacl/srpc/msg.go
+++ b/src/pkg/exp/nacl/srpc/msg.go
@@ -120,7 +120,7 @@ func (r *msgReceiver) recv() (*msg, os.Error) {
        // returned the total byte count as n.
        m := new(msg)
        m.rdata = make([]byte, n)
-       copy(m.rdata, &r.data)
+       copy(m.rdata, r.data[0:])
 
        // Make a copy of the desc too.
        // The system call *did* update r.hdr.ndesc.