@@ -586,7 +586,6 @@ int onas_ht_add_child(struct onas_ht *ht, const char *prntpath, size_t prntlen,

 /* Adds the hierarchy under pathname to the tree and allocates all necessary memory. */

 int onas_ht_add_hierarchy(struct onas_ht *ht, const char *pathname)

 {

-

     if (!ht || !pathname) return CL_ENULLARG;

     FTS *ftsp         = NULL;

@@ -631,8 +630,10 @@ int onas_ht_add_hierarchy(struct onas_ht *ht, const char *pathname)

         if ((childlist = _priv_fts_children(ftsp, 0))) {

             do {

                 if (childlist->fts_info == FTS_D) {

-                    if (CL_EMEM == onas_add_hashnode_child(hnode, childlist->fts_name))

+                    if (CL_EMEM == onas_add_hashnode_child(hnode, childlist->fts_name)) {

+                        onas_free_hashnode(hnode);

                         return CL_EMEM;

+                    }

                 }

             } while ((childlist = childlist->fts_link));

@@ -641,7 +642,10 @@ int onas_ht_add_hierarchy(struct onas_ht *ht, const char *pathname)

         struct onas_element *elem = onas_element_init(hnode, hnode->pathname, hnode->pathlen);

         if (!elem) return CL_EMEM;

-        if (onas_ht_insert(ht, elem)) return -1;

+        if (onas_ht_insert(ht, elem)) {

+            onas_free_element(elem);

+            return CL_EMEM;

+        }

     }

     _priv_fts_close(ftsp);

@@ -1007,6 +1007,7 @@ getcvd(const char *cvdfile, const char *newfile, const char *hostname,

              strerror(errno));

         unlink(newfile2);

         free(newfile2);

+        cl_cvdfree(cvd);

         return FCE_DBDIRACCESS;

     }

     free(newfile2);

@@ -817,6 +817,7 @@ SRes XzUnpacker_Code(CXzUnpacker *p, Byte *dest, SizeT *destLen,

           else

           {

             Byte digest[SHA256_DIGEST_SIZE];

+            memset(&digest, 0, SHA256_DIGEST_SIZE);

             p->state = XZ_STATE_STREAM_INDEX_CRC;

             p->indexSize += 4;

             p->pos = 0;

@@ -87,7 +87,8 @@ int cli_7unz(cli_ctx *ctx, size_t offset)

     CSzArEx db;

     SRes res;

     UInt16 utf16buf[UTFBUFSZ], *utf16name = utf16buf;

-    int namelen = UTFBUFSZ, found = CL_CLEAN;

+    int namelen            = UTFBUFSZ;

+    cl_error_t found       = CL_CLEAN;

     Int64 begin_of_archive = offset;

     UInt32 viruses_found   = 0;

@@ -180,7 +181,9 @@ int cli_7unz(cli_ctx *ctx, size_t offset)

             }

             if (res != SZ_OK)

                 cli_dbgmsg("cli_unz: extraction failed with %d\n", res);

-            else {

+            else if ((outBuffer == NULL) || (outSizeProcessed == 0)) {

+                cli_dbgmsg("cli_unz: extracted empty file\n");

+            } else {

                 if ((found = cli_gentempfd(ctx->engine->tmpdir, &name, &fd)))

                     break;

@@ -1344,6 +1344,7 @@ uint32_t cli_bcapi_engine_scan_options(struct cli_bc_ctx *ctx)

 uint32_t cli_bcapi_engine_scan_options_ex(struct cli_bc_ctx *ctx, const uint8_t *option_name, uint32_t name_len)

 {

     uint32_t i          = 0;

+    uint32_t result     = 0;

     char *option_name_l = NULL;

     if (ctx == NULL || option_name == NULL || name_len == 0) {

@@ -1365,107 +1366,83 @@ uint32_t cli_bcapi_engine_scan_options_ex(struct cli_bc_ctx *ctx, const uint8_t

     if (strncmp(option_name_l, "general", MIN(name_len, sizeof("general")))) {

         if (cli_memstr(option_name_l, name_len, "allmatch", sizeof("allmatch"))) {

-            return (cctx->options->general & CL_SCAN_GENERAL_ALLMATCHES) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "collect metadata", sizeof("collect metadata"))) {

-            return (cctx->options->general & CL_SCAN_GENERAL_COLLECT_METADATA) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "heuristics", sizeof("heuristics"))) {

-            return (cctx->options->general & CL_SCAN_GENERAL_HEURISTICS) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "precedence", sizeof("precedence"))) {

-            return (cctx->options->general & CL_SCAN_GENERAL_HEURISTIC_PRECEDENCE) ? 1 : 0;

+            result = (cctx->options->general & CL_SCAN_GENERAL_ALLMATCHES) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "collect metadata", sizeof("collect metadata"))) {

+            result = (cctx->options->general & CL_SCAN_GENERAL_COLLECT_METADATA) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "heuristics", sizeof("heuristics"))) {

+            result = (cctx->options->general & CL_SCAN_GENERAL_HEURISTICS) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "precedence", sizeof("precedence"))) {

+            result = (cctx->options->general & CL_SCAN_GENERAL_HEURISTIC_PRECEDENCE) ? 1 : 0;

         }

         /* else unknown option */

-        return 0;

     } else if (strncmp(option_name_l, "parse", MIN(name_len, sizeof("parse")))) {

         if (cli_memstr(option_name_l, name_len, "archive", sizeof("archive"))) {

-            return (cctx->options->parse & CL_SCAN_PARSE_ARCHIVE) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "elf", sizeof("elf"))) {

-            return (cctx->options->parse & CL_SCAN_PARSE_ELF) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "pdf", sizeof("pdf"))) {

-            return (cctx->options->parse & CL_SCAN_PARSE_PDF) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "swf", sizeof("swf"))) {

-            return (cctx->options->parse & CL_SCAN_PARSE_SWF) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "hwp3", sizeof("hwp3"))) {

-            return (cctx->options->parse & CL_SCAN_PARSE_HWP3) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "xmldocs", sizeof("xmldocs"))) {

-            return (cctx->options->parse & CL_SCAN_PARSE_XMLDOCS) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "mail", sizeof("mail"))) {

-            return (cctx->options->parse & CL_SCAN_PARSE_MAIL) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "ole2", sizeof("ole2"))) {

-            return (cctx->options->parse & CL_SCAN_PARSE_OLE2) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "html", sizeof("html"))) {

-            return (cctx->options->parse & CL_SCAN_PARSE_HTML) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "pe", sizeof("pe"))) {

-            return (cctx->options->parse & CL_SCAN_PARSE_PE) ? 1 : 0;

+            result = (cctx->options->parse & CL_SCAN_PARSE_ARCHIVE) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "elf", sizeof("elf"))) {

+            result = (cctx->options->parse & CL_SCAN_PARSE_ELF) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "pdf", sizeof("pdf"))) {

+            result = (cctx->options->parse & CL_SCAN_PARSE_PDF) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "swf", sizeof("swf"))) {

+            result = (cctx->options->parse & CL_SCAN_PARSE_SWF) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "hwp3", sizeof("hwp3"))) {

+            result = (cctx->options->parse & CL_SCAN_PARSE_HWP3) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "xmldocs", sizeof("xmldocs"))) {

+            result = (cctx->options->parse & CL_SCAN_PARSE_XMLDOCS) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "mail", sizeof("mail"))) {

+            result = (cctx->options->parse & CL_SCAN_PARSE_MAIL) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "ole2", sizeof("ole2"))) {

+            result = (cctx->options->parse & CL_SCAN_PARSE_OLE2) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "html", sizeof("html"))) {

+            result = (cctx->options->parse & CL_SCAN_PARSE_HTML) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "pe", sizeof("pe"))) {

+            result = (cctx->options->parse & CL_SCAN_PARSE_PE) ? 1 : 0;

         }

         /* else unknown option */

