Work around a gcc bug which causes zlib to dump core in certain

situations.  This can be removed once gcc is fixed.

Submitted by:	bde

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/libz/infcodes.c b/lib/libz/infcodes.c
index 7c5073b..5ae69b5 100644
--- a/lib/libz/infcodes.c
+++ b/lib/libz/infcodes.c
@@ -200,8 +200,13 @@ int r;
       c->mode = COPY;
     case COPY:          /* o: copying bytes in window, waiting for space */
       f = q - c->sub.copy.dist;
-      while (f < s->window)             /* modulo window size-"while" instead */
-        f += s->end - s->window;        /* of "if" handles invalid distances */
+      {
+      /* XXX work around a gcc bug. */
+      volatile inflate_blocks_statef *s1 = s;
+
+      while (f < s1->window)            /* modulo window size-"while" instead */
+        f += s1->end - s1->window;      /* of "if" handles invalid distances */
+      }
       while (c->len)
       {
         NEEDOUT