Make sure strings in old login structure have correct size

freddy77 · freddy77 · commit ceaf62bd9e6c · 2024-06-22T09:03:41.000+01:00
Old strings inside login packet have a structure with a
single byte as size at the end, make sure the length can
fit into a single byte.

Signed-off-by: Frediano Ziglio &lt;freddy77@gmail.com&gt;
diff --git a/src/tds/login.c b/src/tds/login.c
@@ -757,13 +757,18 @@ tds_connect_and_login(TDSSOCKET * tds, TDSLOGIN * login)
 	return tds_connect(tds, login, &oserr);
 }
 
-static int
+static void
 tds_put_login_string(TDSSOCKET * tds, const char *buf, int n)
 {
 	const int buf_len = buf ? (int)strlen(buf) : 0;
-	return tds_put_buf(tds, (const unsigned char *) buf, n, buf_len);
+	tds_put_buf(tds, (const unsigned char *) buf, n, buf_len);
 }
 
+#define tds_put_login_string(tds, buf, n) do { \
+	TDS_COMPILE_CHECK(range, (n) > 0 && (n) < 256); \
+	tds_put_login_string(tds, buf, (n)); \
+} while(0)
+
 static TDSRET
 tds_send_login(TDSSOCKET * tds, const TDSLOGIN * login)
 {

Original file line number	Diff line number	Diff line change
`@@ -757,13 +757,18 @@ tds_connect_and_login(TDSSOCKET * tds, TDSLOGIN * login)`
`757`	`757`	`return tds_connect(tds, login, &oserr);`
`758`	`758`	`}`
`759`	`759`
`760`		`-static int`
	`760`	`+static void`
`761`	`761`	`tds_put_login_string(TDSSOCKET * tds, const char *buf, int n)`
`762`	`762`	`{`
`763`	`763`	`const int buf_len = buf ? (int)strlen(buf) : 0;`
`764`		`- return tds_put_buf(tds, (const unsigned char *) buf, n, buf_len);`
	`764`	`+ tds_put_buf(tds, (const unsigned char *) buf, n, buf_len);`
`765`	`765`	`}`
`766`	`766`
	`767`	`+#define tds_put_login_string(tds, buf, n) do { \`
	`768`	`+ TDS_COMPILE_CHECK(range, (n) > 0 && (n) < 256); \`
	`769`	`+ tds_put_login_string(tds, buf, (n)); \`
	`770`	`+} while(0)`
	`771`	`+`
`767`	`772`	`static TDSRET`
`768`	`773`	`tds_send_login(TDSSOCKET * tds, const TDSLOGIN * login)`
`769`	`774`	`{`