-        return 0;

     } else if (strncmp(option_name_l, "heuristic", MIN(name_len, sizeof("heuristic")))) {

         if (cli_memstr(option_name_l, name_len, "broken", sizeof("broken"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_BROKEN) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "exceeds max", sizeof("exceeds max"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_EXCEEDS_MAX) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "phishing ssl mismatch", sizeof("phishing ssl mismatch"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_PHISHING_SSL_MISMATCH) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "phishing cloak", sizeof("phishing cloak"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_PHISHING_CLOAK) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "macros", sizeof("macros"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_MACROS) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "encrypted archive", sizeof("encrypted archive"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_ENCRYPTED_ARCHIVE) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "encrypted doc", sizeof("encrypted doc"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_ENCRYPTED_DOC) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "partition intxn", sizeof("partition intxn"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_PARTITION_INTXN) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "structured", sizeof("structured"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_STRUCTURED) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "structured ssn normal", sizeof("structured ssn normal"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_STRUCTURED_SSN_NORMAL) ? 1 : 0;

-        }

-        if (cli_memstr(option_name_l, name_len, "structured ssn stripped", sizeof("structured ssn stripped"))) {

-            return (cctx->options->heuristic & CL_SCAN_HEURISTIC_STRUCTURED_SSN_STRIPPED) ? 1 : 0;

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_BROKEN) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "exceeds max", sizeof("exceeds max"))) {

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_EXCEEDS_MAX) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "phishing ssl mismatch", sizeof("phishing ssl mismatch"))) {

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_PHISHING_SSL_MISMATCH) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "phishing cloak", sizeof("phishing cloak"))) {

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_PHISHING_CLOAK) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "macros", sizeof("macros"))) {

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_MACROS) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "encrypted archive", sizeof("encrypted archive"))) {

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_ENCRYPTED_ARCHIVE) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "encrypted doc", sizeof("encrypted doc"))) {

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_ENCRYPTED_DOC) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "partition intxn", sizeof("partition intxn"))) {

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_PARTITION_INTXN) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "structured", sizeof("structured"))) {

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_STRUCTURED) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "structured ssn normal", sizeof("structured ssn normal"))) {

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_STRUCTURED_SSN_NORMAL) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "structured ssn stripped", sizeof("structured ssn stripped"))) {

+            result = (cctx->options->heuristic & CL_SCAN_HEURISTIC_STRUCTURED_SSN_STRIPPED) ? 1 : 0;

         }

         /* else unknown option */

