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 021d8c9e1a9d · 2024-12-02T17:05:00.000+02:00
diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
@@ -1113,7 +1113,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)
 		{
@@ -6886,7 +6886,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
`@@ -1113,7 +1113,7 @@ namespace Jrd`
`1113`	`1113`	`memset(this, 0, reinterpret_cast<char>(&this->dpb_user_name) - reinterpret_cast<char>(this));`
`1114`	`1114`	`}`
`1115`	`1115`
`1116`		`- void get(const UCHAR*, USHORT, bool&);`
	`1116`	`+ void get(const UCHAR*, FB_SIZE_T, bool&);`
`1117`	`1117`
`1118`	`1118`	`void setBuffers(RefPtr<const Config> config)`
`1119`	`1119`	`{`
`@@ -6886,7 +6886,7 @@ namespace`
`6886`	`6886`	`}`
`6887`	`6887`	`} // anonymous`
`6888`	`6888`
`6889`		`-void DatabaseOptions::get(const UCHAR* dpb, USHORT dpb_length, bool& invalid_client_SQL_dialect)`
	`6889`	`+void DatabaseOptions::get(const UCHAR* dpb, FB_SIZE_T dpb_length, bool& invalid_client_SQL_dialect)`
`6890`	`6890`	`{`
`6891`	`6891`	`/**************************************`
`6892`	`6892`	`*`