Skip to content

Use snprintf instead of sprintf #5567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radarhere merged 2 commits into from
Jul 1, 2021
Merged

Use snprintf instead of sprintf #5567

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4504b
Limit sprintf modes to 10 characters
radarhere Jun 15, 2021
518ee37
Use snprintf instead of sprintf
radarhere Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/libImaging/Convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1594,9 +1594,8 @@ convert(
#ifdef notdef
return (Imaging)ImagingError_ValueError("conversion not supported");
#else
static char buf[256];
/* FIXME: may overflow if mode is too large */
sprintf(buf, "conversion from %s to %s not supported", imIn->mode, mode);
static char buf[100];
snprintf(buf, 100, "conversion from %.10s to %.10s not supported", imIn->mode, mode);
return (Imaging)ImagingError_ValueError(buf);
#endif
}
Expand Down Expand Up @@ -1645,11 +1644,11 @@ ImagingConvertTransparent(Imaging imIn, const char *mode, int r, int g, int b) {
}
#else
{
static char buf[256];
/* FIXME: may overflow if mode is too large */
sprintf(
static char buf[100];
snprintf(
buf,
"conversion from %s to %s not supported in convert_transparent",
100,
"conversion from %.10s to %.10s not supported in convert_transparent",
imIn->mode,
mode);
return (Imaging)ImagingError_ValueError(buf);
Expand Down