[libpng17] Revised last patch to work on 64-bit platforms.

This commit is contained in:
John Bowler 2013-04-13 16:42:37 -05:00 committed by Glenn Randers-Pehrson
parent 55e93d7090
commit d529363d13

View File

@ -1749,9 +1749,13 @@ png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key,
{
if (comp.input_len > PNG_UINT_31_MAX-prefix_len)
png_error(png_ptr, "iTXt: uncompressed text too long");
png_write_chunk_header(png_ptr, png_iTXt, strlen(text) + prefix_len);
/* So the string will fit in a chunk: */
comp.output_len = (png_uint_32)/*SAFE*/comp.input_len;
}
png_write_chunk_header(png_ptr, png_iTXt, comp.output_len + prefix_len);
png_write_chunk_data(png_ptr, new_key, key_len);
png_write_chunk_data(png_ptr, (png_const_bytep)lang, lang_len);
@ -1762,7 +1766,7 @@ png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key,
png_write_compressed_data_out(png_ptr, &comp);
else
png_write_chunk_data(png_ptr, (png_const_bytep)text, comp.input_len);
png_write_chunk_data(png_ptr, (png_const_bytep)text, comp.output_len);
png_write_chunk_end(png_ptr);
}