Merge commit from fork

Ev3nt · bogdan.khavronin · dyemanov · commit 1b0878692148 · 2026-02-25T09:19:39.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
@@ -479,6 +479,7 @@ void loginSuccess(const string& login, const string& remId)
 	remoteFailedLogins->loginSuccess(remId);
 }
 
+static constexpr unsigned SEGMENT_DATA_SIZE = 254;
 
 template <typename T>
 static void getMultiPartConnectParameter(T& putTo, Firebird::ClumpletReader& id, UCHAR param)
@@ -508,9 +509,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
`@@ -479,6 +479,7 @@ void loginSuccess(const string& login, const string& remId)`
`479`	`479`	`remoteFailedLogins->loginSuccess(remId);`
`480`	`480`	`}`
`481`	`481`
	`482`	`+static constexpr unsigned SEGMENT_DATA_SIZE = 254;`
`482`	`483`
`483`	`484`	`template <typename T>`
`484`	`485`	`static void getMultiPartConnectParameter(T& putTo, Firebird::ClumpletReader& id, UCHAR param)`
`@@ -508,9 +509,10 @@ static void getMultiPartConnectParameter(T& putTo, Firebird::ClumpletReader& id,`
`508`	`509`	`}`
`509`	`510`	`checkBytes[offset] = 1;`
`510`	`511`
`511`		`- offset *= 254;`
	`512`	`+ offset *= SEGMENT_DATA_SIZE;`
`512`	`513`	`++specData;`
`513`		`- putTo.grow(offset + len);`
	`514`	`+ if (offset + len > putTo.getCount())`
	`515`	`+ putTo.grow(offset + len);`
`514`	`516`	`memcpy(&putTo[offset], specData, len);`
`515`	`517`	`}`
`516`	`518`	`}`