Fixed bug #8336 : Error: "Invalid clumplet buffer structure: buffer end before end of clumplet - clumplet too long (77779)" when using trusted auth

hvlad · hvlad · commit 3fcb9cfae559 · 2024-12-02T16:57:04.000+02:00
diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
@@ -1128,7 +1128,7 @@ namespace Jrd
 			memset(this, 0, reinterpret_cast<char*>(&this->dpb_user_name) - reinterpret_cast<char*>(this));
 		}
 
-		void get(const UCHAR*, USHORT, bool&);
+		void get(const UCHAR*, FB_SIZE_T, bool&);
 
 		void setBuffers(RefPtr<const Config> config)
 		{
@@ -6855,7 +6855,7 @@ namespace
 	}
 } // anonymous
 
-void DatabaseOptions::get(const UCHAR* dpb, USHORT dpb_length, bool& invalid_client_SQL_dialect)
+void DatabaseOptions::get(const UCHAR* dpb, FB_SIZE_T dpb_length, bool& invalid_client_SQL_dialect)
 {
 /**************************************
  *

Original file line number	Diff line number	Diff line change
`@@ -1128,7 +1128,7 @@ namespace Jrd`
`1128`	`1128`	`memset(this, 0, reinterpret_cast<char>(&this->dpb_user_name) - reinterpret_cast<char>(this));`
`1129`	`1129`	`}`
`1130`	`1130`
`1131`		`- void get(const UCHAR*, USHORT, bool&);`
	`1131`	`+ void get(const UCHAR*, FB_SIZE_T, bool&);`
`1132`	`1132`
`1133`	`1133`	`void setBuffers(RefPtr<const Config> config)`
`1134`	`1134`	`{`
`@@ -6855,7 +6855,7 @@ namespace`
`6855`	`6855`	`}`
`6856`	`6856`	`} // anonymous`
`6857`	`6857`
`6858`		`-void DatabaseOptions::get(const UCHAR* dpb, USHORT dpb_length, bool& invalid_client_SQL_dialect)`
	`6858`	`+void DatabaseOptions::get(const UCHAR* dpb, FB_SIZE_T dpb_length, bool& invalid_client_SQL_dialect)`
`6859`	`6859`	`{`
`6860`	`6860`	`/**************************************`
`6861`	`6861`	`*`