projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unconditionally use CGI_PREFIX where possible
[privoxy.git]
/
deanimate.c
diff --git
a/deanimate.c
b/deanimate.c
index
637743b
..
bba74d4
100644
(file)
--- a/
deanimate.c
+++ b/
deanimate.c
@@
-1,23
+1,20
@@
-const char deanimate_rcs[] = "$Id: deanimate.c,v 1.3 2001/07/15 13:57:50 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/deanimate.c,v $
*
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/deanimate.c,v $
*
- * Purpose : Declares functions to deanimate GIF images on the fly.
- *
- * Functions declared include: gif_deanimate, buf_free,
- * buf_copy, buf_getbyte, gif_skip_data_block, and
- * gif_extract_image
+ * Purpose : Declares functions to manipulate binary images on the
+ * fly. High-level functions include:
+ * - Deanimation of GIF images
*
*
- * Copyright : Written by and Copyright (C) 2001
by the the SourceForg
e
- *
IJBSWA team. http://ijbswa.sourceforge.net
+ * Copyright : Written by and Copyright (C) 2001
- 2004, 2006 by th
e
+ *
Privoxy team. https://www.privoxy.org/
*
* Based on the GIF file format specification (see
* http://tronche.com/computer-graphics/gif/gif89a.html)
* and ideas from the Image::DeAnim Perl module by
* Ken MacFarlane, <ksm+cpan@universal.dca.net>
*
*
* Based on the GIF file format specification (see
* http://tronche.com/computer-graphics/gif/gif89a.html)
* and ideas from the Image::DeAnim Perl module by
* Ken MacFarlane, <ksm+cpan@universal.dca.net>
*
- * This program is free software; you can redistribute it
+ * This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at
@@
-35,17
+32,8
@@
const char deanimate_rcs[] = "$Id: deanimate.c,v 1.3 2001/07/15 13:57:50 jongfos
* or write to the Free Software Foundation, Inc., 59
* Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* or write to the Free Software Foundation, Inc., 59
* Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * Revisions :
- * $Log: deanimate.c,v $
- * Revision 1.3 2001/07/15 13:57:50 jongfoster
- * Adding #includes string.h and miscutil.h
- *
- * Revision 1.2 2001/07/13 13:46:20 oes
- * Introduced GIF deanimation feature
- *
- *
**********************************************************************/
**********************************************************************/
-
\f
+
#include "config.h"
#include "config.h"
@@
-53,13
+41,12
@@
const char deanimate_rcs[] = "$Id: deanimate.c,v 1.3 2001/07/15 13:57:50 jongfos
#include <fcntl.h>
#include "project.h"
#include <fcntl.h>
#include "project.h"
+#include "errlog.h"
#include "deanimate.h"
#include "miscutil.h"
#include "deanimate.h"
#include "miscutil.h"
-const char deanimate_h_rcs[] = DEANIMATE_H_VERSION;
-
/*********************************************************************
/*********************************************************************
- *
+ *
* Function : buf_free
*
* Description : Safely frees a struct binbuffer
* Function : buf_free
*
* Description : Safely frees a struct binbuffer
@@
-85,29
+72,29
@@
void buf_free(struct binbuffer *buf)
/*********************************************************************
/*********************************************************************
- *
+ *
* Function : buf_extend
*
* Description : Ensure that a given binbuffer can hold a given amount
* of bytes, by reallocating its buffer if necessary.
* Function : buf_extend
*
* Description : Ensure that a given binbuffer can hold a given amount
* of bytes, by reallocating its buffer if necessary.
- * Allocate new mem in chunks of 10
00
bytes, so we don't
+ * Allocate new mem in chunks of 10
24
bytes, so we don't
* have to realloc() too often.
*
* Parameters :
* 1 : buf = Pointer to the binbuffer
* 2 : length = Desired minimum size
* have to realloc() too often.
*
* Parameters :
* 1 : buf = Pointer to the binbuffer
* 2 : length = Desired minimum size
- *
*
*
- * Returns : 0 on success, 1 on failiure.
+ *
+ * Returns : 0 on success, 1 on failure.
*
*********************************************************************/
*
*********************************************************************/
-
int buf_extend(struct binbuffer *buf, in
t length)
+
static int buf_extend(struct binbuffer *buf, size_
t length)
{
char *newbuf;
if (buf->offset + length > buf->size)
{
{
char *newbuf;
if (buf->offset + length > buf->size)
{
- buf->size =
buf->size + length + 1000 - (buf->size + length) % 1000
;
+ buf->size =
((buf->size + length + (size_t)1023) & ~(size_t)1023)
;
newbuf = (char *)realloc(buf->buffer, buf->size);
if (newbuf == NULL)
newbuf = (char *)realloc(buf->buffer, buf->size);
if (newbuf == NULL)
@@
-127,7
+114,7
@@
int buf_extend(struct binbuffer *buf, int length)
/*********************************************************************
/*********************************************************************
- *
+ *
* Function : buf_copy
*
* Description : Safely copies a given amount of bytes from one
* Function : buf_copy
*
* Description : Safely copies a given amount of bytes from one
@@
-139,16
+126,16
@@
int buf_extend(struct binbuffer *buf, int length)
* 2 : dst = Pointer to the destination binbuffer
* 3 : length = Number of bytes to be copied
*
* 2 : dst = Pointer to the destination binbuffer
* 3 : length = Number of bytes to be copied
*
- * Returns : 0 on success, 1 on fail
i
ure.
+ * Returns : 0 on success, 1 on failure.
*
*********************************************************************/
*
*********************************************************************/
-
int buf_copy(struct binbuffer *src, struct binbuffer *dst, in
t length)
+
static int buf_copy(struct binbuffer *src, struct binbuffer *dst, size_
t length)
{
/*
* Sanity check: Can't copy more data than we have
*/
{
/*
* Sanity check: Can't copy more data than we have
*/
- if (src->offset + length > src->size)
+ if (src->offset + length > src->size)
{
return 1;
}
{
return 1;
}
@@
-156,7
+143,7
@@
int buf_copy(struct binbuffer *src, struct binbuffer *dst, int length)
/*
* Ensure that dst can hold the new data
*/
/*
* Ensure that dst can hold the new data
*/
- if (buf_extend(dst, length))
+ if (buf_extend(dst, length))
{
return 1;
}
{
return 1;
}
@@
-175,20
+162,20
@@
int buf_copy(struct binbuffer *src, struct binbuffer *dst, int length)
/*********************************************************************
/*********************************************************************
- *
+ *
* Function : buf_getbyte
*
* Description : Safely gets a byte from a given binbuffer at a
* given offset
*
* Parameters :
* Function : buf_getbyte
*
* Description : Safely gets a byte from a given binbuffer at a
* given offset
*
* Parameters :
- * 1 :
buf
= Pointer to the source binbuffer
+ * 1 :
src
= Pointer to the source binbuffer
* 2 : offset = Offset to the desired byte
*
* 2 : offset = Offset to the desired byte
*
- * Returns : The byte on success, or 0 on fail
i
ure
+ * Returns : The byte on success, or 0 on failure
*
*********************************************************************/
*
*********************************************************************/
-
unsigned char buf_getbyte(struct binbuffer *src, in
t offset)
+
static unsigned char buf_getbyte(const struct binbuffer *src, size_
t offset)
{
if (src->offset + offset < src->size)
{
{
if (src->offset + offset < src->size)
{
@@
-203,7
+190,7
@@
unsigned char buf_getbyte(struct binbuffer *src, int offset)
/*********************************************************************
/*********************************************************************
- *
+ *
* Function : gif_skip_data_block
*
* Description : Safely advances the offset of a given struct binbuffer
* Function : gif_skip_data_block
*
* Description : Safely advances the offset of a given struct binbuffer
@@
-214,21
+201,22
@@
unsigned char buf_getbyte(struct binbuffer *src, int offset)
* Parameters :
* 1 : buf = Pointer to the binbuffer
*
* Parameters :
* 1 : buf = Pointer to the binbuffer
*
- * Returns : 0 on success, or 1 on fail
i
ure
+ * Returns : 0 on success, or 1 on failure
*
*********************************************************************/
*
*********************************************************************/
-int gif_skip_data_block(struct binbuffer *buf)
+
static
int gif_skip_data_block(struct binbuffer *buf)
{
unsigned char c;
{
unsigned char c;
- /*
+ /*
* Data blocks are sequences of chunks, which are headed
* by a one-byte length field, with the last chunk having
* zero length.
*/
* Data blocks are sequences of chunks, which are headed
* by a one-byte length field, with the last chunk having
* zero length.
*/
- while(
c = buf_getbyte(buf, 0)
)
+ while(
(c = buf_getbyte(buf, 0)) != '\0'
)
{
{
- if ((buf->offset += c + 1) >= buf->size - 1)
+ buf->offset += (size_t)c + 1;
+ if (buf->offset >= buf->size - 1)
{
return 1;
}
{
return 1;
}
@@
-241,25
+229,25
@@
int gif_skip_data_block(struct binbuffer *buf)
/*********************************************************************
/*********************************************************************
- *
+ *
* Function : gif_extract_image
*
* Description : Safely extracts an image data block from a given
* struct binbuffer that contains a GIF image and whose
* Function : gif_extract_image
*
* Description : Safely extracts an image data block from a given
* struct binbuffer that contains a GIF image and whose
- * offset is positioned at the start of a data block
+ * offset is positioned at the start of a data block
* into a given destination binbuffer.
*
* Parameters :
* 1 : src = Pointer to the source binbuffer
* 2 : dst = Pointer to the destination binbuffer
*
* into a given destination binbuffer.
*
* Parameters :
* 1 : src = Pointer to the source binbuffer
* 2 : dst = Pointer to the destination binbuffer
*
- * Returns : 0 on success, or 1 on fail
i
ure
+ * Returns : 0 on success, or 1 on failure
*
*********************************************************************/
*
*********************************************************************/
-int gif_extract_image(struct binbuffer *src, struct binbuffer *dst)
+
static
int gif_extract_image(struct binbuffer *src, struct binbuffer *dst)
{
unsigned char c;
{
unsigned char c;
-
+
/*
* Remember the colormap flag and copy the image head
*/
/*
* Remember the colormap flag and copy the image head
*/
@@
-274,19
+262,26
@@
int gif_extract_image(struct binbuffer *src, struct binbuffer *dst)
*/
if (c & 0x80)
{
*/
if (c & 0x80)
{
- if (buf_copy(src, dst, 3 * (1 << ((c & 0x07) + 1))))
+ int map_length = 3 * (1 << ((c & 0x07) + 1));
+ if (map_length <= 0)
{
{
+ log_error(LOG_LEVEL_DEANIMATE,
+ "colormap length = %d (%c)?", map_length, c);
return 1;
return 1;
- }
+ }
+ if (buf_copy(src, dst, (size_t)map_length))
+ {
+ return 1;
+ }
}
if (buf_copy(src, dst, 1)) return 1;
/*
* Copy the image chunk by chunk.
*/
}
if (buf_copy(src, dst, 1)) return 1;
/*
* Copy the image chunk by chunk.
*/
- while(
c = buf_getbyte(src, 0)
)
+ while(
(c = buf_getbyte(src, 0)) != '\0'
)
{
{
- if (buf_copy(src, dst,
c + 1
)) return 1;
+ if (buf_copy(src, dst,
1 + (size_t) c
)) return 1;
}
if (buf_copy(src, dst, 1)) return 1;
}
if (buf_copy(src, dst, 1)) return 1;
@@
-302,15
+297,15
@@
int gif_extract_image(struct binbuffer *src, struct binbuffer *dst)
}
/*********************************************************************
}
/*********************************************************************
- *
+ *
* Function : gif_deanimate
*
* Description : Deanimate a given GIF image, i.e. given a GIF with
* an (optional) image block and an arbitrary number
* of image extension blocks, produce an output GIF with
* only one image block that contains the last image
* Function : gif_deanimate
*
* Description : Deanimate a given GIF image, i.e. given a GIF with
* an (optional) image block and an arbitrary number
* of image extension blocks, produce an output GIF with
* only one image block that contains the last image
- * (extens
t
ion) block of the original.
- * Also strip Comments, Application extens
t
ions, etc.
+ * (extension) block of the original.
+ * Also strip Comments, Application extensions, etc.
*
* Parameters :
* 1 : src = Pointer to the source binbuffer
*
* Parameters :
* 1 : src = Pointer to the source binbuffer
@@
-318,7
+313,7
@@
int gif_extract_image(struct binbuffer *src, struct binbuffer *dst)
* 3 : get_first_image = Flag: If set, get the first image
* If unset (default), get the last
*
* 3 : get_first_image = Flag: If set, get the first image
* If unset (default), get the last
*
- * Returns : 0 on success, or 1 on fail
i
ure
+ * Returns : 0 on success, or 1 on failure
*
*********************************************************************/
int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_image)
*
*********************************************************************/
int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_image)
@@
-334,9
+329,9
@@
int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
c = buf_getbyte(src, 10);
/*
c = buf_getbyte(src, 10);
/*
- * Check & copy GIF header
+ * Check & copy GIF header
*/
*/
- if (strncmp(src->buffer, "GIF89a", 6) && strncmp(src->buffer, "GIF87a", 6))
+ if (strncmp(src->buffer, "GIF89a", 6) && strncmp(src->buffer, "GIF87a", 6))
{
return 1;
}
{
return 1;
}
@@
-351,9
+346,16
@@
int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
/*
* Look for global colormap and copy if found.
*/
/*
* Look for global colormap and copy if found.
*/
- if(c & 0x80)
+ if
(c & 0x80)
{
{
- if (buf_copy(src, dst, 3 * (1 << ((c & 0x07) + 1))))
+ int map_length = 3 * (1 << ((c & 0x07) + 1));
+ if (map_length <= 0)
+ {
+ log_error(LOG_LEVEL_DEANIMATE,
+ "colormap length = %d (%c)?", map_length, c);
+ return 1;
+ }
+ if (buf_copy(src, dst, (size_t)map_length))
{
return 1;
}
{
return 1;
}
@@
-362,10
+364,7
@@
int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
/*
* Reserve a buffer for the current image block
*/
/*
* Reserve a buffer for the current image block
*/
- if (NULL == (image = (struct binbuffer *)zalloc(sizeof(*image))))
- {
- return 1;
- }
+ image = zalloc_or_die(sizeof(*image));
/*
* Parse the GIF block by block and copy the relevant
/*
* Parse the GIF block by block and copy the relevant
@@
-381,7
+380,7
@@
int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
case 0x3b:
goto write;
case 0x3b:
goto write;
- /*
+ /*
* Image block: Extract to current image buffer.
*/
case 0x2c:
* Image block: Extract to current image buffer.
*/
case 0x2c:
@@
-441,13
+440,13
@@
int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
*/
default:
goto failed;
*/
default:
goto failed;
-
+
}
} /* -END- while src */
/*
* Either we got here by goto, or because the GIF is
}
} /* -END- while src */
/*
* Either we got here by goto, or because the GIF is
- * bogus and EOF was reached before an end-of-gif marker
+ * bogus and EOF was reached before an end-of-gif marker
* was found.
*/
* was found.
*/