Merge commit from fork

Ev3nt · bogdan.khavronin · dyemanov · commit 6e937f09157a · 2026-02-25T09:26:41.000+03:00
* vulnerability fix

* stylistic changes that make code smoother

* Revert "stylistic changes that make code smoother"

This reverts commit bea0aa89e142ed41d596c4afee4b731141cbbc8a.

* Revert "vulnerability fix"

This reverts commit c1ea7b73aad36baf3489aa182a951a1a9e5fe716.

* vulnerability fix

---------

Co-authored-by: bogdan.khavronin &lt;bogdan.khavronin@red-soft.ru&gt;
diff --git a/src/remote/server/server.cpp b/src/remote/server/server.cpp
@@ -429,6 +429,7 @@ void loginSuccess(const string& login, const string& remId)
 	remoteFailedLogins->loginSuccess(remId);
 }
 
+static const unsigned SEGMENT_DATA_SIZE = 254;
 
 template <typename T>
 static void getMultiPartConnectParameter(T& putTo, Firebird::ClumpletReader& id, UCHAR param)
@@ -458,9 +459,10 @@ static void getMultiPartConnectParameter(T& putTo, Firebird::ClumpletReader& id,
 				}
 				checkBytes[offset] = 1;
 
-				offset *= 254;
+				offset *= SEGMENT_DATA_SIZE;
 				++specData;
-				putTo.grow(offset + len);
+				if (offset + len > putTo.getCount())
+					putTo.grow(offset + len);
 				memcpy(&putTo[offset], specData, len);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -429,6 +429,7 @@ void loginSuccess(const string& login, const string& remId)`
`429`	`429`	`remoteFailedLogins->loginSuccess(remId);`
`430`	`430`	`}`
`431`	`431`
	`432`	`+static const unsigned SEGMENT_DATA_SIZE = 254;`
`432`	`433`
`433`	`434`	`template <typename T>`
`434`	`435`	`static void getMultiPartConnectParameter(T& putTo, Firebird::ClumpletReader& id, UCHAR param)`
`@@ -458,9 +459,10 @@ static void getMultiPartConnectParameter(T& putTo, Firebird::ClumpletReader& id,`
`458`	`459`	`}`
`459`	`460`	`checkBytes[offset] = 1;`
`460`	`461`
`461`		`- offset *= 254;`
	`462`	`+ offset *= SEGMENT_DATA_SIZE;`
`462`	`463`	`++specData;`
`463`		`- putTo.grow(offset + len);`
	`464`	`+ if (offset + len > putTo.getCount())`
	`465`	`+ putTo.grow(offset + len);`
`464`	`466`	`memcpy(&putTo[offset], specData, len);`
`465`	`467`	`}`
`466`	`468`	`}`