[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apreq-cvs
Subject:    cvs commit: httpd-apreq-2/src apreq_parsers.c apreq_version.h
From:       joes () apache ! org
Date:       2004-02-09 21:55:15
Message-ID: 20040209215515.54733.qmail () minotaur ! apache ! org
[Download RAW message or body]

joes        2004/02/09 13:55:15

  Modified:    src      apreq_parsers.c apreq_version.h
  Log:
  64 bit needs to cast MAX_FILE_BUCKET_LENGTH to avoid << overflow.  Also there was \
an off-by-one error in e->start when one file bucket was insufficient to hold the \
spooled brigade.  
  Revision  Changes    Path
  1.38      +2 -4      httpd-apreq-2/src/apreq_parsers.c
  
  Index: apreq_parsers.c
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/src/apreq_parsers.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- apreq_parsers.c	24 Oct 2003 22:09:52 -0000	1.37
  +++ apreq_parsers.c	9 Feb 2004 21:55:15 -0000	1.38
  @@ -710,7 +710,7 @@
       return APR_INCOMPLETE;
   }
   
  -#define MAX_FILE_BUCKET_LENGTH ( 1 << ( 6 * sizeof(apr_size_t) ) )
  +#define MAX_FILE_BUCKET_LENGTH ((apr_off_t) 1 << (6 * sizeof(apr_size_t)))
   
   APREQ_DECLARE(apr_status_t) apreq_brigade_concat(apr_pool_t *pool, 
                                                    const apreq_cfg_t *cfg,
  @@ -750,8 +750,6 @@
           if (s != APR_SUCCESS)
               return s;
   
  -        /* assert (wlen == len); */
  -
           last = apr_bucket_file_create(file, wlen, 0, pool, out->bucket_alloc);
           APR_BRIGADE_INSERT_TAIL(out, last);
       }
  @@ -762,7 +760,7 @@
           apr_bucket_copy(last, &e);
           APR_BRIGADE_INSERT_TAIL(out, e);
           e->length = 0;
  -        e->start = last->length;
  +        e->start = last->length + 1;
           last = e;
       }
       s = apreq_brigade_fwrite(f->fd, &wlen, in);
  
  
  
  1.6       +1 -1      httpd-apreq-2/src/apreq_version.h
  
  Index: apreq_version.h
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/src/apreq_version.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apreq_version.h	31 Dec 2003 16:16:46 -0000	1.5
  +++ apreq_version.h	9 Feb 2004 21:55:15 -0000	1.6
  @@ -98,7 +98,7 @@
   #define APREQ_MINOR_VERSION       0
   
   /** patch level */
  -#define APREQ_PATCH_VERSION       3
  +#define APREQ_PATCH_VERSION       4
   
   /** 
    *  This symbol is defined for internal, "development" copies of libapreq.
  
  
  


[prev in list] [next in list] [prev in thread] [next in thread]