Skip to content

Align NaN handling in floating-point conversion helpers #883

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

Open
Yanhaoxi wants to merge 1 commit into
base: libpng18
Choose a base branch
from
+3 −3
Open

Align NaN handling in floating-point conversion helpers #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions png.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2699,7 +2699,7 @@ png_fixed(const png_struct *png_ptr, double fp, const char *text)
{
double r = floor(100000 * fp + .5);

if (r > 2147483647. || r < -2147483648.)
if (!(r >= -2147483648. && r <= 2147483647.))
png_fixed_error(png_ptr, text);

# ifndef PNG_ERROR_TEXT_SUPPORTED
Expand All @@ -2718,7 +2718,7 @@ png_fixed_ITU(const png_struct *png_ptr, double fp, const char *text)
{
double r = floor(10000 * fp + .5);

if (r > 2147483647. || r < 0)
if (!(r >= 0. && r <= 2147483647.))
png_fixed_error(png_ptr, text);

# ifndef PNG_ERROR_TEXT_SUPPORTED
Expand Down
2 changes: 1 addition & 1 deletion pngrtran.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ convert_gamma_value(png_struct *png_ptr, double output_gamma)
/* This preserves -1 and -2 exactly: */
output_gamma = floor(output_gamma + .5);

if (output_gamma > PNG_FP_MAX || output_gamma < PNG_FP_MIN)
if (!(output_gamma >= PNG_FP_MIN && output_gamma <= PNG_FP_MAX))
png_fixed_error(png_ptr, "gamma value");

return (png_fixed_point)output_gamma;
Expand Down