sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-10 12:58:35 +03:00
Code

Fix compiler warning.

Browse Source 
Added checks to panic if VFS functions are passed NULL pointers.  This
may expose some bugs that have been lurking about.  Checks can be
easily removed later.
This commit is contained in:
Tim Potter -
parent 06fce76e53
commit c33c6330e3
1 changed files with 104 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
source/smbd/vfs-wrap.c
View File

@ -21,6 +21,10 @@
#include "includes.h"
/* Check for NULL pointer parameters in vfswrap_* functions */
#define VFS_CHECK_NULL
/* We don't want to have NULL function pointers lying around. Someone
is sure to try and execute them. These stubs are used to prevent
this possibility. */
@ -28,12 +32,11 @@
int vfswrap_dummy_connect(struct vfs_connection_struct *conn, char *service,
char *user)
{
/* Do nothing */
return 0; /* Return >= 0 for success */
}
void vfswrap_dummy_disconnect(void)
{
/* Do nothing a bit more */
}
/* Disk operations */
@ -43,6 +46,14 @@ SMB_BIG_UINT vfswrap_disk_free(char *path, SMB_BIG_UINT *bsize,
{
SMB_BIG_UINT result;
#ifdef VFS_CHECK_NULL
if ((path == NULL) || (bsize == NULL) || (dfree == NULL) ||
(dsize == NULL)) {
smb_panic("NULL pointer passed to vfswrap_disk_free() function\n");
}
#endif
result = sys_disk_free(path, bsize, dfree, dsize);
return result;
}
@ -53,6 +64,12 @@ DIR *vfswrap_opendir(char *fname)
{
DIR *result;
#ifdef VFS_CHECK_NULL
if (fname == NULL) {
smb_panic("NULL pointer passed to vfswrap_opendir()\n");
}
#endif
result = opendir(fname);
return result;
}
@ -61,6 +78,12 @@ struct dirent *vfswrap_readdir(DIR *dirp)
{
struct dirent *result;
#ifdef VFS_CHECK_NULL
if (dirp == NULL) {
smb_panic("NULL pointer passed to vfswrap_readdir()\n");
}
#endif
result = readdir(dirp);
return result;
}
@ -69,6 +92,12 @@ int vfswrap_mkdir(char *path, mode_t mode)
{
int result;
#ifdef VFS_CHECK_NULL
if (path == NULL) {
smb_panic("NULL pointer passed to vfswrap_mkdir()\n");
}
#endif
result = mkdir(path, mode);
return result;
}
@ -77,6 +106,12 @@ int vfswrap_rmdir(char *path)
{
int result;
#ifdef VFS_CHECK_NULL
if (path == NULL) {
smb_panic("NULL pointer passed to vfswrap_rmdir()\n");
}
#endif
result = rmdir(path);
return result;
}
@ -85,6 +120,12 @@ int vfswrap_closedir(DIR *dirp)
{
int result;
#ifdef VFS_CHECK_NULL
if (dirp == NULL) {
smb_panic("NULL pointer passed to vfswrap_closedir()\n");
}
#endif
result = closedir(dirp);
return result;
}
@ -95,6 +136,12 @@ int vfswrap_open(char *fname, int flags, mode_t mode)
{
int result;
#ifdef VFS_CHECK_NULL
if (fname == NULL) {
smb_panic("NULL pointer passed to vfswrap_open()\n");
}
#endif
result = sys_open(fname, flags, mode);
return result;
}
@ -111,6 +158,12 @@ ssize_t vfswrap_read(int fd, char *data, size_t n)
{
ssize_t result;
#ifdef VFS_CHECK_NULL
if (data == NULL) {
smb_panic("NULL pointer passed to vfswrap_read()\n");
}
#endif
result = read(fd, data, n);
return result;
}
@ -119,6 +172,12 @@ ssize_t vfswrap_write(int fd, char *data, size_t n)
{
ssize_t result;
#ifdef VFS_CHECK_NULL
if (data == NULL) {
smb_panic("NULL pointer passed to vfswrap_write()\n");
}
#endif
result = write(fd, data, n);
return result;
}
@ -135,6 +194,12 @@ int vfswrap_rename(char *old, char *new)
{
int result;
#ifdef VFS_CHECK_NULL
if ((old == NULL) || (new == NULL)) {
smb_panic("NULL pointer passed to vfswrap_rename()\n");
}
#endif
result = rename(old, new);
return result;
}
@ -148,6 +213,12 @@ int vfswrap_stat(char *fname, SMB_STRUCT_STAT *sbuf)
{
int result;
#ifdef VFS_CHECK_NULL
if ((fname == NULL) || (sbuf == NULL)) {
smb_panic("NULL pointer passed to vfswrap_stat()\n");
}
#endif
result = sys_stat(fname, sbuf);
return result;
}
@ -156,6 +227,12 @@ int vfswrap_fstat(int fd, SMB_STRUCT_STAT *sbuf)
{
int result;
#ifdef VFS_CHECK_NULL
if (sbuf == NULL) {
smb_panic("NULL pointer passed to vfswrap_fstat()\n");
}
#endif
result = sys_fstat(fd, sbuf);
return result;
}
@ -165,6 +242,12 @@ int vfswrap_lstat(char *path,
{
int result;
#ifdef VFS_CHECK_NULL
if ((path == NULL) || (sbuf == NULL)) {
smb_panic("NULL pointer passed to vfswrap_lstat()\n");
}
#endif
result = sys_lstat(path, sbuf);
return result;
}
@ -182,6 +265,12 @@ int vfswrap_unlink(char *path)
{
int result;
#ifdef VFS_CHECK_NULL
if (path == NULL) {
smb_panic("NULL pointer passed to vfswrap_unlink()\n");
}
#endif
result = unlink(path);
return result;
}
@ -190,6 +279,12 @@ int vfswrap_chmod(char *path, mode_t mode)
{
int result;
#ifdef VFS_CHECK_NULL
if (path == NULL) {
smb_panic("NULL pointer passed to vfswrap_chmod()\n");
}
#endif
result = chmod(path, mode);
return result;
}
@ -198,6 +293,12 @@ int vfswrap_utime(char *path, struct utimbuf *times)
{
int result;
#ifdef VFS_CHECK_NULL
if ((path == NULL) || (times == NULL)) {
smb_panic("NULL pointer passed to vfswrap_utime()\n");
}
#endif
result = utime(path, times);
return result;
}