Browse Source

Merge "Fix integer overflow in DiffFormatter when context is set to large int"

stable-3.7
Shawn Pearce 10 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
66cbf9255c
  1. 8
      org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java

8
org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java

@ -737,10 +737,10 @@ public class DiffFormatter {
final int endIdx = findCombinedEnd(edits, curIdx);
final Edit endEdit = edits.get(endIdx);
int aCur = Math.max(0, curEdit.getBeginA() - context);
int bCur = Math.max(0, curEdit.getBeginB() - context);
final int aEnd = Math.min(a.size(), endEdit.getEndA() + context);
final int bEnd = Math.min(b.size(), endEdit.getEndB() + context);
int aCur = (int) Math.max(0, (long) curEdit.getBeginA() - context);
int bCur = (int) Math.max(0, (long) curEdit.getBeginB() - context);
final int aEnd = (int) Math.min(a.size(), (long) endEdit.getEndA() + context);
final int bEnd = (int) Math.min(b.size(), (long) endEdit.getEndB() + context);
writeHunkHeader(aCur, aEnd, bCur, bEnd);

Loading…
Cancel
Save