@@ -538,6 +538,8 @@ libclamav_la_SOURCES = \

 	hfsplus.h \

 	swf.c \

 	swf.h \

+	gif.c \

+	gif.h \

 	jpeg.c \

 	jpeg.h \

 	png.c \

@@ -309,8 +309,8 @@ am__libclamav_la_SOURCES_DIST = matcher-ac.c matcher-ac.h matcher-bm.c \

 	prtn_intxn.h json_api.c json_api.h xz_iface.c xz_iface.h \

 	sf_base64decode.c sf_base64decode.h hfsplus.c hfsplus.h swf.c \

 	swf.h jpeg.c jpeg.h png.c png.h iso9660.c iso9660.h arc4.c \

-	arc4.h rijndael.c rijndael.h crtmgr.c crtmgr.h asn1.c asn1.h \

-	fpu.c fpu.h stats.c stats.h www.c www.h stats_json.c \

+	gif.c gif.h arc4.h rijndael.c rijndael.h crtmgr.c crtmgr.h \

+	asn1.c asn1.h fpu.c fpu.h stats.c stats.h www.c www.h stats_json.c \

 	stats_json.h hostid.c hostid.h openioc.c openioc.h msdoc.c \

 	msdoc.h matcher-pcre.c matcher-pcre.h regex_pcre.c \

 	regex_pcre.h msxml.c msxml.h msxml_parser.c msxml_parser.h \

@@ -450,8 +450,8 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \

 	libclamav_la-apm.lo libclamav_la-prtn_intxn.lo \

 	libclamav_la-json_api.lo libclamav_la-xz_iface.lo \

 	libclamav_la-sf_base64decode.lo libclamav_la-hfsplus.lo \

-	libclamav_la-swf.lo libclamav_la-jpeg.lo libclamav_la-png.lo \

-	libclamav_la-iso9660.lo libclamav_la-arc4.lo \

+	libclamav_la-swf.lo libclamav_la-gif.lo libclamav_la-jpeg.lo \

+	libclamav_la-png.lo libclamav_la-iso9660.lo libclamav_la-arc4.lo \

 	libclamav_la-rijndael.lo libclamav_la-crtmgr.lo \

 	libclamav_la-asn1.lo libclamav_la-fpu.lo libclamav_la-stats.lo \

 	libclamav_la-www.lo libclamav_la-stats_json.lo \

@@ -1382,7 +1382,7 @@ libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \

 	xar.c xar.h xdp.c xdp.h mbr.c mbr.h gpt.c gpt.h apm.c apm.h \

 	prtn_intxn.c prtn_intxn.h json_api.c json_api.h xz_iface.c \

 	xz_iface.h sf_base64decode.c sf_base64decode.h hfsplus.c \

-	hfsplus.h swf.c swf.h jpeg.c jpeg.h png.c png.h iso9660.c \

+	hfsplus.h swf.c swf.h gif.c gif.h jpeg.c jpeg.h png.c png.h iso9660.c \

 	iso9660.h arc4.c arc4.h rijndael.c rijndael.h crtmgr.c \

 	crtmgr.h asn1.c asn1.h fpu.c fpu.h stats.c stats.h www.c www.h \

 	stats_json.c stats_json.h hostid.c hostid.h openioc.c \

@@ -1731,6 +1731,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fp_unsigned_bin_size.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fpu.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fsg.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-gif.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-gpt.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-hashtab.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-hfsplus.Plo@am__quote@

@@ -2793,6 +2794,13 @@ libclamav_la-swf.lo: swf.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-swf.lo `test -f 'swf.c' || echo '$(srcdir)/'`swf.c

+libclamav_la-gif.lo: gif.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-gif.lo -MD -MP -MF $(DEPDIR)/libclamav_la-gif.Tpo -c -o libclamav_la-gif.lo `test -f 'gif.c' || echo '$(srcdir)/'`gif.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-gif.Tpo $(DEPDIR)/libclamav_la-gif.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gif.c' object='libclamav_la-gif.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-gif.lo `test -f 'gif.c' || echo '$(srcdir)/'`gif.c

+

 libclamav_la-jpeg.lo: jpeg.c

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-jpeg.lo -MD -MP -MF $(DEPDIR)/libclamav_la-jpeg.Tpo -c -o libclamav_la-jpeg.lo `test -f 'jpeg.c' || echo '$(srcdir)/'`jpeg.c

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-jpeg.Tpo $(DEPDIR)/libclamav_la-jpeg.Plo

