Merge pull request #296 from wravery/json-double-fallback

wravery · web-flow · commit f1d2a1f3c759 · 2024-04-23T16:29:24.000-07:00
Fallback to parsing out-of-bounds 32-bit integers in JSON as doubles
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.3
       with:
         submodules: true
 
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -9,15 +9,15 @@ jobs:
       matrix:
         config: [Debug, Release]
 
-    runs-on: macos-latest
+    runs-on: macos-13
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.3
       with:
         submodules: true
 
     - name: Cache vcpkg
-      uses: actions/cache@v3
+      uses: actions/cache@v4.0.2
       id: cache-vcpkg
       with:
         path: build/vcpkg_cache/
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.3
       with:
         submodules: true
 
@@ -24,7 +24,7 @@ jobs:
       run: echo "vcpkg_triplet=${{ matrix.arch }}-windows$(if ('${{ matrix.libs }}' -eq 'static') { '-static' })" >> $env:GITHUB_OUTPUT
 
     - name: Cache vcpkg
-      uses: actions/cache@v3
+      uses: actions/cache@v4.0.2
       id: cache-vcpkg
       with:
         path: build/vcpkg_cache/
diff --git a/cmake/version.txt b/cmake/version.txt
@@ -1 +1 @@
-4.5.5
+4.5.6
diff --git a/include/graphqlservice/internal/Version.h b/include/graphqlservice/internal/Version.h
@@ -10,11 +10,11 @@
 
 namespace graphql::internal {
 
-constexpr std::string_view FullVersion { "4.5.5" };
+constexpr std::string_view FullVersion { "4.5.6" };
 
 constexpr size_t MajorVersion = 4;
 constexpr size_t MinorVersion = 5;
-constexpr size_t PatchVersion = 5;
+constexpr size_t PatchVersion = 6;
 
 } // namespace graphql::internal
 
diff --git a/res/ClientGen.rc b/res/ClientGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,5,0
-#define GRAPHQL_RC_VERSION_STR "4.5.5"
+#define GRAPHQL_RC_VERSION     4,5,6,0
+#define GRAPHQL_RC_VERSION_STR "4.5.6"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/SchemaGen.rc b/res/SchemaGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,5,0
-#define GRAPHQL_RC_VERSION_STR "4.5.5"
+#define GRAPHQL_RC_VERSION     4,5,6,0
+#define GRAPHQL_RC_VERSION_STR "4.5.6"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlclient_version.rc b/res/graphqlclient_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,5,0
-#define GRAPHQL_RC_VERSION_STR "4.5.5"
+#define GRAPHQL_RC_VERSION     4,5,6,0
+#define GRAPHQL_RC_VERSION_STR "4.5.6"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqljson_version.rc b/res/graphqljson_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,5,0
-#define GRAPHQL_RC_VERSION_STR "4.5.5"
+#define GRAPHQL_RC_VERSION     4,5,6,0
+#define GRAPHQL_RC_VERSION_STR "4.5.6"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlpeg_version.rc b/res/graphqlpeg_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,5,0
-#define GRAPHQL_RC_VERSION_STR "4.5.5"
+#define GRAPHQL_RC_VERSION     4,5,6,0
+#define GRAPHQL_RC_VERSION_STR "4.5.6"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlresponse_version.rc b/res/graphqlresponse_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,5,0
-#define GRAPHQL_RC_VERSION_STR "4.5.5"
+#define GRAPHQL_RC_VERSION     4,5,6,0
+#define GRAPHQL_RC_VERSION_STR "4.5.6"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlservice_version.rc b/res/graphqlservice_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,5,0
-#define GRAPHQL_RC_VERSION_STR "4.5.5"
+#define GRAPHQL_RC_VERSION     4,5,6,0
+#define GRAPHQL_RC_VERSION_STR "4.5.6"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/src/JSONResponse.cpp b/src/JSONResponse.cpp
@@ -132,21 +132,21 @@ struct ResponseHandler : rapidjson::BaseReaderHandler<rapidjson::UTF8<>, Respons
 		if (i > static_cast<unsigned int>(std::numeric_limits<int>::max()))
 		{
 			// https://spec.graphql.org/October2021/#sec-Int
-			throw std::overflow_error("GraphQL only supports 32-bit signed integers");
+			return Double(static_cast<double>(i));
 		}
 		return Int(static_cast<int>(i));
 	}
 
-	bool Int64(int64_t /*i*/)
+	bool Int64(int64_t i)
 	{
 		// https://spec.graphql.org/October2021/#sec-Int
-		throw std::overflow_error("GraphQL only supports 32-bit signed integers");
+		return Double(static_cast<double>(i));
 	}
 
-	bool Uint64(uint64_t /*i*/)
+	bool Uint64(uint64_t i)
 	{
 		// https://spec.graphql.org/October2021/#sec-Int
-		throw std::overflow_error("GraphQL only supports 32-bit signed integers");
+		return Double(static_cast<double>(i));
 	}
 
 	bool Double(double d)

Original file line number	Diff line number	Diff line change
`@@ -132,21 +132,21 @@ struct ResponseHandler : rapidjson::BaseReaderHandler<rapidjson::UTF8<>, Respons`
`132`	`132`	`if (i > static_cast<unsigned int>(std::numeric_limits<int>::max()))`
`133`	`133`	`{`
`134`	`134`	`// https://spec.graphql.org/October2021/#sec-Int`
`135`		`- throw std::overflow_error("GraphQL only supports 32-bit signed integers");`
	`135`	`+ return Double(static_cast<double>(i));`
`136`	`136`	`}`
`137`	`137`	`return Int(static_cast<int>(i));`
`138`	`138`	`}`
`139`	`139`
`140`		`- bool Int64(int64_t /i/)`
	`140`	`+ bool Int64(int64_t i)`
`141`	`141`	`{`
`142`	`142`	`// https://spec.graphql.org/October2021/#sec-Int`
`143`		`- throw std::overflow_error("GraphQL only supports 32-bit signed integers");`
	`143`	`+ return Double(static_cast<double>(i));`
`144`	`144`	`}`
`145`	`145`
`146`		`- bool Uint64(uint64_t /i/)`
	`146`	`+ bool Uint64(uint64_t i)`
`147`	`147`	`{`
`148`	`148`	`// https://spec.graphql.org/October2021/#sec-Int`
`149`		`- throw std::overflow_error("GraphQL only supports 32-bit signed integers");`
	`149`	`+ return Double(static_cast<double>(i));`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`bool Double(double d)`