httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dean Gaudet <dgau...@hyperreal.org>
Subject cvs commit: apache/src CHANGES mod_mime_magic.c
Date Sun, 27 Jul 1997 02:34:47 GMT
dgaudet     97/07/26 19:34:47

  Modified:    src       CHANGES mod_mime_magic.c
  Log:
  fix seg fault if there is an error decompressing
  
  PR:		904
  Submitted by:	Martin Kraemer <Martin.Kraemer@mch.sni.de>
  Reviewed by:	Dean Gaudet
  
  Revision  Changes    Path
  1.367     +3 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.366
  retrieving revision 1.367
  diff -u -r1.366 -r1.367
  --- CHANGES	1997/07/26 20:16:23	1.366
  +++ CHANGES	1997/07/27 02:34:42	1.367
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3a2
   
  +  *) mod_mime_magic would core dump if there was a decompression error.
  +     [Martin Kraemer <Martin.Kraemer@mch.sni.de>] PR#904
  +
     *) PORT: some variants of DGUX require -lsocket -lnsl
        [Alexander L Jones <alex@systems-options.co.uk>] PR#732
   
  
  
  
  1.8       +3 -3      apache/src/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_mime_magic.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_mime_magic.c	1997/07/25 07:00:56	1.7
  +++ mod_mime_magic.c	1997/07/27 02:34:44	1.8
  @@ -2193,7 +2193,7 @@
       },
       {
           "\037\213", 2, {
  -            "gzip", "-dq", NULL
  +	    "gzip", "-dcq", NULL
           }, 1, "x-gzip"
       },
       /*
  @@ -2202,7 +2202,7 @@
        */
       {
           "\037\036", 2, {
  -            "gzip", "-dq", NULL
  +	    "gzip", "-dcq", NULL
           }, 0, "x-gzip"
       },
   };
  @@ -2226,7 +2226,7 @@
       if (i == ncompr)
           return 0;
   
  -    if ((newsize = uncompress(r, i, buf, &newbuf, nbytes)) != 0) {
  +    if ((newsize = uncompress(r, i, buf, &newbuf, nbytes)) > 0) {
           tryit(r, newbuf, newsize);
   
           /* set encoding type in the request record */
  
  
  

Mime
View raw message