mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix some possible NULL dereferences.

Browse Source
This commit is contained in:
Andrew V. Samoilov 2002-09-13 11:29:35 +00:00
parent 40c35f02c5
commit 3bab5199aa
2 changed files with 79 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vfs/ChangeLog
View File

@ -1,5 +1,6 @@
2002-09-13 Andrew V. Samoilov <sav@bcs.zp.ua>
* (get_stat_info): Fix some possible NULL dereferences.
* smbfs.c (smbfs_set_debugf): New function to specify
logfile.
* smbfs.h: Declare smbfs_set_debugf().

63
vfs/smbfs.c
View File

@ -1333,7 +1333,7 @@ search_dir_entry (dir_entry *dentry, const char *text, struct stat *buf)
}
static int
get_stat_info (smbfs_connection *sc, char *path, struct stat *buf)
get_stat_info (smbfs_connection * sc, char *path, struct stat *buf)
{
char *p;
#if 0
@ -1342,75 +1342,84 @@ get_stat_info (smbfs_connection *sc, char *path, struct stat *buf)
const char *mypath = path;
mypath++; /* cut off leading '/' */
if ((p = strrchr(mypath, '/')))
if ((p = strrchr (mypath, '/')))
mypath = p + 1; /* advance until last file/dir name */
DEBUG(3, ("get_stat_info: mypath:%s, current_info->dirname:%s\n",
DEBUG (3, ("get_stat_info: mypath:%s, current_info->dirname:%s\n",
mypath, current_info->dirname));
#if 0
if (!dentry) {
DEBUG(1, ("No dir entries (empty dir) cached:'%s', wanted:'%s'\n", current_info->dirname, path));
DEBUG (1, ("No dir entries (empty dir) cached:'%s', wanted:'%s'\n",
current_info->dirname, path));
return -1;
}
#endif
if (!single_entry) /* when found, this will be written too */
single_entry = g_new (dir_entry, 1);
if (search_dir_entry(current_info->entries, mypath, buf) == 0) {
if (search_dir_entry (current_info->entries, mypath, buf) == 0) {
return 0;
}
/* now try to identify mypath as PARENT dir */
{
char *mdp;
char *mydir;
mdp = mydir = g_strdup(current_info->dirname);
if ((p = strrchr(mydir, '/')))
mdp = mydir = g_strdup (current_info->dirname);
if ((p = strrchr (mydir, '/')))
*p = 0; /* advance util last '/' */
if ((p = strrchr(mydir, '/')))
if ((p = strrchr (mydir, '/')))
mydir = p + 1; /* advance util last '/' */
if (strcmp(mydir, mypath) == 0) { /* fake a stat for ".." */
memset(buf, 0, sizeof(struct stat));
if (strcmp (mydir, mypath) == 0) { /* fake a stat for ".." */
memset (buf, 0, sizeof (struct stat));
buf->st_mode = S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH;
memcpy(&single_entry->my_stat, buf, sizeof(struct stat));
g_free(mdp);
DEBUG(1, (" PARENT:found in %s\n", current_info->dirname));
memcpy (&single_entry->my_stat, buf, sizeof (struct stat));
g_free (mdp);
DEBUG (1, (" PARENT:found in %s\n", current_info->dirname));
return 0;
}
g_free(mdp);
g_free (mdp);
}
/* now try to identify as CURRENT dir? */
{
char *dnp = current_info->dirname;
DEBUG(6, ("get_stat_info: is %s current dir? this dir is: %s\n",
DEBUG (6, ("get_stat_info: is %s current dir? this dir is: %s\n",
mypath, current_info->dirname));
if (*dnp == '/')
dnp++;
else {
return -1;
}
if (strcmp(mypath, dnp) == 0) {
memset(buf, 0, sizeof(struct stat));
if (strcmp (mypath, dnp) == 0) {
memset (buf, 0, sizeof (struct stat));
buf->st_mode = S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH;
memcpy(&single_entry->my_stat, buf, sizeof(struct stat));
DEBUG(1, (" CURRENT:found in %s\n", current_info->dirname));
memcpy (&single_entry->my_stat, buf, sizeof (struct stat));
DEBUG (1, (" CURRENT:found in %s\n", current_info->dirname));
return 0;
}
}
DEBUG(3, ("'%s' not found in current_info '%s'\n", path, current_info->dirname));
DEBUG (3, ("'%s' not found in current_info '%s'\n", path,
current_info->dirname));
/* try to find this in the PREVIOUS listing */
if (previous_info) {
if (search_dir_entry(previous_info->entries, mypath, buf) == 0)
if (search_dir_entry (previous_info->entries, mypath, buf) == 0)
return 0;
DEBUG(3, ("'%s' not found in previous_info '%s'\n", path, previous_info->dirname));
DEBUG (3, ("'%s' not found in previous_info '%s'\n", path,
previous_info->dirname));
}
/* try to find this in the SHARE listing */
if (current_share_info && search_dir_entry(current_share_info->entries, mypath, buf) == 0)
if (current_share_info) {
if (search_dir_entry (current_share_info->entries, mypath, buf) == 0)
return 0;
DEBUG(3, ("'%s' not found in share_info '%s'\n", path, current_share_info->dirname));
DEBUG (3, ("'%s' not found in share_info '%s'\n", path,
current_share_info->dirname));
}
/* try to find this in the SERVER listing */
if (current_server_info && search_dir_entry(current_server_info->entries, mypath, buf) == 0)
if (current_server_info) {
if (search_dir_entry (current_server_info->entries, mypath, buf) == 0)
return 0;
DEBUG(3, ("'%s' not found in server_info '%s'\n", path, current_server_info->dirname));
DEBUG (3, ("'%s' not found in server_info '%s'\n", path,
current_server_info->dirname));
}
/* nothing found. get stat file info from server */
return get_remote_stat(sc, path, buf);
return get_remote_stat (sc, path, buf);
}
static int