@@ -84,6 +84,7 @@ static const struct ftmap_s {

     { "CL_TYPE_SIS",          CL_TYPE_SIS          },

     { "CL_TYPE_SCRENC",       CL_TYPE_SCRENC       },

     { "CL_TYPE_GRAPHICS",     CL_TYPE_GRAPHICS     },

+    { "CL_TYPE_GIF",	    CL_TYPE_GIF         },

     { "CL_TYPE_RIFF",         CL_TYPE_RIFF         },

     { "CL_TYPE_BINHEX",       CL_TYPE_BINHEX       },

     { "CL_TYPE_TNEF",         CL_TYPE_TNEF         },

@@ -66,6 +66,7 @@ typedef enum cli_file {

     CL_TYPE_SIS,

     CL_TYPE_SCRENC,

     CL_TYPE_GRAPHICS,

+    CL_TYPE_GIF,

     CL_TYPE_RIFF,

     CL_TYPE_BINHEX,

     CL_TYPE_TNEF,

@@ -54,7 +54,7 @@ static const char *ftypes_int[] = {

     "0:0:466f723a20:Eserv mail:CL_TYPE_ANY:CL_TYPE_MAIL",

     "0:0:46726f6d20:MBox:CL_TYPE_ANY:CL_TYPE_MAIL",

     "0:0:46726f6d3a20:Exim mail:CL_TYPE_ANY:CL_TYPE_MAIL",

-    "0:0:474946:GIF:CL_TYPE_ANY:CL_TYPE_GRAPHICS",

+  "0:0:474946:GIF:CL_TYPE_ANY:CL_TYPE_GIF",

     "0:0:48692e20546869732069732074686520716d61696c2d73656e64:Qmail bounce:CL_TYPE_ANY:CL_TYPE_MAIL",

     "0:0:494433:MP3:CL_TYPE_ANY:CL_TYPE_IGNORED",

     "0:0:49545346:MS CHM:CL_TYPE_ANY:CL_TYPE_MSCHM",

new file mode 100644

@@ -0,0 +1,166 @@

+/*

+*  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+*  Copyright (C) 2011 Sourcefire, Inc.

+*

+*  Authors: Tomasz Kojm <tkojm@clamav.net>

+*

+*  This program is free software; you can redistribute it and/or modify

+*  it under the terms of the GNU General Public License version 2 as

+*  published by the Free Software Foundation.

+*

+*  This program is distributed in the hope that it will be useful,

+*  but WITHOUT ANY WARRANTY; without even the implied warranty of

+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+*  GNU General Public License for more details.

+*

+*  You should have received a copy of the GNU General Public License

+*  along with this program; if not, write to the Free Software

+*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

+*  MA 02110-1301, USA.

+*/

+

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#include "gif.h"

+#include "scanners.h"

+#include "clamav.h"

+

+#ifndef HAVE_ATTRIB_PACKED

+#define __attribute__(x)

+#endif

+#ifdef HAVE_PRAGMA_PACK

+#pragma pack(1)

+#endif

+#ifdef HAVE_PRAGMA_PACK_HPPA

+#pragma pack 1

+#endif

+

+struct gif_screen_desc {

+    uint16_t width;

+    uint16_t height;

+    uint8_t flags;

+    uint8_t bgcolor;

+    uint8_t aspect;

+} __attribute__((packed));

+

+struct gif_graphic_control_ext {

+    uint8_t blksize;

+    uint8_t flags;

+    uint16_t delaytime;

+    uint8_t tcoloridx;

+    uint8_t blkterm;

+} __attribute__((packed));

+

+struct gif_image_desc {

+    uint16_t leftpos;

+    uint16_t toppos;

+    uint16_t width;

+    uint16_t height;

+    uint8_t flags;

+} __attribute__((packed));

+

+#ifdef HAVE_PRAGMA_PACK

+#pragma pack()

+#endif

+#ifdef HAVE_PRAGMA_PACK_HPPA

+#pragma pack

+#endif

+

+#define EC16(x) le16_to_host(x)

+

+#define GETDATA(v)                                                  \

+    {                                                               \

+    if(fmap_readn(map, &v, offset, sizeof(v)) == sizeof(v)) {       \

+	    offset += sizeof(v);                                        \

+    } else {                                                        \

+	    cli_errmsg("cli_parsegif: Can't read file (truncated?)\n"); \

+	    return CL_EPARSE;                                           \

+    }                                                               \

+    }

+

+int cli_parsegif(cli_ctx *ctx)

+{

+    fmap_t *map = *ctx->fmap;

+    unsigned char v = 0;

+    unsigned int offset = 6;

+    struct gif_screen_desc screen_desc;

+    struct gif_image_desc image_desc;

+    int retVal = CL_SUCCESS;

+

+    cli_dbgmsg("in cli_parsegif()\n");

+

+    GETDATA(screen_desc);

+    cli_dbgmsg("GIF: Screen size %ux%u, gctsize: %u\n", EC16(screen_desc.width), EC16(screen_desc.height), screen_desc.flags & 0x7);

+    if (screen_desc.flags & 0x80)

+        offset += 3 * (1 << ((screen_desc.flags & 0x7) + 1));

+

+    while (1) {

+        GETDATA(v);

+        if (v == 0x21) {

+            GETDATA(v);

+            if (v == 0xf9) {

+                offset += sizeof(struct gif_graphic_control_ext);

+            }

+            else {

+                while (1) {

+                    GETDATA(v);

+                    if (!v)

+                        break;

+

+                    if (offset + v > map->len)

+                    {

+                        retVal = CL_EPARSE;

+                        goto scan_overlay;

+                    }

+                    offset += v;

+                }

+            }

+        }

+        else if (v == 0x2c) {

+            GETDATA(image_desc);

+            cli_dbgmsg("GIF: Image size %ux%u, left pos: %u, top pos: %u\n", EC16(image_desc.width), EC16(image_desc.height), EC16(image_desc.leftpos), EC16(image_desc.toppos));

+

+            offset++;

+            if (image_desc.flags & 0x80)

+                offset += 3 * (1 << ((image_desc.flags & 0x7) + 1));

+

+            while (1) {

+                GETDATA(v);

+                if (!v)

+                    break;

+

+                if (offset + v > map->len)

+                {

+                    retVal = CL_EPARSE;

+                    goto scan_overlay;

+                }

+                offset += v;

+            }

+        }

+        else if (v == 0x3b) {

+            break;

+        }

+        else {

+            // An unknown code: break.

+            retVal = CL_EPARSE;

+            goto scan_overlay;

+        }

+    }

+

+scan_overlay:

+    // Some recovery (I saw some "GIF89a;" or things like this)

+    if (retVal == CL_EPARSE &&

+        offset == (6 + sizeof(screen_desc) + 1))

+        offset = 6;

+

+    // Is there an overlay?

+    if (offset < map->len)

+    {

+        int recRetVal = cli_map_scan(map, offset, map->len - offset, ctx, CL_TYPE_ANY);

+        retVal = recRetVal != CL_SUCCESS ? recRetVal : retVal;

+    }

+

+    return retVal;

+}

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,29 @@

+/*

+ *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2011 Sourcefire, Inc.

+ *

+ *  Authors: Tomasz Kojm <tkojm@clamav.net>

+ *

+ *  This program is free software; you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License version 2 as

+ *  published by the Free Software Foundation.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

+ *  MA 02110-1301, USA.

+ */

+

+#ifndef __GIF_H

+#define __GIF_H

+

+#include "others.h"

+

+int cli_parsegif(cli_ctx *ctx);

+

+#endif

@@ -37,13 +37,11 @@

 #include "jpeg.h"

 #include "clamav.h"

-#define EC16(x) le16_to_host(x)

-

 #define GETBYTE(v)                                                         \

     if (fmap_readn(map, &v, offset, sizeof(v)) == sizeof(v)) {             \

         offset += sizeof(v);                                               \

     } else {                                                               \

-        cli_errmsg("cli_parse(jpeg|gif): Can't read file (corrupted?)\n"); \

+	cli_errmsg("cli_parsejpeg: Can't read file (corrupted?)\n");	\

         return CL_EPARSE;                                                  \

     }

@@ -204,99 +202,3 @@ int cli_parsejpeg(cli_ctx *ctx)

     }

     return CL_SUCCESS;

 }

-

-/* GIF */

-

-struct gif_screen_desc {

-    uint16_t width;

-    uint16_t height;

-    uint8_t flags;

-    uint8_t bgcolor;

-    uint8_t aspect;

-};

-

-struct gif_graphic_control_ext {

-    uint8_t blksize;

-    uint8_t flags;

-    uint16_t delaytime;

-    uint8_t tcoloridx;

-    uint8_t blkterm;

-};

-

-struct gif_image_desc {

-    uint16_t leftpos;

-    uint16_t toppos;

-    uint16_t width;

-    uint16_t height;

-    uint8_t flags;

-};

-

-int cli_parsegif(cli_ctx *ctx)

-{

-    fmap_t *map = *ctx->fmap;

-    unsigned char magic[6], v;

-    unsigned int offset = 0, have_gce = 0;

-    struct gif_screen_desc screen_desc;

-    struct gif_graphic_control_ext graphic_control_ext;

-    struct gif_image_desc image_desc;

-

-    cli_dbgmsg("in cli_parsegif()\n");

-

-    if (fmap_readn(map, magic, offset, 6) != 6)

-        return CL_SUCCESS; /* Ignore */

-

-    if (!memcmp(magic, "GIF87a", 6) || !memcmp(magic, "GIF89a", 6))

-        offset = 6;

-    else

-        return CL_SUCCESS; /* Not a GIF file */

-

-    if (fmap_readn(map, &screen_desc, offset, sizeof(screen_desc)) != sizeof(screen_desc)) {

-        cli_warnmsg("cli_parsegif: Can't read Logical Screen Descriptor block\n");

-        return CL_EPARSE;

-    }

-    offset += 7;

-

-    cli_dbgmsg("GIF: Screen size %ux%u, gctsize: %u\n", EC16(screen_desc.width), EC16(screen_desc.height), screen_desc.flags & 0x7);

-    if (screen_desc.flags & 0x80)

-        offset += 3 * (1 << ((screen_desc.flags & 0x7) + 1));

-

-    while (1) {

-        GETBYTE(v);

-        if (v == 0x21) {

-            GETBYTE(v);

-            if (v == 0xf9) {

-                if (fmap_readn(map, &graphic_control_ext, offset, sizeof(graphic_control_ext)) != sizeof(graphic_control_ext)) {

-                    cli_warnmsg("cli_parsegif: Can't read Graphic Control Extension block\n");

-                    return CL_EPARSE;

-                }

-                if (have_gce) {

-                    cli_warnmsg("cli_parsegif: Multiple Graphic Control Extension blocks not allowed\n");

-                    return CL_EPARSE;

-                }

-                have_gce = 1;

-                offset += sizeof(graphic_control_ext);

-                if (graphic_control_ext.blksize != 4 || graphic_control_ext.blkterm) {

-                    cli_warnmsg("cli_parsegif: Invalid Graphic Control Extension block\n");

-                    return CL_EPARSE;

-                }

-            } else {

-                while (1) {

-                    GETBYTE(v);

-                    if (!v)

-                        break;

-                    offset += v;

-                }

-            }

-        } else if (v == 0x2c) {

-            if (fmap_readn(map, &image_desc, offset, sizeof(image_desc)) != sizeof(image_desc)) {

-                cli_warnmsg("cli_parsegif: Can't read Image Descriptor block\n");

-                return CL_EPARSE;

-            }

-            offset += 9;

-            cli_dbgmsg("GIF: Image size %ux%u, left pos: %u, top pos: %u\n", EC16(image_desc.width), EC16(image_desc.height), EC16(image_desc.leftpos), EC16(image_desc.toppos));

-            break;

-        }

-    }

-

-    return CL_SUCCESS;

-}

@@ -25,6 +25,5 @@

 #include "others.h"

 int cli_parsejpeg(cli_ctx *ctx);

-int cli_parsegif(cli_ctx *ctx);

 #endif

@@ -93,6 +93,7 @@

 #include "events.h"

 #include "swf.h"

 #include "jpeg.h"

+#include "gif.h"

 #include "png.h"

 #include "iso9660.h"

 #include "dmg.h"

@@ -3809,6 +3810,11 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)

             break;

+    case CL_TYPE_GIF:

+        if(SCAN_HEURISTICS)

+            ret = cli_parsegif(ctx);

+        break;

+

         case CL_TYPE_PDF: /* FIXMELIMITS: pdf should be an archive! */

             if (SCAN_PARSE_PDF && (DCONF_DOC & DOC_CONF_PDF))

                 ret = cli_scanpdf(ctx, 0);

@@ -333,6 +333,7 @@

     <ClCompile Include="..\libclamav\filtering.c" />

     <ClCompile Include="..\libclamav\fmap.c" />

     <ClCompile Include="..\libclamav\fsg.c" />

+    <ClCompile Include="..\libclamav\gif.c" />

     <ClCompile Include="..\libclamav\gpt.c" />

     <ClCompile Include="..\libclamav\hashtab.c" />

     <ClCompile Include="..\libclamav\hfsplus.c" />