sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-23 11:33:16 +03:00
Code Activity

r25184: Fix some C++ warnings and an uninitialized variable

Browse Source 
(This used to be commit b64df8a3c5)
This commit is contained in:
Volker Lendecke
2007-09-15 20:24:35 +00:00
committed by Gerald (Jerry) Carter
parent f82eb0fef6
commit ad97bcf813
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source3/lib/charcnv.c
View File

@@ -1493,7 +1493,7 @@ static size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
/* Have we got space to append the '\0' ? */
if (size <= dest_len) {
/* No, realloc. */
dest = TALLOC_REALLOC(ctx, dest,
dest = TALLOC_REALLOC_ARRAY(ctx, dest, char,
dest_len+1);
if (!dest) {
/* talloc fail. */

2
source3/lib/util_str.c
View File

@@ -995,7 +995,7 @@ BOOL in_list(const char *s, const char *list, BOOL casesensitive)
/* We know a token can't be larger
* than the entire list. */
tok = SMB_MALLOC(bufsize+1);
tok = SMB_MALLOC_ARRAY(char, bufsize+1);
if (!tok) {
return False;
}

2
source3/smbd/msdfs.c
View File

@@ -1549,7 +1549,7 @@ struct junction_map *enum_msdfs_links(TALLOC_CTX *ctx, size_t *p_num_jn)
{
struct junction_map *jn = NULL;
int i=0;
size_t jn_count;
size_t jn_count = 0;
int sharecount = 0;
*p_num_jn = 0;

4
source3/smbd/nttrans.c
View File

@@ -634,7 +634,7 @@ void reply_ntcreate_and_X(connection_struct *conn,
*/
dir_name_len = strlen(dir_fsp->fsp_name);
fname = TALLOC_SIZE(ctx, dir_name_len+2);
fname = TALLOC_ARRAY(ctx, char, dir_name_len+2);
if (!fname) {
reply_nterror(
req, NT_STATUS_NO_MEMORY);
@@ -1392,7 +1392,7 @@ static void call_nt_transact_create(connection_struct *conn,
*/
dir_name_len = strlen(dir_fsp->fsp_name);
fname = TALLOC_SIZE(ctx, dir_name_len+2);
fname = TALLOC_ARRAY(ctx, char, dir_name_len+2);
if (!fname) {
reply_nterror(
req, NT_STATUS_NO_MEMORY);

2
source3/smbd/trans2.c
View File

@@ -4209,7 +4209,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
case SMB_QUERY_FILE_UNIX_LINK:
{
char *buffer = TALLOC_SIZE(ctx, 1024);
char *buffer = TALLOC_ARRAY(ctx, char, 1024);
if (!buffer) {
reply_nterror(req, NT_STATUS_NO_MEMORY);