[legacy] Fixed incorrect test in new png_push_save_buffer() code.

This commit is contained in:
Glenn Randers-Pehrson 2010-02-07 19:56:19 -06:00
parent bc4873c665
commit 6328fc1321
3 changed files with 30 additions and 22 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.2.43beta03 - February 7, 2010 Libpng 1.2.43beta04 - February 8, 2010
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -9,36 +9,36 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a Source files with LF line endings (for Unix/Linux) and with a
"configure" script "configure" script
libpng-1.2.43beta03.tar.xz (LZMA-compressed, recommended) libpng-1.2.43beta04.tar.xz (LZMA-compressed, recommended)
libpng-1.2.43beta03.tar.gz libpng-1.2.43beta04.tar.gz
libpng-1.2.43beta03.tar.bz2 libpng-1.2.43beta04.tar.bz2
Source files with LF line endings (for Unix/Linux) without the Source files with LF line endings (for Unix/Linux) without the
"configure" script "configure" script
libpng-1.2.43beta03-no-config.tar.xz (LZMA-compressed, recommended) libpng-1.2.43beta04-no-config.tar.xz (LZMA-compressed, recommended)
libpng-1.2.43beta03-no-config.tar.gz libpng-1.2.43beta04-no-config.tar.gz
libpng-1.2.43beta03-no-config.tar.bz2 libpng-1.2.43beta04-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the Source files with CRLF line endings (for Windows), without the
"configure" script "configure" script
lp1243b03.zip lp1243b04.zip
lp1243b03.7z lp1243b04.7z
lp1243b03.tar.bz2 lp1243b04.tar.bz2
Project files Project files
libpng-1.2.43beta03-project-netware.zip libpng-1.2.43beta04-project-netware.zip
libpng-1.2.43beta03-project-wince.zip libpng-1.2.43beta04-project-wince.zip
Other information: Other information:
libpng-1.2.43beta03-README.txt libpng-1.2.43beta04-README.txt
libpng-1.2.43beta03-KNOWNBUGS.txt libpng-1.2.43beta04-KNOWNBUGS.txt
libpng-1.2.43beta03-LICENSE.txt libpng-1.2.43beta04-LICENSE.txt
libpng-1.2.43beta03-Y2K-compliance.txt libpng-1.2.43beta04-Y2K-compliance.txt
libpng-1.2.43beta03-[previous version]-diff.txt libpng-1.2.43beta04-[previous version]-diff.txt
Changes since the last public release (1.2.42): Changes since the last public release (1.2.42):
@ -57,7 +57,10 @@ version 1.2.43beta02 [February 1, 2010]
version 1.2.43beta03 [February 6, 2010] version 1.2.43beta03 [February 6, 2010]
Backported fast png_push_save_buffer() algorithm from libpng-1.4.1 Backported fast png_push_save_buffer() algorithm from libpng-1.4.1
version 1.0.53rc01 and 1.2.43rc01 [February 7, 2010] version 1.2.43beta04 [February 7, 2010]
Fixed incorrect test in new png_push_save_buffer() code.
version 1.0.53rc01 and 1.2.43rc01 [February 8, 2010]
No changes. No changes.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

View File

@ -2659,7 +2659,10 @@ version 1.2.43beta03 [February 6, 2010]
Backported fast png_push_save_buffer() algorithm from libpng-1.4.1. Backported fast png_push_save_buffer() algorithm from libpng-1.4.1.
Backported some cosmetic changes from libpng-1.4.1. Backported some cosmetic changes from libpng-1.4.1.
version 1.0.53rc01 and 1.2.43rc01 [February 7, 2010] version 1.2.43beta04 [February 7, 2010]
Fixed incorrect test in new png_push_save_buffer() code.
version 1.0.53rc01 and 1.2.43rc01 [February 8, 2010]
No changes. No changes.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

View File

@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode /* pngpread.c - read a png file in push mode
* *
* Last changed in libpng 1.2.43 [February 7, 2010] * Last changed in libpng 1.2.43 [February 8, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson * Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -694,8 +694,10 @@ png_push_save_buffer(png_structp png_ptr)
png_size_t new_max; png_size_t new_max;
png_bytep old_buffer; png_bytep old_buffer;
if (png_ptr->save_buffer_size == PNG_SIZE_MAX) if (png_ptr->save_buffer_max == PNG_SIZE_MAX ||
png_error(png_ptr, "Overflow of save_buffer"); (png_ptr->save_buffer_size > PNG_SIZE_MAX -
png_ptr->current_buffer_size))
png_error(png_ptr, "Overflow of save_buffer");
if (png_ptr->save_buffer_size > PNG_SIZE_MAX - if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
(png_ptr->current_buffer_size + (png_ptr->current_buffer_size +