From 1307fd6d3af4648c3f2d9c41be94eb6c83cb45f2 Mon Sep 17 00:00:00 2001
From: amit bezalel <amit.bezalel@hpe.com>
Date: Sat, 22 Jul 2017 00:07:22 +0300
Subject: [PATCH] fixed a mean buffers bug where readerHelper sent the empty
 part of the buffer to listeners.

---
 common/rfb-reader-helper.go | 5 +++--
 logger/logger.go            | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/rfb-reader-helper.go b/common/rfb-reader-helper.go
index 9315291..7fc4a2e 100644
--- a/common/rfb-reader-helper.go
+++ b/common/rfb-reader-helper.go
@@ -115,10 +115,10 @@ func (r *RfbReadHelper) Read(p []byte) (n int, err error) {
 	// prevlen = len(p)
 	/////////
 
-	logger.Debugf("RfbReadHelper.Read: publishing bytes, bytes:%v", p)
+	logger.Debugf("RfbReadHelper.Read: publishing bytes, bytes:%v", p[:readLen])
 
 	//write the bytes to the Listener for further processing
-	seg := &RfbSegment{Bytes: p, SegmentType: SegmentBytes}
+	seg := &RfbSegment{Bytes: p[:readLen], SegmentType: SegmentBytes}
 	err = r.Listeners.Consume(seg)
 	if err != nil {
 		return 0, err
@@ -141,6 +141,7 @@ func (r *RfbReadHelper) ReadBytes(count int) ([]byte, error) {
 	//err := binary.Read(r, binary.BigEndian, &buff)
 
 	if err != nil {
+		logger.Errorf("RfbReadHelper.ReadBytes error while reading bytes: ", err)
 		//if err := binary.Read(d.conn, binary.BigEndian, &buff); err != nil {
 		return nil, err
 	}
diff --git a/logger/logger.go b/logger/logger.go
index 90613d6..5db1d49 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -2,6 +2,8 @@ package logger
 
 import "fmt"
 
+var simpleLogger = SimpleLogger{LogLevelInfo}
+
 type Logger interface {
 	Debug(v ...interface{})
 	Debugf(format string, v ...interface{})
@@ -101,8 +103,6 @@ func (sl *SimpleLogger) Fatalf(format string, v ...interface{}) {
 	}
 }
 
-var simpleLogger = SimpleLogger{LogLevelInfo}
-
 func Debug(v ...interface{}) {
 	simpleLogger.Debug(v...)
 }