Skip to content

Potential fix for code scanning alert no. 22: Use of externally-controlled format string #3041

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.

Sign up for GitHub

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

Closed
cgivre wants to merge 1 commit into from
+9 −1
Closed

Potential fix for code scanning alert no. 22: Use of externally-controlled format string #3041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion common/src/main/java/org/apache/drill/common/exceptions/UserException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.io.File;
import java.io.FileWriter;
import java.lang.management.ManagementFactory;
import java.util.Arrays;

import org.apache.drill.exec.proto.CoordinationProtos;
import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
Expand Down Expand Up @@ -507,9 +508,16 @@ public Builder message(final String format, final Object... args) {
// we can't replace the message of a user exception
if (uex == null && format != null) {
if (args.length == 0) {
// No arguments: treat the provided text as the full message.
message = format;
} else {
message = String.format(format, args);
// Avoid treating user-controlled input as a format string. Instead,
// append the argument values in a simple, predictable way.
StringBuilder sb = new StringBuilder(format);
sb.append(" [");
sb.append(Arrays.toString(args));
sb.append(']');
message = sb.toString();
}
}
return this;
Expand Down
Loading