Fixed #7488: Invalid real to string cast

(cherry picked from commit 6ada476)
FirebirdSQL · Mar 9, 2023 · 8ceae56 · 8ceae56
1 parent 9356f87
commit 8ceae56
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/jrd/cvt.cpp b/src/jrd/cvt.cpp
@@ -274,8 +274,6 @@ UCHAR CVT_get_numeric(const UCHAR* string, const USHORT length, SSHORT* scale, v
 	if ((local_scale > MAX_SCHAR) || (local_scale < MIN_SCHAR))
 		over = true;
 
-	*scale = local_scale;
-
 	if ((!over) && ((p < end) ||		// there is an exponent
 		((value < 0) && (sign != -1)))) // MAX_SINT64+1 wrapped around
 	{
@@ -285,6 +283,8 @@ UCHAR CVT_get_numeric(const UCHAR* string, const USHORT length, SSHORT* scale, v
 			return dtype_double;
 	}
 
+	*scale = local_scale;
+
 	if (over)
 	{
 		thread_db* tdbb = JRD_get_thread_data();