Fix conversion warnings in validation

+ constexpr + fix possible out of bounds issue

Author: mrotteveel

src/jrd/val.h

@@ -49,7 +49,7 @@ class VaryingString : public pool_alloc_rpt<SCHAR, type_str>
 	UCHAR str_data[2];			// one byte for ALLOC and one for the NULL
 };
 
-const ULONG MAX_RECORD_SIZE	= 65535;
+inline constexpr ULONG MAX_RECORD_SIZE = 65535;
 
 namespace Jrd {
 
@@ -269,10 +269,10 @@ struct impure_value_ex : public impure_value
 	blb* vlu_blob;
 };
 
-const int VLU_computed		= 1;	// An invariant sub-query has been computed
-const int VLU_null			= 2;	// An invariant sub-query computed to null
-const int VLU_checked		= 4;	// Constraint already checked in first read or assignment to argument/variable
-const int VLU_initialized	= 8;	// Variable initialized
+inline constexpr int VLU_computed		= 1;	// An invariant sub-query has been computed
+inline constexpr int VLU_null			= 2;	// An invariant sub-query computed to null
+inline constexpr int VLU_checked		= 4;	// Constraint already checked in first read or assignment to argument/variable
+inline constexpr int VLU_initialized	= 8;	// Variable initialized
 
 
 class Format : public pool_alloc<type_fmt>

src/jrd/val_proto.h

@@ -27,16 +27,16 @@
 bool VAL_validate(Jrd::thread_db*, USHORT);
 int VAL_service(Firebird::UtilSvc*);
 
-const int IN_SW_VAL_TAB_INCL		= 1;
-const int IN_SW_VAL_TAB_EXCL		= 2;
-const int IN_SW_VAL_IDX_INCL		= 3;
-const int IN_SW_VAL_IDX_EXCL		= 4;
-const int IN_SW_VAL_LOCK_TIMEOUT	= 5;
-const int IN_SW_VAL_DATABASE		= 6;
-const int IN_SW_VAL_SCH_INCL		= 7;
-const int IN_SW_VAL_SCH_EXCL		= 8;
+inline constexpr int IN_SW_VAL_TAB_INCL		= 1;
+inline constexpr int IN_SW_VAL_TAB_EXCL		= 2;
+inline constexpr int IN_SW_VAL_IDX_INCL		= 3;
+inline constexpr int IN_SW_VAL_IDX_EXCL		= 4;
+inline constexpr int IN_SW_VAL_LOCK_TIMEOUT	= 5;
+inline constexpr int IN_SW_VAL_DATABASE		= 6;
+inline constexpr int IN_SW_VAL_SCH_INCL		= 7;
+inline constexpr int IN_SW_VAL_SCH_EXCL		= 8;
 
-static const Switches::in_sw_tab_t val_option_in_sw_table[] =
+static inline constexpr Switches::in_sw_tab_t val_option_in_sw_table[] =
 {
 	{IN_SW_VAL_SCH_INCL,		isc_spb_val_sch_incl,		"SCH_INCLUDE",	0, 0, 0, false,	false,	0,	5, NULL},
 	{IN_SW_VAL_SCH_EXCL,		isc_spb_val_sch_excl,		"SCH_EXCLUDE",	0, 0, 0, false,	false,	0,	5, NULL},

src/jrd/validation.cpp

@@ -598,7 +598,7 @@ static SimilarToRegex* createPatternMatcher(thread_db* tdbb, const char* pattern
 	{
 		if (pattern)
 		{
-			const int len = strlen(pattern);
+			const FB_SIZE_T len = fb_strlen(pattern);
 
 			//// TODO: Should this be different than trace and replication
 			//// and use case sensitive matcher?
@@ -1152,7 +1152,7 @@ Validation::RTN Validation::corrupt(int err_code, const jrd_rel* relation, ...)
 			fprintf(stdout, "LOG:\tDatabase: %s\n\t%s\n", fn, s.c_str());
 	}
 #endif
-	if (vdr_msg_table[err_code].error)
+	if (err_code >= VAL_MAX_ERROR || vdr_msg_table[err_code].error)
 	{
 		++vdr_errors;
 		s.insert(0, "Error: ");

src/jrd/validation.h

@@ -56,11 +56,11 @@ class Validation
 public:
 	// vdr_flags
 
-	static const USHORT VDR_online = 0x01;		// online validation (no exclusive attachment)
-	static const USHORT VDR_update = 0x02;		// fix simple things
-	static const USHORT VDR_repair = 0x04;		// fix non-simple things (-mend)
-	static const USHORT VDR_records = 0x08;		// Walk all records
-	static const USHORT VDR_partial = 0x10;		// Walk only (some) relations
+	static inline constexpr USHORT VDR_online = 0x01;		// online validation (no exclusive attachment)
+	static inline constexpr USHORT VDR_update = 0x02;		// fix simple things
+	static inline constexpr USHORT VDR_repair = 0x04;		// fix non-simple things (-mend)
+	static inline constexpr USHORT VDR_records = 0x08;		// Walk all records
+	static inline constexpr USHORT VDR_partial = 0x10;		// Walk only (some) relations
 
 private: