[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Bugfix: index subscription out of range

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 15 Apr 2010 19:05:11 +0200

On 15.04.2010 10:01, Dmitriy Kravtsov wrote:
> Hi,
> I accidentally introduced a bug, which can produce an index subscription
> out of range assert in std::vector
> Suppose you have 3 files:
> * file base.txt with single line.
> * file mine.txt with line from base.txt and one extra line
> * file theirs.txt with line from base.txt and at least 2 extra
> lines, different from one extra in mine.txt
> Three way diff will try to get a line ending at index, greater or equal
> to line count in a base file.
> So simple fix is in attached patch. Excuse me for this.

Thanks for the patch.
I've committed a slightly different fix in r19243.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2583994
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-15 19:05:15 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.