Prevent unserialization error in DataTableFactory #14669
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sometimes $blobRow[$blobName] is set but its value is false and DataTable::fromSerializedArray will throw an exception if called with a false value This patch prevents this by verifying that the value is not 'empty' instead
tsteur
reviewed
Jul 18, 2019
| @@ -397,7 +397,7 @@ private function setSubtables($dataTable, $blobRow, $treeLevel = 0) | |||
| } | |||
|
|
|||
| $blobName = $dataName . "_" . $sid; | |||
| if (isset($blobRow[$blobName])) { | |||
| if (!empty($blobRow[$blobName])) { | |||
There was a problem hiding this comment.
cheers @jajm . Maybe we should simply check like isset($blobRow[$blobName]) && is_array($blobRow[$blobName])? I haven't looked in detail but wonder if we would still want to go in the if when there is eg an empty array? I guess if it was an empty array, it would simply set an empty subtable which probably isn't wanted so the patch looks good with the !empty() check actually. Maybe @diosmosis can confirm?
There was a problem hiding this comment.
I think it should be ok, blobRow[...] should never be set to false/empty array AFAIK.
tsteur
approved these changes
Jul 18, 2019
|
Thanks for the first contribution @jajm! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sometimes $blobRow[$blobName] is set but its value is false and
DataTable::fromSerializedArray will throw an exception if called with a
false value
This patch prevents this by verifying that the value is not 'empty'
instead