compose: Check optipng is there before we use it #321
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
iainlane
commented
Jun 4, 2021
ximion
reviewed
Jun 12, 2021
compose/asc-image.c
Outdated
| g_set_error (error, | ||
| ASC_IMAGE_ERROR, | ||
| ASC_IMAGE_ERROR_FAILED, | ||
| "optipng not found on $PATH"); |
There was a problem hiding this comment.
Nitpick: "in PATH" is probably better...
There was a problem hiding this comment.
yeah, typo I guess, that's what it is in the other places where I used a similar string
ximion
reviewed
Jun 14, 2021
There are two places we can beef up the checks for optipng
- When enabling its usage, make sure we found it first, and refuse to
enable if we didn't.
- In case `asc_compose_set_optipng_binary (NULL)` was called, check
before spawning that we have *a* path. It's a programmer error to
call `g_spawn_sync ()` with `NULL` in `argv[0]`, and the program
will crash in that case. Also treat `NULL` as disabling optipng when
passed to `asc_compose_set_optipng_binary`.
In case the binary is removed mid-run or an invalid binary is passed to
`asc_compose_set_optipng_binary`, the `g_spawn_sync` call itself will
fail and we'll report a proper GError. This is the best way to handle
it, as we avoid TOCTTOU races that way.
iainlane
force-pushed
the
check-for-optipng
branch
from
99c5757
to
558b12b
Compare
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.
There are two places we can beef up the checks for optipng
enable if we didn't.
asc_compose_set_optipng_binary (NULL)was called, checkbefore spawning that we have a path. It's a programmer error to
call
g_spawn_sync ()withNULLinargv[0], and the programwill crash in that case. Also treat
NULLas disabling optipng whenpassed to
asc_compose_set_optipng_binary.In case the binary is removed mid-run or an invalid binary is passed to
asc_compose_set_optipng_binary, theg_spawn_synccall itself willfail and we'll report a proper GError. This is the best way to handle
it, as we avoid TOCTTOU races that way.