Avoid using unsafe sprintf()
#19598
Open
Avoid using unsafe sprintf()
#19598
+7
−4
Conversation
This file contains hidden or 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
iluuu1994
reviewed
Aug 26, 2025
| @@ -90,7 +90,10 @@ static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */ | |||
| } | |||
| } | |||
|
|
|||
| p += sprintf(env_value + p + socket_set_buf, "%s%s=%s", (p && !socket_set_buf) ? "," : "", ls->key, fd); | |||
| int written = snprintf(env_value + p + socket_set_buf, | |||
| strlen(ls->key) + strlen(fd) + 2 + (p && !socket_set_buf ? 1 : 0), | |||
There was a problem hiding this comment.
Might be better to store the length in a variable, and then subtract p + socket_set_buf from it.
| @@ -386,7 +386,7 @@ ZEND_COLD void zend_debug_alloc_output(char *format, ...) | |||
| va_list args; | |||
|
|
|||
| va_start(args, format); | |||
| vsprintf(output_buf, format, args); | |||
| vsnprintf(output_buf, sizeof(output_buf), format, args); | |||
There was a problem hiding this comment.
This entire function looks to be unused, if I'm not mistaken. Maybe we can just drop it.
TimWolla
reviewed
Aug 26, 2025
| @@ -130,7 +130,7 @@ static int get_formatted_timestamp_tz(pdo_stmt_t *stmt, const ISC_TIMESTAMP_TZ* | |||
| return 1; | |||
| } | |||
|
|
|||
| size_t timestamp_tz_len = sprintf(timestampTzBuf, "%s %s", timestampBuf, timeZoneBuffer); | |||
| size_t timestamp_tz_len = snprintf(timestampTzBuf, sizeof(timestampTzBuf), "%s %s", timestampBuf, timeZoneBuffer); | |||
There was a problem hiding this comment.
This can probably just be zend_strpprintf() to directly print into the zend_string.
TimWolla
reviewed
Aug 26, 2025
| @@ -90,7 +90,10 @@ static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */ | |||
| } | |||
| } | |||
|
|
|||
| p += sprintf(env_value + p + socket_set_buf, "%s%s=%s", (p && !socket_set_buf) ? "," : "", ls->key, fd); | |||
| int written = snprintf(env_value + p + socket_set_buf, | |||
There was a problem hiding this comment.
Similarly, the smart_string API would avoid manually reallocating a buffer.
|
I did a round on this once a long time ago, strange I missed these, thanks for catching this |
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.
Internals book explicitly specifies that
sprintf()should be avoided where possible for safer alternatives.