@@ -1,3 +1,11 @@

+Tue Feb  5 20:06:28 EET 2008 (edwin)

+------------------------------------

+  * libclamav/lzma_iface.[ch], nsis/nulsft.c:

+	* don't include both zlib and  LzmaTypes.h (bb #805)

+	* fixes build failure with non-system zlib

+	* move declaration of CLI_LZMA into lzma_iface.c

+	* allocate CLI_LZMA* in lzma_iface.c

+

 Mon Feb  4 23:20:12 EET 2008 (edwin)

 ------------------------------------

   * libclamav/scanners, filetypes, dconf:

@@ -21,10 +21,35 @@

 #include "lzma_iface.h"

+#include "LzmaStateDecode.h"

 #include "cltypes.h"

+

+/* we don't need zlib, and zlib defines Byte, that lzma also defines.

+ * Enabling prefixes for zlib types avoids problems, and since

+ * we don't call any zlib functions here avoids unresolved symbols too */

+#define Z_PREFIX

 #include "others.h"

-int cli_LzmaInit(CLI_LZMA *L, uint64_t size_override) {

+struct CLI_LZMA_tag {

+  CLzmaDecoderState state;

+  unsigned char *next_in;

+  SizeT avail_in;

+  unsigned char *next_out;

+  SizeT avail_out;

+  int initted;

+  uint64_t usize;

+};

+

+int cli_LzmaInit(CLI_LZMA **Lp, uint64_t size_override) {

+  CLI_LZMA *L = *Lp;

+

+  if(!L) {

+	  *Lp = L = cli_calloc(sizeof(*L), 1);

+	  if(!L) {

+		  return CL_EMEM;

+	  }

+  }

+

   L->initted = 0;

   if(size_override) L->usize=size_override;

@@ -55,19 +80,38 @@ int cli_LzmaInit(CLI_LZMA *L, uint64_t size_override) {

   return LZMA_RESULT_OK;

 }

-void cli_LzmaShutdown(CLI_LZMA *L) {

-  if(!L->initted) return;

-  if(L->state.Probs) free(L->state.Probs);

-  if(L->state.Dictionary) free(L->state.Dictionary);

+void cli_LzmaShutdown(CLI_LZMA **Lp) {

+  CLI_LZMA *L;

+

+  if(!Lp) return;

+  L = *Lp;

+  if(L->initted) {

+    if(L->state.Probs) free(L->state.Probs);

+    if(L->state.Dictionary) free(L->state.Dictionary);

+  }

+  free(L);

+  *Lp = NULL;

   return;

 }

-int cli_LzmaDecode(CLI_LZMA *L) {

+int cli_LzmaDecode(CLI_LZMA **Lp, struct stream_state* state) {

   int res;

   SizeT processed_in, processed_out;

+  CLI_LZMA* L = *Lp;

+

+  if(L) {

+	  L->avail_in = state->avail_in;

+	  L->next_in = state->next_in;

+	  L->avail_out = state->avail_out;

+	  L->next_out = state->next_out;

+  }

+

+  if (!L || !L->initted) {

+	  if(cli_LzmaInit(Lp, 0) != LZMA_RESULT_OK)

+		  return LZMA_RESULT_DATA_ERROR;

+	  L = *Lp;

+  }

-  if (!L->initted && cli_LzmaInit(L, 0) != LZMA_RESULT_OK) 

-    return LZMA_RESULT_DATA_ERROR;

   res = LzmaDecode(&L->state, L->next_in, L->avail_in, &processed_in, L->next_out, L->avail_out, &processed_out, (L->avail_in==0));

@@ -76,5 +120,10 @@ int cli_LzmaDecode(CLI_LZMA *L) {

   L->next_out += processed_out;

   L->avail_out -= processed_out;

+  state->avail_in = L->avail_in;

+  state->next_in = L->next_in;

+  state->avail_out = L->avail_out;

+  state->next_out = L->next_out;

+

   return res;

 }

@@ -22,23 +22,22 @@

 #ifndef __LZMA_IFACE_H

 #define __LZMA_IFACE_H

-

-#include "LzmaStateDecode.h"

 #include "cltypes.h"

-typedef struct {

-  CLzmaDecoderState state;

-  const unsigned char *next_in;

-  SizeT avail_in;

-  unsigned char *next_out;

-  SizeT avail_out;

-  int initted;

-  uint64_t usize;

-} CLI_LZMA;

+typedef struct CLI_LZMA_tag CLI_LZMA;

+

+struct stream_state {

+	uint32_t avail_in;

+	unsigned char *next_in;

+	uint32_t avail_out;

+	unsigned char *next_out;

+};

-int cli_LzmaInit(CLI_LZMA *, uint64_t);

-void cli_LzmaShutdown(CLI_LZMA *);

-int cli_LzmaDecode(CLI_LZMA *);

+int cli_LzmaInit(CLI_LZMA **, uint64_t);

+void cli_LzmaShutdown(CLI_LZMA **);

+int cli_LzmaDecode(CLI_LZMA **, struct stream_state*);

 #define LZMA_STREAM_END 2

+#define LZMA_RESULT_OK 0

+#define LZMA_RESULT_DATA_ERROR 1

 #endif /* __LZMA_IFACE_H */

@@ -71,14 +71,9 @@ struct nsis_st {

   uint8_t solid;

   uint8_t freecomp;

   uint8_t eof;

-  struct {

-    uint32_t avail_in;

-    unsigned char *next_in;

-    uint32_t avail_out;

-    unsigned char *next_out;

-  } nsis;

+  struct stream_state nsis;

   nsis_bzstream bz;

-  CLI_LZMA lz;

+  CLI_LZMA* lz;

   z_stream z;

   unsigned char *freeme;

   char ofn[1024];

@@ -98,7 +93,6 @@ static int nsis_init(struct nsis_st *n) {

     n->freecomp=1;

     break;

   case COMP_LZMA:

-    memset(&n->lz, 0, sizeof(CLI_LZMA));

     cli_LzmaInit(&n->lz, 0xffffffffffffffffULL);

     n->freecomp=1;

     break;

@@ -150,21 +144,13 @@ static int nsis_decomp(struct nsis_st *n) {

     n->nsis.next_out = n->bz.next_out;

     break;

   case COMP_LZMA:

-    n->lz.avail_in = n->nsis.avail_in;

-    n->lz.next_in = n->nsis.next_in;

-    n->lz.avail_out = n->nsis.avail_out;

-    n->lz.next_out = n->nsis.next_out;

-    switch (cli_LzmaDecode(&n->lz)) {

+    switch (cli_LzmaDecode(&n->lz, &n->nsis)) {

     case LZMA_RESULT_OK:

       ret = CL_SUCCESS;

       break;

     case LZMA_STREAM_END:

       ret = CL_BREAK;

     }

-    n->nsis.avail_in = n->lz.avail_in;

-    n->nsis.next_in = n->lz.next_in;

-    n->nsis.avail_out = n->lz.avail_out;

-    n->nsis.next_out = n->lz.next_out;

     break;

   case COMP_ZLIB:

     n->z.avail_in = n->nsis.avail_in;