Merge pull request #246 in ZP/z-push from...

Merge pull request #246 in ZP/z-push from bugfix/ZP-936-mapistreamwrapper-looses-data-when to develop

* commit 'b62fd521':
  ZP-936 Only read 4 additional bytes when we need to truncate and are at end of stream.

src/backend/kopano/mapistreamwrapper.php

@@ -100,8 +100,9 @@ class MAPIStreamWrapper {
         $len = ($this->position + $len > $this->streamlength) ? ($this->streamlength - $this->position) : $len;
 
         // read 4 additional bytes from the stream so we can always truncate correctly
-        if ($this->toTruncate)
+        if ($this->toTruncate && $this->position+$len >= $this->streamlength) {
             $len += 4;
+        }
         if ($this->mapistream) {
             $data = mapi_stream_read($this->mapistream, $len);
         }
@@ -165,7 +166,7 @@ class MAPIStreamWrapper {
      * @param int $new_size
      * @return boolean
      */
-    public function stream_truncate ($new_size) {
+    public function stream_truncate($new_size) {
         $this->streamlength = $new_size;
         $this->toTruncate = true;