mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Use memory safe snprintf() in Connect Engine
This commit replaces sprintf(buf, ...) with snprintf(buf, sizeof(buf), ...), specifically in the "easy" cases where buf is allocated with a size known at compile time. The changes make sure we are not write outside array/string bounds which will lead to undefined behaviour. In case the code is trying to write outside bounds - safe version of functions simply cut the string messages so we process this gracefully. All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc. bsonudf.cpp warnings cleanup by Daniel Black Reviewer: Daniel Black
This commit is contained in:
committed by
Daniel Black
parent
95eb5e5a12
commit
19af1890b5
@@ -53,7 +53,7 @@ MACINFO::MACINFO(bool adap, bool fix)
|
||||
void MACINFO::MakeErrorMsg(PGLOBAL g, DWORD drc)
|
||||
{
|
||||
if (drc == ERROR_BUFFER_OVERFLOW)
|
||||
sprintf(g->Message,
|
||||
snprintf(g->Message, sizeof(g->Message),
|
||||
"GetAdaptersInfo: Buffer Overflow buflen=%d nbofadap=%d",
|
||||
Buflen, N);
|
||||
else if (drc == ERROR_INVALID_PARAMETER)
|
||||
@@ -146,7 +146,7 @@ bool MACINFO::GetFixedInfo(PGLOBAL g)
|
||||
} // endif drc
|
||||
|
||||
if (drc != ERROR_SUCCESS) {
|
||||
sprintf(g->Message, "GetNetworkParams failed. Rc=%08x\n", drc);
|
||||
snprintf(g->Message, sizeof(g->Message), "GetNetworkParams failed. Rc=%08x\n", drc);
|
||||
return true;
|
||||
} // endif drc
|
||||
|
||||
@@ -305,7 +305,7 @@ bool MACINFO::GetOneInfo(PGLOBAL g, int flag, void *v, int lv)
|
||||
n = (int)Curp->LeaseExpires;
|
||||
break;
|
||||
default:
|
||||
sprintf(g->Message, "Invalid flag value %d", flag);
|
||||
snprintf(g->Message, sizeof(g->Message), "Invalid flag value %d", flag);
|
||||
return true;
|
||||
} // endswitch flag
|
||||
|
||||
|
Reference in New Issue
Block a user