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 3d5a765e1bc3 · 2024-12-02T16:54:45.000+02:00
diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
@@ -1133,7 +1133,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)
 		{
@@ -6801,7 +6801,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
`@@ -1133,7 +1133,7 @@ namespace Jrd`
`1133`	`1133`	`memset(this, 0, reinterpret_cast<char>(&this->dpb_user_name) - reinterpret_cast<char>(this));`
`1134`	`1134`	`}`
`1135`	`1135`
`1136`		`- void get(const UCHAR*, USHORT, bool&);`
	`1136`	`+ void get(const UCHAR*, FB_SIZE_T, bool&);`
`1137`	`1137`
`1138`	`1138`	`void setBuffers(RefPtr<const Config> config)`
`1139`	`1139`	`{`
`@@ -6801,7 +6801,7 @@ namespace`
`6801`	`6801`	`}`
`6802`	`6802`	`} // anonymous`
`6803`	`6803`
`6804`		`-void DatabaseOptions::get(const UCHAR* dpb, USHORT dpb_length, bool& invalid_client_SQL_dialect)`
	`6804`	`+void DatabaseOptions::get(const UCHAR* dpb, FB_SIZE_T dpb_length, bool& invalid_client_SQL_dialect)`
`6805`	`6805`	`{`
`6806`	`6806`	`/**************************************`
`6807`	`6807`	`*`