[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit e0b41ab435f74f25f902c1d258e92be93b3173a6
Author: Török Edvin <edwin at clamav.net>
Date:   Sat Feb 27 15:35:16 2010 +0200

    Fix ishield errorpath.
    
    Don't funmap() file on error-path in is_parse_hdr, since we return CL_CLEAN
    and try to read the file and crash. And ishield.c doesn't own the fmap anyway,
    since it didn't fmap, so it mustn't funmap().

diff --git a/libclamav/ishield.c b/libclamav/ishield.c
index fa340b9..786dde7 100644
--- a/libclamav/ishield.c
+++ b/libclamav/ishield.c
@@ -500,7 +500,6 @@ static int is_parse_hdr(cli_ctx *ctx, struct IS_CABSTUFF *c) {
     objs = (struct IS_OBJECTS *)fmap_need_ptr(map, hdr + h1_data_off, sizeof(*objs));
     if(!objs) {
         cli_dbgmsg("is_parse_hdr: not enough room for OBJECTS\n");
-        funmap(map);
         return CL_CLEAN;
     }
 
@@ -508,7 +507,6 @@ static int is_parse_hdr(cli_ctx *ctx, struct IS_CABSTUFF *c) {
                h1->magic, h1->unk1, h1->unk2, h1_data_off, h1->data_sz);
     if(le32_to_host(h1->magic) != 0x28635349) {
         cli_dbgmsg("is_parse_hdr: bad magic. wrong version?\n");
-        funmap(map);
         return CL_CLEAN;
     }
 

-- 
Debian repository for ClamAV