opendev/gerrit
Code Issues Proposed changes

Fix PatchScript's mapping of lines below the last edit

Browse Source 
For comments below the last edit block of a PatchScript, the formulae
to obtain the line number shifts between sides subtracted one side's
end, but added the other side's beginning (instead of also the
end). This mismatch could cause the client to fetch lines beyond a
file's end and thereby cause an ArrayIndexofBoundException.

We now use the difference of the last edit block's ends to map lines
below the last edit.

Change-Id: I67d2baa0f5ede3af7348c609034de81e8acf9c17
This commit is contained in:
Christian Aistleitner
2013-05-17 23:30:28 +02:00
parent 0979925a47
commit 490fa71cc7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java
View File

@@ -346,7 +346,7 @@ class PatchScriptBuilder {
}
final Edit last = edits.get(edits.size() - 1);
return last.getBeginB() + (a - last.getEndA());
return last.getEndB() + (a - last.getEndA());
}
private int mapB2A(final int b) {
@@ -372,7 +372,7 @@ class PatchScriptBuilder {
}
final Edit last = edits.get(edits.size() - 1);
return last.getBeginA() + (b - last.getEndB());
return last.getEndA() + (b - last.getEndB());
}
private void packContent(boolean ignoredWhitespace) {