Merge branch 'develop' of github.com:gogits/gogs into develop

release/v1.15
Unknwon 2015-03-25 17:50:26 -04:00
commit f2b851388b
1 changed files with 5 additions and 0 deletions

View File

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"io" "io"
"reflect" "reflect"
"errors"
) )
type Packet struct { type Packet struct {
@ -177,6 +178,10 @@ func readBytes(reader io.Reader, buf []byte) error {
idx := 0 idx := 0
buflen := len(buf) buflen := len(buf)
if reader == nil {
return errors.New("reader was nil, aborting")
}
for idx < buflen { for idx < buflen {
n, err := reader.Read(buf[idx:]) n, err := reader.Read(buf[idx:])
if err != nil { if err != nil {