From d185761d31f4845e9bf39dbbe0c61d199689deb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 30 Mar 2015 17:13:42 +0200 Subject: [PATCH] initializing some variables + update size after writing the headers --- lib/private/files/stream/encryption.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php index 3e8c3a912d..df74eeff89 100644 --- a/lib/private/files/stream/encryption.php +++ b/lib/private/files/stream/encryption.php @@ -271,8 +271,7 @@ class Encryption extends Wrapper { public function stream_write($data) { if ($this->position === 0) { - $this->writeHeader(); - $this->size+=$this->util->getBlockSize(); + $this->size+=$this->writeHeader(); } $length = 0; @@ -411,11 +410,12 @@ class Encryption extends Wrapper { /** * write header at beginning of encrypted file * + * @return integer * @throws EncryptionHeaderKeyExistsException if header key is already in use */ private function writeHeader() { $header = $this->util->createHeader($this->newHeader, $this->encryptionModule); - parent::stream_write($header); + return parent::stream_write($header); } }