Commit1edecf7

authored and

committed

[Validator] fix access to uninitialized property when getting value

1 parente50db1f commit1edecf7Copy full SHA for 1edecf7

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,13 @@ public function __construct($class, $name)`
`48`	`48`	`*/`
`49`	`49`	`publicfunctiongetPropertyValue($object)`
`50`	`50`	`{`
`51`		`-return$this->getReflectionMember($object)->getValue($object);`
	`51`	`+$reflProperty =$this->getReflectionMember($object);`
	`52`	`+`
	`53`	`+if (\PHP_VERSION_ID >=70400 && !$reflProperty->isInitialized($object)) {`
	`54`	`+returnnull;`
	`55`	`+ }`
	`56`	`+`
	`57`	`+return$reflProperty->getValue($object);`
`52`	`58`	`}`
`53`	`59`
`54`	`60`	`/**`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,8 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+namespaceSymfony\Component\Validator\Tests\Fixtures;`
	`4`	`+`
	`5`	`+class Entity_74`
	`6`	`+{`
	`7`	`+publicint$uninitialized;`
	`8`	`+}`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,12 @@`
`14`	`14`	`usePHPUnit\Framework\TestCase;`
`15`	`15`	`useSymfony\Component\Validator\Mapping\PropertyMetadata;`
`16`	`16`	`useSymfony\Component\Validator\Tests\Fixtures\Entity;`
	`17`	`+useSymfony\Component\Validator\Tests\Fixtures\Entity_74;`
`17`	`18`
`18`	`19`	`class PropertyMetadataTestextends TestCase`
`19`	`20`	`{`
`20`	`21`	`constCLASSNAME ='Symfony\Component\Validator\Tests\Fixtures\Entity';`
	`22`	`+constCLASSNAME_74 ='Symfony\Component\Validator\Tests\Fixtures\Entity_74';`
`21`	`23`	`constPARENTCLASS ='Symfony\Component\Validator\Tests\Fixtures\EntityParent';`
`22`	`24`
`23`	`25`	`publicfunctiontestInvalidPropertyName()`
`@@ -53,4 +55,15 @@ public function testGetPropertyValueFromRemovedProperty()`
`53`	`55`	`$this->expectException('Symfony\Component\Validator\Exception\ValidatorException');`
`54`	`56`	`$metadata->getPropertyValue($entity);`
`55`	`57`	`}`
	`58`	`+`
	`59`	`+/**`
	`60`	`+ * @requires PHP 7.4`
	`61`	`+ */`
	`62`	`+publicfunctiontestGetPropertyValueFromUninitializedProperty()`
	`63`	`+ {`
	`64`	`+$entity =newEntity_74();`
	`65`	`+$metadata =newPropertyMetadata(self::CLASSNAME_74,'uninitialized');`
	`66`	`+`
	`67`	`+$this->assertNull($metadata->getPropertyValue($entity));`
	`68`	`+ }`
`56`	`69`	`}`

Comments

(0)