Skip to content

Protection from StringIndexOutOfBoundsException #1933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public ParseTree visitString(BSLParser.StringContext ctx) {
for (Token token : ctx.getTokens()) {

// бывает несколько токенов строки в одной строе файла
// добавляем часть строки только в случае находления ее на другой строке файла
// добавляем часть строки только в случае нахождения ее на другой строке файла
if (token.getLine() != prevTokenLine && prevTokenLine != -1) {
strings.add(partString);
partString = "";
Expand All @@ -116,7 +116,11 @@ public ParseTree visitString(BSLParser.StringContext ctx) {
// если новый токен строки находится на той же строке файла, что и предыдущий, то добавляем его к ней
if (token.getLine() == prevTokenLine && prevTokenLine != -1) {
var newString = getString(startLine, token);
partString = newString.substring(partString.length());
if (newString.length() > partString.length()) {
partString = newString.substring(partString.length());
} else {
partString = "";
}
} else {
partString = getString(startLine, token);
}
Expand Down