[rtems commit] ftpfs: Fix NULL pointer access
Sebastian Huber
sebh at rtems.org
Thu Nov 22 15:31:31 UTC 2012
Module: rtems
Branch: master
Commit: 82eb2c4d5f89893d35c841387fa8631ed31364ab
Changeset: http://git.rtems.org/rtems/commit/?id=82eb2c4d5f89893d35c841387fa8631ed31364ab
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Thu Nov 22 14:08:38 2012 +0100
ftpfs: Fix NULL pointer access
---
cpukit/libnetworking/lib/ftpfs.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/cpukit/libnetworking/lib/ftpfs.c b/cpukit/libnetworking/lib/ftpfs.c
index 5ba7515..6ce2543 100644
--- a/cpukit/libnetworking/lib/ftpfs.c
+++ b/cpukit/libnetworking/lib/ftpfs.c
@@ -1148,16 +1148,20 @@ static void rtems_ftpfs_eval_path(
static void rtems_ftpfs_free_node(const rtems_filesystem_location_info_t *loc)
{
rtems_ftpfs_entry *e = loc->node_access;
- const rtems_ftpfs_mount_entry *me = loc->mt_entry->fs_info;
- /* Close control connection if necessary */
- if (e->ctrl_socket >= 0) {
- rtems_ftpfs_send_command(e, "QUIT", NULL, me->verbose);
+ /* The root node handler has no entry */
+ if (e != NULL) {
+ const rtems_ftpfs_mount_entry *me = loc->mt_entry->fs_info;
- close(e->ctrl_socket);
- }
+ /* Close control connection if necessary */
+ if (e->ctrl_socket >= 0) {
+ rtems_ftpfs_send_command(e, "QUIT", NULL, me->verbose);
- free(e);
+ close(e->ctrl_socket);
+ }
+
+ free(e);
+ }
}
static rtems_filesystem_node_types_t rtems_ftpfs_node_type(
More information about the vc
mailing list