Fix for: https://mantis.ilias.de/view.php?id=31016 #4016
Merged
+3
−1
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.
This PR changes the way images are converted, but tries to keep as much of the sanitation provided by escapeshellcmd as possible to avoid any potential vulnerabilities. As discussed in the meeting of the Taskforce on Bugfixing it moves most of the logic to execute convert to the Test.
I decided to go with this summary approach instead of calling escapeshellarg() on every arg. Technically this would probably be cleaner, but it would mean a gazillion calls to escapeshellarg().
I would personally also like to rename the variable "convert_cmd" to "convert_args" as I think this would make its purpose clearer as there is no command to be found nowhere in the assigned string. I can expand this PR accordingly, if you want.
I can also provide a PR for Trunk, if you want, as Fabian has just cleaned up the mess called ilUtil and thus this can't simply be cherry-picked.