Skip to contentSkip to conversation

zlib: add watchdog reset call

PATCH New Giuseppe CONDORELLI 2 participants 2 messages Jul 29, 2009 – Aug 11, 2009

lore
Share & tools
lore

Giuseppe CONDORELLI

author
#0 lore raw

PATCH v4 2/2 zlib: add watchdog reset call

This patch adds watchdog reset call to allow its invokation during decompression phase. This control was present on old zlib version and here it is backported for those relevant routines. This patch is sent as a zlib separate one beacuse it was not tested due to specific board lack.
zlib patches will be unified just in one when this will be validated through tests.

Signed-off-by Giuseppe Condorelli <[email protected]>
---
 lib_generic/zlib.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
lib_generic/zlib.c +7 -1
index 49fb145..6a78dc9 100644
@@ -1040,6 +1040,8 @@ z_streamp strm;
     state->hold = 0;
     state->bits = 0;
     state->lencode = state->distcode = state->next = state->codes;
+    if (strm->outcb != Z_NULL)
+	(*strm->outcb)(Z_NULL, 0);
     Tracev((stderr, "inflate: reset\n"));
     return Z_OK;
 }

@@ -1950,7 +1952,11 @@ z_streamp strm;
     if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
         return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
-    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    if (state->window != Z_NULL) {
+	if (strm->outcb != Z_NULL)
+		(*strm->outcb)(Z_NULL, 0);
+	ZFREE(strm, state->window);
+    }
     ZFREE(strm, strm->state);
     strm->state = Z_NULL;
     Tracev((stderr, "inflate: end\n"));
Signature · 1 line
1.6.0.6
Applied
#1 lore raw

PATCH v4 2/2 zlib: add watchdog reset call

Dear Giuseppe CONDORELLI,

Quoted 11 lines · In message <[email protected]> you…

This patch adds watchdog reset call to allow its invokation during decompression phase. This control was present on old zlib version and here it is backported for those relevant routines. This patch is sent as a zlib separate one beacuse it was not tested due to specific board lack.
zlib patches will be unified just in one when this will be validated through tests.

Signed-off-by Giuseppe Condorelli <[email protected]>
---
 lib_generic/zlib.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I'd rather be led to hell than managed to heaven.