fix(tests): CodeQL issues

This commit is contained in:
Günter Obiltschnig
2024-11-16 21:54:16 +01:00
parent a106ebd1f1
commit ea4b07a77d
2 changed files with 26 additions and 26 deletions

View File

@@ -96,9 +96,9 @@ void SecureStreamSocketTest::testSendReceive()
std::string data("hello, world"); std::string data("hello, world");
ss1.sendBytes(data.data(), static_cast<int>(data.size())); ss1.sendBytes(data.data(), static_cast<int>(data.size()));
char buffer[8192]; char buffer[8192];
int n = ss1.receiveBytes(buffer, sizeof(buffer)); int rc = ss1.receiveBytes(buffer, sizeof(buffer));
assertTrue (n > 0); assertTrue (rc > 0);
assertTrue (std::string(buffer, n) == data); assertTrue (std::string(buffer, rc) == data);
const std::vector<std::size_t> sizes = {67, 467, 7883, 19937}; const std::vector<std::size_t> sizes = {67, 467, 7883, 19937};
for (const auto n: sizes) for (const auto n: sizes)
@@ -108,7 +108,7 @@ void SecureStreamSocketTest::testSendReceive()
std::string received; std::string received;
while (received.size() < n) while (received.size() < n)
{ {
int rc = ss1.receiveBytes(buffer, sizeof(buffer)); rc = ss1.receiveBytes(buffer, sizeof(buffer));
if (rc > 0) if (rc > 0)
{ {
received.append(buffer, rc); received.append(buffer, rc);
@@ -166,24 +166,24 @@ void SecureStreamSocketTest::testNB()
char buffer[8192]; char buffer[8192];
const std::vector<std::size_t> sizes = {67, 467, 7883, 19937}; const std::vector<std::size_t> sizes = {67, 467, 7883, 19937};
for (const auto n: sizes) for (const auto s: sizes)
{ {
std::string data(n, 'X'); std::string data(s, 'X');
int rc = ss1.sendBytes(data.data(), static_cast<int>(data.size())); ss1.sendBytes(data.data(), static_cast<int>(data.size()));
assertTrue (rc == n);
rc = -1; int rc;
while (rc < 0) do
{ {
rc = ss1.receiveBytes(buffer, sizeof(buffer), MSG_PEEK); rc = ss1.receiveBytes(buffer, sizeof(buffer), MSG_PEEK);
} }
assertTrue (rc > 0 && rc <= n); while (rc < 0);
assertTrue (rc > 0 && rc <= s);
assertTrue (data.compare(0, rc, buffer, rc) == 0); assertTrue (data.compare(0, rc, buffer, rc) == 0);
std::string received; std::string received;
while (received.size() < n) while (received.size() < s)
{ {
int rc = ss1.receiveBytes(buffer, sizeof(buffer)); rc = ss1.receiveBytes(buffer, sizeof(buffer));
if (rc > 0) if (rc > 0)
{ {
received.append(buffer, rc); received.append(buffer, rc);

View File

@@ -96,9 +96,9 @@ void SecureStreamSocketTest::testSendReceive()
std::string data("hello, world"); std::string data("hello, world");
ss1.sendBytes(data.data(), static_cast<int>(data.size())); ss1.sendBytes(data.data(), static_cast<int>(data.size()));
char buffer[8192]; char buffer[8192];
int n = ss1.receiveBytes(buffer, sizeof(buffer)); int rc = ss1.receiveBytes(buffer, sizeof(buffer));
assertTrue (n > 0); assertTrue (rc > 0);
assertTrue (std::string(buffer, n) == data); assertTrue (std::string(buffer, rc) == data);
const std::vector<std::size_t> sizes = {67, 467, 7883, 19937}; const std::vector<std::size_t> sizes = {67, 467, 7883, 19937};
for (const auto n: sizes) for (const auto n: sizes)
@@ -108,7 +108,7 @@ void SecureStreamSocketTest::testSendReceive()
std::string received; std::string received;
while (received.size() < n) while (received.size() < n)
{ {
int rc = ss1.receiveBytes(buffer, sizeof(buffer)); rc = ss1.receiveBytes(buffer, sizeof(buffer));
if (rc > 0) if (rc > 0)
{ {
received.append(buffer, rc); received.append(buffer, rc);
@@ -166,24 +166,24 @@ void SecureStreamSocketTest::testNB()
char buffer[8192]; char buffer[8192];
const std::vector<std::size_t> sizes = {67, 467, 7883, 19937}; const std::vector<std::size_t> sizes = {67, 467, 7883, 19937};
for (const auto n: sizes) for (const auto s: sizes)
{ {
std::string data(n, 'X'); std::string data(s, 'X');
int rc = ss1.sendBytes(data.data(), static_cast<int>(data.size())); ss1.sendBytes(data.data(), static_cast<int>(data.size()));
assertTrue (rc == n);
rc = -1; int rc;
while (rc < 0) do
{ {
rc = ss1.receiveBytes(buffer, sizeof(buffer), MSG_PEEK); rc = ss1.receiveBytes(buffer, sizeof(buffer), MSG_PEEK);
} }
assertTrue (rc > 0 && rc <= n); while (rc < 0);
assertTrue (rc > 0 && rc <= s);
assertTrue (data.compare(0, rc, buffer, rc) == 0); assertTrue (data.compare(0, rc, buffer, rc) == 0);
std::string received; std::string received;
while (received.size() < n) while (received.size() < s)
{ {
int rc = ss1.receiveBytes(buffer, sizeof(buffer)); rc = ss1.receiveBytes(buffer, sizeof(buffer));
if (rc > 0) if (rc > 0)
{ {
received.append(buffer, rc); received.append(buffer, rc);