-        return 0;

     } else if (strncmp(option_name_l, "mail", MIN(name_len, sizeof("mail")))) {

         if (cli_memstr(option_name_l, name_len, "partial message", sizeof("partial message"))) {

-            return (cctx->options->mail & CL_SCAN_MAIL_PARTIAL_MESSAGE) ? 1 : 0;

+            result = (cctx->options->mail & CL_SCAN_MAIL_PARTIAL_MESSAGE) ? 1 : 0;

         }

         /* else unknown option */

-        return 0;

     } else if (strncmp(option_name_l, "dev", MIN(name_len, sizeof("dev")))) {

         if (cli_memstr(option_name_l, name_len, "collect sha", sizeof("collect sha"))) {

-            return (cctx->options->dev & CL_SCAN_DEV_COLLECT_SHA) ? 1 : 0;

+            result = (cctx->options->dev & CL_SCAN_DEV_COLLECT_SHA) ? 1 : 0;

+        } else if (cli_memstr(option_name_l, name_len, "collect performance info", sizeof("collect performance info"))) {

+            result = (cctx->options->dev & CL_SCAN_DEV_COLLECT_PERFORMANCE_INFO) ? 1 : 0;

         }

-        if (cli_memstr(option_name_l, name_len, "collect performance info", sizeof("collect performance info"))) {

-            return (cctx->options->dev & CL_SCAN_DEV_COLLECT_PERFORMANCE_INFO) ? 1 : 0;

-        }

-        /* else unknown option */

-        return 0;

-    } else {

         /* else unknown option */

-        return 0;

     }

+    /* else unknown option */

+

+done:

+    if (NULL != option_name_l)

+        free(option_name_l);

+

+    return result;

 }

 uint32_t cli_bcapi_engine_db_options(struct cli_bc_ctx *ctx)

@@ -624,6 +624,7 @@ static inline int parsehwp3_docsummary(cli_ctx *ctx, off_t offset)

             b64           = cli_calloc(1, b64len);

             if (!b64) {

                 cli_errmsg("HWP3.x: Failed to allocate memory for b64 boolean\n");

+                free(str);

                 return CL_EMEM;

             }

             snprintf(b64, b64len, "%s_base64", hwp3_docsummary_fields[i].name);

