Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use strlcpy() instead of strncpy()

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-09-29 18:15:06 +00:00
parent 6af1459f5e
commit 8f883bffb9
6 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Base64.cc
View file

@ -203,7 +203,7 @@ int Base64Converter::Done(int* pblen, char** pbuf) {
} }
void Base64Converter::IllegalEncoding(const char* msg) { void Base64Converter::IllegalEncoding(const char* msg) {
// strncpy(error_msg, msg, sizeof(error_msg)); // strlcpy(error_msg, msg, sizeof(error_msg));
if ( conn ) if ( conn )
conn->Weird("base64_illegal_encoding", msg); conn->Weird("base64_illegal_encoding", msg);
else else

2
src/DNS_Mgr.cc
View file

@ -419,7 +419,7 @@ static void query_cb(void* arg, ares_status_t status, size_t timeouts, const are
} }
he.h_name = new char[abin_len + 1]; he.h_name = new char[abin_len + 1];
strncpy(he.h_name, reinterpret_cast<const char*>(abin), abin_len); strlcpy(he.h_name, reinterpret_cast<const char*>(abin), abin_len + 1);
he.h_name[abin_len] = 0; he.h_name[abin_len] = 0;
he.h_aliases = nullptr; he.h_aliases = nullptr;

2
src/analyzer/protocol/login/NVT.cc
View file

@ -203,7 +203,7 @@ void TelnetAuthenticateOption::RecvSubOption(u_char* data, int len) {
case AUTHENTICATION_NAME: { case AUTHENTICATION_NAME: {
char* auth_name = new char[len]; char* auth_name = new char[len];
util::safe_strncpy(auth_name, (char*)data + 1, len); strlcpy(auth_name, (char*)data + 1, len);
endp->SetAuthName(auth_name); endp->SetAuthName(auth_name);
} break; } break;

2
src/scan.l
View file

@ -93,7 +93,7 @@ const char* last_tok_filename = 0;
const char* last_last_tok_filename = 0; const char* last_last_tok_filename = 0;
char last_tok[128]; char last_tok[128];
#define YY_USER_ACTION strncpy(last_tok, yytext, sizeof(last_tok) - 1); \ #define YY_USER_ACTION strlcpy(last_tok, yytext, sizeof(last_tok)); \
last_last_tok_filename = last_tok_filename; \ last_last_tok_filename = last_tok_filename; \
last_tok_filename = ::filename; last_tok_filename = ::filename;
#define YY_USER_INIT last_tok[0] = '\0'; #define YY_USER_INIT last_tok[0] = '\0';

9
src/util.cc
View file

@ -1316,11 +1316,8 @@ char* uitoa_n(uint64_t value, char* str, int n, int base, const char* prefix) {
uint64_t v; uint64_t v;
char c; char c;
if ( prefix ) { if ( prefix )
strncpy(str, prefix, n - 1); i += strlcpy(str, prefix, n - 1);
str[n - 1] = '\0';
i += strlen(prefix);
}
if ( i >= n - 1 ) if ( i >= n - 1 )
return str; return str;
@ -2220,7 +2217,7 @@ static void strerror_r_helper(char* result, char* buf, size_t buflen) {
// Seems the GNU flavor of strerror_r may return a pointer to a static // Seems the GNU flavor of strerror_r may return a pointer to a static
// string. So try to copy as much as possible into desired buffer. // string. So try to copy as much as possible into desired buffer.
auto len = strlen(result); auto len = strlen(result);
strncpy(buf, result, buflen); strlcpy(buf, result, buflen);
if ( len >= buflen ) if ( len >= buflen )
buf[buflen - 1] = 0; buf[buflen - 1] = 0;

5
src/util.h
View file

@ -470,9 +470,8 @@ inline void* safe_malloc(size_t size) {
} }
inline char* safe_strncpy(char* dest, const char* src, size_t n) { inline char* safe_strncpy(char* dest, const char* src, size_t n) {
char* result = strncpy(dest, src, n - 1); size_t last = strlcpy(dest, src, n);
dest[n - 1] = '\0'; return &dest[last];
return result;
} }
// Memory alignment helpers. // Memory alignment helpers.