sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-31 22:02:58 +03:00
Code Activity

s3-safe_string: Add checked_strlcpy()

Browse Source 
This is strlcpy, just with an extra check of the parameters with
sizeof(), use only where that works.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Mar 23 03:39:35 CET 2011 on sn-devel-104
This commit is contained in:
Andrew Bartlett
2011-03-22 21:03:59 +11:00
parent 1d22c3919d
commit d73db405f7
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source3/include/safe_string.h
View File

@ -144,6 +144,17 @@ size_t __unsafe_string_function_usage_here_char__(void);
? __unsafe_string_function_usage_here_size_t__() \ ? __unsafe_string_function_usage_here_size_t__() \
: srvstr_push_fn(base_ptr, smb_flags2, dest, src, dest_len, flags)) : srvstr_push_fn(base_ptr, smb_flags2, dest, src, dest_len, flags))
/* This allows the developer to choose to check the arguments to
strlcpy. if the compiler will optimize out function calls, then
use this to tell if we are have the correct size buffer (this works only
where sizeof() returns the size of the buffer, not the size of the
pointer), so stack and static variables only */
#define checked_strlcpy(dest, src, size) \
(sizeof(dest) != (size) \
? __unsafe_string_function_usage_here_size_t__() \
: strlcpy(dest, src, size))
#else #else
#define safe_strcpy safe_strcpy_fn #define safe_strcpy safe_strcpy_fn
@ -153,6 +164,7 @@ size_t __unsafe_string_function_usage_here_char__(void);
#define clistr_push clistr_push_fn #define clistr_push clistr_push_fn
#define clistr_pull clistr_pull_fn #define clistr_pull clistr_pull_fn
#define srvstr_push srvstr_push_fn #define srvstr_push srvstr_push_fn
#define checked_strlcpy strlcpy
#endif #endif

2
source3/smbd/negprot.c
View File

@ -238,7 +238,7 @@ DATA_BLOB negprot_spnego(TALLOC_CTX *ctx, struct smbd_server_connection *sconn)
memset(blob_out.data, '\0', 16); memset(blob_out.data, '\0', 16);
safe_strcpy(unix_name, global_myname(), sizeof(unix_name)-1); checked_strlcpy(unix_name, global_myname(), sizeof(unix_name));
strlower_m(unix_name); strlower_m(unix_name);
push_ascii_nstring(dos_name, unix_name); push_ascii_nstring(dos_name, unix_name);
safe_strcpy((char *)blob_out.data, dos_name, 16); safe_strcpy((char *)blob_out.data, dos_name, 16);