Re: HEAD squid3/src SquidString.h,1.15,1.16 String.cci,1.11,1.12

On Mon, Feb 11, 2008, Amos Jeffries wrote:
>
> Oh &^%^%$!!
>
> Whats the Best way to undo this?
>

Commit a diff which reverts it? :)

Adrian

> Amos
>
> Amos Jeffries wrote:
> >Update of cvs.devel.squid-cache.org:/cvsroot/squid/squid3/src
> >
> >Modified Files:
> > SquidString.h String.cci
> >Log Message:
> >Several String fixes.
> >
> >- Add two missing includes when configured --disable-inline
> >- SegFault when newly allocated string set to 0-length.
> > buf_ may be NULL and buffer overruns on truncate attempt
> >
> >
> >Index: String.cci
> >===================================================================
> >RCS file: /cvsroot/squid/squid3/src/String.cci,v
> >retrieving revision 1.11
> >retrieving revision 1.12
> >diff -C2 -d -r1.11 -r1.12
> >*** String.cci 19 Jan 2008 10:50:37 -0000 1.11
> >--- String.cci 11 Feb 2008 07:08:52 -0000 1.12
> >***************
> >*** 33,36 ****
> >--- 33,38 ----
> > */
> >
> >+ #include "assert.h"
> >+
> > String::String() : size_(0), len_(0), buf_ (NULL)
> > {
> >***************
> >*** 158,161 ****
> >--- 160,167 ----
> >
> > len_ = newLength;
> >+
> >+ // buf_ may be NULL on zero-length strings.
> >+ if(len_ == 0 && buf_ == NULL) return;
> >+
> > buf_[newLength] = '\0';
> > }
> >
> >Index: SquidString.h
> >===================================================================
> >RCS file: /cvsroot/squid/squid3/src/SquidString.h,v
> >retrieving revision 1.15
> >retrieving revision 1.16
> >diff -C2 -d -r1.15 -r1.16
> >*** SquidString.h 23 Jan 2008 23:50:30 -0000 1.15
> >--- SquidString.h 11 Feb 2008 07:08:52 -0000 1.16
> >***************
> >*** 36,39 ****
> >--- 36,40 ----
> > #define SQUID_STRING_H
> >
> >+ #include "config.h"
> >
> > /* forward decls */
> >
>
>
> --
> Please use Squid 2.6STABLE17+ or 3.0STABLE1+
> There are serious security advisories out on all earlier releases.

-- 
- Xenion - http://www.xenion.com.au/ - VPS Hosting - Commercial Squid Support -
- $25/pm entry-level VPSes w/ capped bandwidth charges available in WA -