1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-34755 g++- -Wstringop-truncation due to safe_strcpy()

Browse Source 
The #pragma that was removed in
commit e255837eaf90e72eaf122d88b30011db17f7ecf2 (MDEV-34266)
turns out to be necessary for silencing all cases of
-Wstringop-truncation.
This commit is contained in:
Marko Mäkelä 2024-08-14 08:43:08 +03:00
parent b304ec3030
commit ecd910ae3a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/m_string.h
View File

@ -255,9 +255,20 @@ static inline void safe_strcpy(char *dst, size_t dst_size, const char *src)
* *
* 2) IF there is no 0 byte in the first dst_size bytes of src, strncpy will * 2) IF there is no 0 byte in the first dst_size bytes of src, strncpy will
* copy dst_size bytes, and the final byte won't be 0. * copy dst_size bytes, and the final byte won't be 0.
*
* In GCC 8+, the `-Wstringop-truncation` warning may object to strncpy()
* being used in this way, so we need to disable this warning for this
* single statement.
*/ */
#if defined __GNUC__ && __GNUC__ >= 8
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-truncation"
#endif
strncpy(dst, src, dst_size); strncpy(dst, src, dst_size);
#if defined __GNUC__ && __GNUC__ >= 8
#pragma GCC diagnostic pop
#endif
dst[dst_size - 1]= 0; dst[dst_size - 1]= 0;
} }