Correct compound condition logic for detecting decryption stream end

jeskew · jeskew · commit 3635fa13a7d8 · 2020-02-29T16:40:31.000-05:00
diff --git a/src/AesDecryptingStream.php b/src/AesDecryptingStream.php
@@ -111,7 +111,7 @@ private function decryptBlock(int $length): string
 
         $options = OPENSSL_RAW_DATA;
         $this->cipherBuffer = $this->stream->read(self::BLOCK_SIZE);
-        if ($this->cipherBuffer !== '' && !$this->stream->eof()) {
+        if (!($this->cipherBuffer === '' && $this->stream->eof())) {
             $options |= OPENSSL_ZERO_PADDING;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private function decryptBlock(int $length): string`
`111`	`111`
`112`	`112`	`$options = OPENSSL_RAW_DATA;`
`113`	`113`	`$this->cipherBuffer = $this->stream->read(self::BLOCK_SIZE);`
`114`		`- if ($this->cipherBuffer !== '' && !$this->stream->eof()) {`
	`114`	`+ if (!($this->cipherBuffer === '' && $this->stream->eof())) {`
`115`	`115`	`$options \|= OPENSSL_ZERO_PADDING;`
`116`	`116`	`}`
`117`	`117`