[PATCH] Index out of bounds when applying a patch

Hi,

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.

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

May I commit?

Tobias

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org