@@ -3104,8 +3104,10 @@ rfc2047(const char *in)

         /*cli_dbgmsg("Need to decode '%s' with method '%c'\n", enctext, encoding);*/

         m = messageCreate();

-        if (m == NULL)

+        if (m == NULL) {

+            free(enctext);

             break;

+        }

         messageAddStr(m, enctext);

         free(enctext);

         switch (encoding) {

@@ -575,7 +575,7 @@ void messageAddArguments(message *m, const char *s)

             if (!data) {

                 cli_dbgmsg("Can't parse header \"%s\" - if you believe this file contains a missed virus, report it to bugs@clamav.net\n", s);

-                free((char *)key);

+                free(kcopy);

                 return;

             }

@@ -489,6 +489,7 @@ void mpool_destroy(struct MP *mp)

     struct MPMAP *mpm_next = mp->u.mpm.next, *mpm;

     size_t mpmsize;

+    spam("Destroying map @%p\n", mp);

     while ((mpm = mpm_next)) {

         mpmsize  = mpm->size;

         mpm_next = mpm->next;

@@ -510,7 +511,6 @@ void mpool_destroy(struct MP *mp)

 #else

     VirtualFree(mp, 0, MEM_RELEASE);

 #endif

-    spam("Map destroyed @%p\n", mp);

 }

 void mpool_flush(struct MP *mp)

@@ -137,6 +137,7 @@ ole2_convert_utf(summary_ctx_t *sctx, char *begin, size_t sz, const char *encodi

             outbuf = (char *)cli_realloc(outbuf, sz2 + 1);

             if (!outbuf) {

                 free(buf);

+                iconv_close(cd);

                 return NULL;

             }

@@ -487,8 +488,11 @@ ole2_process_property(summary_ctx_t *sctx, unsigned char *databuf, uint32_t offs

                 snprintf(b64jstr, PROPSTRLIMIT, "%s_base64", sctx->propname);

                 ret = cli_jsonbool(sctx->summary, b64jstr, 1);

-                if (ret != CL_SUCCESS)

+                if (ret != CL_SUCCESS) {

+                    free(outstr);

+                    free(outstr2);

                     return ret;

+                }

             }

             ret = cli_jsonstr(sctx->summary, sctx->propname, outstr2);

@@ -369,6 +369,11 @@ int cli_writen(int fd, const void *buff, unsigned int count)

     unsigned int todo;

     const unsigned char *current;

+    if (!buff) {

+        cli_errmsg("cli_writen: invalid NULL buff argument\n");

+        return -1;

+    }

+

     todo    = count;

     current = (const unsigned char *)buff;

@@ -3072,6 +3072,12 @@ cl_error_t pdf_find_and_extract_objs(struct pdf_struct *pdf, uint32_t *alerts)

     uint32_t badobjects = 0;

     cli_ctx *ctx        = pdf->ctx;

+    if (NULL == pdf || NULL == alerts) {

+        cli_errmsg("pdf_find_and_extract_objs: Invalid arguments.\n");

+        status = CL_EARG;

+        goto done;

+    }

+

     /* parse PDF and find obj offsets */

     while (CL_BREAK != (rv = pdf_findobj(pdf))) {

         if (rv == CL_EMEM) {

@@ -3109,7 +3115,7 @@ cl_error_t pdf_find_and_extract_objs(struct pdf_struct *pdf, uint32_t *alerts)

          * a password to decrypt */

         status = cli_append_virus(pdf->ctx, "Heuristics.Encrypted.PDF");

         if (status == CL_VIRUS) {

-            alerts++;

+            *alerts++;

             if (SCAN_ALLMATCHES)

                 status = CL_CLEAN;

         }

@@ -3119,7 +3125,7 @@ cl_error_t pdf_find_and_extract_objs(struct pdf_struct *pdf, uint32_t *alerts)

         status = run_pdf_hooks(pdf, PDF_PHASE_PARSED, -1, -1);

         cli_dbgmsg("pdf_find_and_extract_objs: (parsed hooks) returned %d\n", status);

         if (status == CL_VIRUS) {

-            alerts++;

+            *alerts++;

             if (SCAN_ALLMATCHES) {

                 status = CL_CLEAN;

             }

@@ -3147,7 +3153,7 @@ cl_error_t pdf_find_and_extract_objs(struct pdf_struct *pdf, uint32_t *alerts)

                 status = CL_CLEAN;

                 break;

             case CL_VIRUS:

-                alerts++;

+                *alerts++;

                 if (SCAN_ALLMATCHES) {

                     status = CL_CLEAN;

                 }

@@ -109,7 +109,7 @@ size_t pdf_decodestream(

 {

     struct pdf_token *token = NULL;

     size_t bytes_scanned    = 0;

-    cli_ctx *ctx            = pdf->ctx;

+    cli_ctx *ctx            = NULL;

     if (!status) {

         /* invalid args, and no way to pass back the status code */

@@ -122,6 +122,8 @@ size_t pdf_decodestream(

         goto done;

     }

+    ctx = pdf->ctx;

+

     if (!stream || !streamlen || fout < 0) {

         cli_dbgmsg("pdf_decodestream: no filters or stream on obj %u %u\n", obj->id >> 8, obj->id & 0xff);

         *status = CL_ENULLARG;

@@ -149,7 +151,6 @@ size_t pdf_decodestream(

     token->content = cli_malloc(streamlen);

     if (!token->content) {

-        free(token);

         *status = CL_EMEM;

         goto done;

     }

@@ -224,7 +225,7 @@ static size_t pdf_decodestream_internal(

     cl_error_t vir       = CL_CLEAN;

     cl_error_t retval    = CL_SUCCESS;

     size_t bytes_scanned = 0;

-    cli_ctx *ctx         = pdf->ctx;

+    cli_ctx *ctx         = NULL;

     const char *filter   = NULL;

     int i;

@@ -239,6 +240,7 @@ static size_t pdf_decodestream_internal(

         goto done;

     }

+    ctx     = pdf->ctx;

     *status = CL_SUCCESS;

     /*

@@ -350,7 +352,7 @@ static size_t pdf_decodestream_internal(

         }

     }

-    if (token->success > 0) {

+    if ((token->success > 0) && (NULL != token->content)) {

         /*

          * Looks like we successfully decoded some or all of the stream filters,

          * so lets write it out to a file descriptor we scan.

@@ -3552,6 +3552,7 @@ static int load_oneyara(YR_RULE *rule, int chkpua, struct cl_engine *engine, uns

                 engine->test_root = (struct cli_matcher *)mpool_calloc(engine->mempool, 1, sizeof(struct cli_matcher));

                 if (!engine->test_root) {

                     cli_errmsg("load_oneyara[verify]: cannot allocate memory for test cli_matcher\n");

+                    free(substr);

                     return CL_EMEM;

                 }

 #ifdef USE_MPOOL

@@ -3559,6 +3560,7 @@ static int load_oneyara(YR_RULE *rule, int chkpua, struct cl_engine *engine, uns

 #endif

                 if ((ret = cli_ac_init(engine->test_root, engine->ac_mindepth, engine->ac_maxdepth, engine->dconf->other & OTHER_CONF_PREFILTERING))) {

                     cli_errmsg("load_oneyara: cannot initialize test ac root\n");

+                    free(substr);

                     return ret;

                 }

             }

@@ -3569,6 +3571,7 @@ static int load_oneyara(YR_RULE *rule, int chkpua, struct cl_engine *engine, uns

                 tsig = (struct cli_ac_lsig *)mpool_calloc(engine->mempool, 1, sizeof(struct cli_ac_lsig));

                 if (!tsig) {

                     cli_errmsg("load_oneyara: cannot allocate memory for test lsig\n");

+                    free(substr);

                     return CL_EMEM;

                 }

@@ -3583,6 +3586,7 @@ static int load_oneyara(YR_RULE *rule, int chkpua, struct cl_engine *engine, uns

                     root->ac_lsigs--;

                     cli_errmsg("load_oneyara: cannot allocate test root->ac_lsigtable\n");

                     mpool_free(engine->mempool, tsig);

+                    free(substr);

                     return CL_EMEM;

                 }

@@ -267,8 +267,10 @@ static struct node *parse_regex(const char *p, size_t *last)

                     return NULL;

                 /* (x) */

                 right = dup_node(v);

-                if (!right)

+                if (!right) {

+                    free(tmp);

                     return NULL;

+                }

                 /* (x)*(x) => (x)+ */

                 v = make_node(concat, tmp, right);

                 if (!v)

@@ -317,9 +317,6 @@ static cl_error_t cli_scanrar(const char *filepath, int desc, cli_ctx *ctx)

             if (0 == write(comment_fd, comment, comment_size)) {

                 cli_dbgmsg("RAR: ERROR: Failed to write to output file\n");

             } else {

-                close(comment_fd);

-                comment_fd = -1;

-

                 /* Scan the comment file */

                 status = cli_scanfile(comment_fullpath, ctx);

@@ -336,6 +333,7 @@ static cl_error_t cli_scanrar(const char *filepath, int desc, cli_ctx *ctx)

                     goto done;

                 }

             }

+            close(comment_fd);

         }

     }

@@ -3803,11 +3801,8 @@ static cl_error_t scan_common(int desc, cl_fmap_t *map, const char *filepath, co

                     if (pc_map) {

                         cli_bytecode_context_setctx(bc_ctx, &ctx);

                         rc = cli_bytecode_runhook(&ctx, ctx.engine, bc_ctx, BC_PRECLASS, pc_map);

-                        cli_bytecode_context_destroy(bc_ctx);

-

-                        if (!map)

-                            funmap(pc_map);

                     }

+                    cli_bytecode_context_destroy(bc_ctx);

                 }

                 /* backwards compatibility: scan the json string unless a virus was detected */

@@ -319,7 +319,8 @@ static int xar_scan_subdocuments(xmlTextReaderPtr reader, cli_ctx *ctx)

                         cli_dbgmsg("cli_scanxar: cli_writen error writing subdoc temporary file.\n");

                         rc = CL_EWRITE;

                     }

-                    rc = xar_cleanup_temp_file(ctx, fd, tmpname);

+                    rc      = xar_cleanup_temp_file(ctx, fd, tmpname);

+                    tmpname = NULL;

                 }

             }

@@ -428,7 +429,7 @@ int cli_scanxar(cli_ctx *ctx)

     size_t length, offset, size, at;

     int encoding;

     z_stream strm;

-    char *toc, *tmpname;

+    char *toc, *tmpname = NULL;

     xmlTextReaderPtr reader = NULL;

     int a_hash, e_hash;

     unsigned char *a_cksum = NULL, *e_cksum = NULL;

@@ -529,7 +530,8 @@ int cli_scanxar(cli_ctx *ctx)

             xar_cleanup_temp_file(ctx, fd, tmpname);

             goto exit_toc;

         }

-        rc = xar_cleanup_temp_file(ctx, fd, tmpname);

+        rc      = xar_cleanup_temp_file(ctx, fd, tmpname);

+        tmpname = NULL;

         if (rc != CL_SUCCESS)

             goto exit_toc;

     }

@@ -559,7 +561,8 @@ int cli_scanxar(cli_ctx *ctx)

         /* clean up temp file from previous loop iteration */

         if (fd > -1 && tmpname) {

-            rc = xar_cleanup_temp_file(ctx, fd, tmpname);

+            rc      = xar_cleanup_temp_file(ctx, fd, tmpname);

+            tmpname = NULL;

             if (rc != CL_SUCCESS)

                 goto exit_reader;

         }

@@ -305,12 +305,13 @@ cl_unrar_error_t unrar_peek_file_header(void* hArchive, unrar_metadata_t* file_m

     wchar_t RedirName[1024];

+    memset(&headerData, 0, sizeof(struct RARHeaderDataEx));

+

     if (NULL == hArchive || NULL == file_metadata) {

         unrar_dbgmsg("unrar_peek_file_header: Invalid arguments.\n");

         goto done;

     }

-    memset(&headerData, 0, sizeof(struct RARHeaderDataEx));

     memset(file_metadata, 0, sizeof(unrar_metadata_t));

     /*