projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In rfc2553_connect_to(), start setting cgi->error_message on error
[privoxy.git]
/
deanimate.c
diff --git
a/deanimate.c
b/deanimate.c
index
637743b
..
3ad4e2b
100644
(file)
--- a/
deanimate.c
+++ b/
deanimate.c
@@
-1,16
+1,18
@@
-const char deanimate_rcs[] = "$Id: deanimate.c,v 1.
3 2001/07/15 13:57:50 jongfoster
Exp $";
+const char deanimate_rcs[] = "$Id: deanimate.c,v 1.
19 2008/05/21 15:29:35 fabiankeil
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.
+ * Purpose : Declares functions to manipulate binary images on the
+ * fly. High-level functions include:
+ * - Deanimation of GIF images
*
* Functions declared include: gif_deanimate, buf_free,
*
* Functions declared include: gif_deanimate, buf_free,
- * buf_copy, buf_getbyte, gif_skip_data_block
, and
- * gif_extract_image
+ * buf_copy, buf_getbyte, gif_skip_data_block
+ *
and
gif_extract_image
*
*
- * 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
+ *
SourceForge Privoxy team. http://www.privoxy.org/
*
* Based on the GIF file format specification (see
* http://tronche.com/computer-graphics/gif/gif89a.html)
*
* Based on the GIF file format specification (see
* http://tronche.com/computer-graphics/gif/gif89a.html)
@@
-35,23
+37,15
@@
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 <string.h>
#include <fcntl.h>
#include "config.h"
#include <string.h>
#include <fcntl.h>
+#include "errlog.h"
#include "project.h"
#include "deanimate.h"
#include "miscutil.h"
#include "project.h"
#include "deanimate.h"
#include "miscutil.h"
@@
-90,7
+84,7
@@
void buf_free(struct binbuffer *buf)
*
* Description : Ensure that a given binbuffer can hold a given amount
* of bytes, by reallocating its buffer if necessary.
*
* 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 :
* have to realloc() too often.
*
* Parameters :
@@
-98,16
+92,16
@@
void buf_free(struct binbuffer *buf)
* 2 : length = Desired minimum size
*
*
* 2 : length = Desired minimum size
*
*
- * Returns : 0 on success, 1 on fail
i
ure.
+ * 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)
@@
-139,10
+133,10
@@
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)
{
/*
{
/*
@@
-182,13
+176,13
@@
int buf_copy(struct binbuffer *src, struct binbuffer *dst, int length)
* given offset
*
* Parameters :
* 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)
{
@@
-214,10
+208,10
@@
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;
@@
-226,9
+220,10
@@
int gif_skip_data_block(struct binbuffer *buf)
* by a one-byte length field, with the last chunk having
* zero length.
*/
* 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;
}
@@
-253,13
+248,13
@@
int gif_skip_data_block(struct binbuffer *buf)
* 1 : src = Pointer to the source binbuffer
* 2 : dst = Pointer to the destination binbuffer
*
* 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,7
+269,14
@@
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;
+ }
+ if (buf_copy(src, dst, (size_t)map_length))
{
return 1;
}
{
return 1;
}
@@
-284,9
+286,9
@@
int gif_extract_image(struct binbuffer *src, struct binbuffer *dst)
/*
* Copy the image chunk by chunk.
*/
/*
* 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;
@@
-318,7
+320,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)
@@
-353,7
+355,14
@@
int gif_deanimate(struct binbuffer *src, struct binbuffer *dst, int get_first_im
*/
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;
}