]> source.dussan.org Git - jgit.git/commitdiff
[findBugs] Use UTF-8 to read git-rebase-todo file 23/97023/3
authorMatthias Sohn <matthias.sohn@sap.com>
Sat, 13 May 2017 16:56:03 +0000 (18:56 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 15 May 2017 08:29:47 +0000 (10:29 +0200)
Change-Id: I7c6f71e13ef106678157eae1aa3f9d39712e577b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoFile.java

index 1047a6df99b5a1462c326bbaa5f5aa208af4b8bd..c4923a359e17df7976d3847e14f0982dca853fe5 100644 (file)
@@ -43,6 +43,8 @@
 
 package org.eclipse.jgit.lib;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -177,8 +179,8 @@ public class RebaseTodoFile {
                while (tokenCount < 3 && nextSpace < lineEnd) {
                        switch (tokenCount) {
                        case 0:
-                               String actionToken = new String(buf, tokenBegin, nextSpace
-                                               - tokenBegin - 1);
+                               String actionToken = new String(buf, tokenBegin,
+                                               nextSpace - tokenBegin - 1, UTF_8);
                                tokenBegin = nextSpace;
                                action = RebaseTodoLine.Action.parse(actionToken);
                                if (action == null)
@@ -186,14 +188,14 @@ public class RebaseTodoFile {
                                break;
                        case 1:
                                nextSpace = RawParseUtils.next(buf, tokenBegin, ' ');
-                               String commitToken = new String(buf, tokenBegin, nextSpace
-                                               - tokenBegin - 1);
+                               String commitToken = new String(buf, tokenBegin,
+                                               nextSpace - tokenBegin - 1, UTF_8);
                                tokenBegin = nextSpace;
                                commit = AbbreviatedObjectId.fromString(commitToken);
                                break;
                        case 2:
-                               return new RebaseTodoLine(action, commit, RawParseUtils.decode(
-                                               buf, tokenBegin, 1 + lineEnd));
+                               return new RebaseTodoLine(action, commit,
+                                               RawParseUtils.decode(buf, tokenBegin, 1 + lineEnd));
                        }
                        tokenCount++;
                }