Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Throw ConversionException when unserialization fail for array and object types #3254

Merged
merged 1 commit into from
Aug 18, 2018
Merged

Throw ConversionException when unserialization fail for array and object types #3254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions lib/Doctrine/DBAL/Types/ArrayType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

use Doctrine\DBAL\Platforms\AbstractPlatform;
use function is_resource;
use function restore_error_handler;
use function serialize;
use function set_error_handler;
use function stream_get_contents;
use function unserialize;

Expand Down Expand Up @@ -59,12 +61,16 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
}

$value = (is_resource($value)) ? stream_get_contents($value) : $value;
$val = unserialize($value);
if ($val === false && $value != 'b:0;') {
throw ConversionException::conversionFailed($value, $this->getName());
}

return $val;
set_error_handler(function (int $code, string $message) : void {
throw ConversionException::conversionFailedUnserialization($this->getName(), $message);
});

try {
return unserialize($value);
} finally {
restore_error_handler();
}
}

/**
Expand Down
9 changes: 9 additions & 0 deletions lib/Doctrine/DBAL/Types/ConversionException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,13 @@ public static function conversionFailedSerialization($value, $format, $error)
$error
));
}

public static function conversionFailedUnserialization(string $format, string $error) : self
{
return new self(sprintf(
"Could not convert database value to '%s' as an error was triggered by the unserialization: '%s'",
$format,
$error
));
}
}
16 changes: 11 additions & 5 deletions lib/Doctrine/DBAL/Types/ObjectType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

use Doctrine\DBAL\Platforms\AbstractPlatform;
use function is_resource;
use function restore_error_handler;
use function serialize;
use function set_error_handler;
use function stream_get_contents;
use function unserialize;

Expand Down Expand Up @@ -58,12 +60,16 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
}

$value = (is_resource($value)) ? stream_get_contents($value) : $value;
$val = unserialize($value);
if ($val === false && $value !== 'b:0;') {
throw ConversionException::conversionFailed($value, $this->getName());
}

return $val;
set_error_handler(function (int $code, string $message) : void {
throw ConversionException::conversionFailedUnserialization($this->getName(), $message);
});

try {
return unserialize($value);
} finally {
restore_error_handler();
}
}

/**
Expand Down
11 changes: 1 addition & 10 deletions tests/Doctrine/Tests/DBAL/Types/ArrayTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type;
use Doctrine\Tests\DBAL\Mocks\MockPlatform;
use const E_ALL;
use const E_STRICT;
use function error_reporting;
use function serialize;

class ArrayTest extends \Doctrine\Tests\DbalTestCase
Expand All @@ -28,12 +25,6 @@ protected function setUp()
$this->_type = Type::getType('array');
}

protected function tearDown()
{
error_reporting(-1); // reactive all error levels
}


public function testArrayConvertsToDatabaseValue()
{
self::assertInternalType(
Expand All @@ -52,8 +43,8 @@ public function testArrayConvertsToPHPValue()

public function testConversionFailure()
{
error_reporting( (E_ALL | E_STRICT) - \E_NOTICE );
$this->expectException('Doctrine\DBAL\Types\ConversionException');
$this->expectExceptionMessage("Could not convert database value to 'array' as an error was triggered by the unserialization: 'unserialize(): Error at offset 0 of 7 bytes'");
$this->_type->convertToPHPValue('abcdefg', $this->_platform);
}

Expand Down
10 changes: 1 addition & 9 deletions tests/Doctrine/Tests/DBAL/Types/ObjectTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

use Doctrine\DBAL\Types\Type;
use Doctrine\Tests\DBAL\Mocks\MockPlatform;
use const E_ALL;
use const E_STRICT;
use function error_reporting;
use function serialize;

class ObjectTest extends \Doctrine\Tests\DbalTestCase
Expand All @@ -27,11 +24,6 @@ protected function setUp()
$this->_type = Type::getType('object');
}

protected function tearDown()
{
error_reporting(-1); // reactive all error levels
}

public function testObjectConvertsToDatabaseValue()
{
self::assertInternalType('string', $this->_type->convertToDatabaseValue(new \stdClass(), $this->_platform));
Expand All @@ -44,8 +36,8 @@ public function testObjectConvertsToPHPValue()

public function testConversionFailure()
{
error_reporting( (E_ALL | E_STRICT) - \E_NOTICE );
$this->expectException('Doctrine\DBAL\Types\ConversionException');
$this->expectExceptionMessage("Could not convert database value to 'object' as an error was triggered by the unserialization: 'unserialize(): Error at offset 0 of 7 bytes'");
$this->_type->convertToPHPValue('abcdefg', $this->_platform);
}

Expand Down