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

Re: [PATCH] Index out of bounds when applying a patch

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-01-30 09:37:27 CET

On 1/29/06, Tobias Schäfer <tobiasschaefer@gmx.de> wrote:

> when applying a patch TortoiseMerge crashed.
>
> I've managed to reduce the patch file which contained several files to
> bug.patch (just ignore the content). This crashes TortoiseMerge when applying
> the patch to revision 5576.
>
> I debugged TortoiseMerge and noticed an index out of bound. The attached patch
> out-of-bounds.patch prevents the crash. Since I don't fully understand the
> code, please review.

Reviewed, it's ok.

> btw, TortoiseMerge inserts unnecessary empty lines in the conflicted file, but
> seems to be by design.

Not really. If you can prevent it from adding those empty lines at the
end of a file, be my guest :)

> May I commit?

Yes, please do!

Stefan

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jan 30 09:38:31 2006

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.