summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-10 11:47:21 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-10 11:47:21 +0000
commit8a20407442efa0f9fe43e1b1c61140a0771c6ff8 (patch)
treebbf0328ea060ca5986c92f45c7feacecf014be7a /source3/smbd
parent4703248a8e7287b738fa82edfd91fb2b13e7c222 (diff)
downloadsamba-8a20407442efa0f9fe43e1b1c61140a0771c6ff8.tar.gz
samba-8a20407442efa0f9fe43e1b1c61140a0771c6ff8.tar.bz2
samba-8a20407442efa0f9fe43e1b1c61140a0771c6ff8.zip
Cleanups: (merge from HEAD)
- use safe_strcpy() instead of pstrcpy() for malloc()ed strings - CUPS: a failure in an attempt to automaticly add a printer is not level 0 stuff. - Fix up a possible Realloc() failure segfault Andrew Bartlett (This used to be commit c1cfc296c2efdb2b5972202146e80f0e3b6a3da4)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/dir.c2
-rw-r--r--source3/smbd/statcache.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 9e8de2979b..e022d26ea3 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -907,7 +907,7 @@ void *OpenDir(connection_struct *conn, const char *name, BOOL use_veto)
dirp->current = dirp->data;
}
- pstrcpy(dirp->data+used,n);
+ safe_strcpy(dirp->data+used,n, dirp->mallocsize - used - 1);
used += l;
dirp->numentries++;
}
diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 93782b9bb0..f4b613428a 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -122,8 +122,8 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
DEBUG(0,("stat_cache_add: Out of memory !\n"));
return;
}
- pstrcpy(scp->names, orig_name);
- pstrcpy(scp->names+namelen+1, translated_path);
+ safe_strcpy(scp->names, orig_name, namelen);
+ safe_strcpy(scp->names+namelen+1, translated_path, namelen);
scp->name_len = namelen;
hash_insert(&stat_cache, (char *)scp, orig_name);
}