AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libpng vulnerability CAN-2004-0421

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2004-04-30 12:55:10 +00:00
parent cfeff6f71c
commit 3b28eaf5c3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/png/pngerror.c
View File

@ -109,6 +109,14 @@ static PNG_CONST char png_digit[16] = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E',
'F' };
size_t wxstrnlen( const char *s, size_t maxlen )
{
int i ;
for ( i = 0 ; s[i] && i < maxlen ; ++i )
;
return i ;
}
static void /* PRIVATE */
png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
error_message)
@ -117,7 +125,7 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
while (iin < 4)
{
int c = png_ptr->chunk_name[iin++];
int c = png_ptr->chunk_name[iin++];
if (isnonalpha(c))
{
buffer[iout++] = '[';
@ -135,10 +143,12 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
buffer[iout] = 0;
else
{
int len = wxstrnlen(error_message, 64);
buffer[iout++] = ':';
buffer[iout++] = ' ';
png_memcpy(buffer+iout, error_message, 64);
buffer[iout+63] = 0;
png_memcpy(buffer+iout, error_message, len);
buffer[iout+len-1] = 0;
}
}