mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14883 from owncloud/imagepng_expects_resource_issue 

validate resource's integrity before using it
This commit is contained in:
Thomas Müller 2015-03-16 12:22:27 +01:00
parent 997a7a2668 09b05373ed
commit 1075914f8a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/image.php
View File

@ -283,9 +283,12 @@ class OC_Image {
} }
/** /**
* @return string Returns the raw image data. * @return null|string Returns the raw image data.
*/ */
function data() { function data() {
if (!$this->valid()) {
return null;
}
ob_start(); ob_start();
switch ($this->mimeType) { switch ($this->mimeType) {
case "image/png": case "image/png":

5
tests/lib/image.php
View File

@ -144,6 +144,11 @@ class Test_Image extends \Test\TestCase {
$this->assertEquals($expected, $img->data()); $this->assertEquals($expected, $img->data());
} }
public function testDataNoResource() {
$img = new \OC_Image();
$this->assertNull($img->data());
}
/** /**
* @depends testData * @depends testData
*/ */