Skip to content

Wrap NumberFormatException #3282

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

Merged
bbakerman merged 2 commits into from
Aug 8, 2023
Merged

Wrap NumberFormatException #3282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbb1579
Wrap NumberFormatException
arthurscchan Aug 4, 2023
e4e648a
Add testng test case
arthurscchan Aug 7, 2023
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
7 changes: 6 additions & 1 deletion src/main/java/graphql/parser/GraphqlAntlrToLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,12 @@ protected Value createValue(GraphqlParser.ValueWithVariableContext ctx) {
addCommonData(intValue, ctx);
return captureRuleContext(intValue.build(), ctx);
} else if (ctx.FloatValue() != null) {
FloatValue.Builder floatValue = FloatValue.newFloatValue().value(new BigDecimal(ctx.FloatValue().getText()));
FloatValue.Builder floatValue;
try {
floatValue = FloatValue.newFloatValue().value(new BigDecimal(ctx.FloatValue().getText()));
} catch (NumberFormatException e) {
throw new InvalidSyntaxException("Invalid floating point value", null, ctx.FloatValue().getText(), null, e);
}
addCommonData(floatValue, ctx);
return captureRuleContext(floatValue.build(), ctx);
} else if (ctx.BooleanValue() != null) {
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/graphql/parser/UnicodeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ public static int parseAndWriteUnicode(I18n i18n, StringWriter writer, String st
int continueIndex = isBracedEscape(string, i) ? endIndexExclusive : endIndexExclusive - 1;

String hexStr = string.substring(startIndex, endIndexExclusive);
int codePoint = Integer.parseInt(hexStr, 16);
int codePoint;
try {
codePoint = Integer.parseInt(hexStr, 16);
} catch (NumberFormatException e) {
throw new InvalidUnicodeSyntaxException(i18n, "InvalidUnicode.invalidHexString", sourceLocation, offendingToken(string, i, continueIndex));
}

if (isTrailingSurrogateValue(codePoint)) {
throw new InvalidUnicodeSyntaxException(i18n, "InvalidUnicode.trailingLeadingSurrogate", sourceLocation, offendingToken(string, i, continueIndex));
Expand Down
23 changes: 23 additions & 0 deletions src/test/java/graphql/schema/idl/SchemaParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package graphql.schema.idl;

import org.testng.annotations.Test;
import graphql.GraphQLException;

public class SchemaParserTest {

@Test
public void testNumberFormatException() {
String[] malformedStrings = {
"{B(t:66E3333333320,t:#\n66666666660)},622»» »»»6666662}}6666660t:z6666"
};

for (String malformed : malformedStrings) {
try {
SchemaParser parser = new SchemaParser();
parser.parse(malformed);
} catch (GraphQLException e) {
// Known exception
}
}
}
}