3 files changed, 10 insertions, 14 deletions
diff --git a/cpukit/libmisc/rtems-fdt/rtems-fdt.c b/cpukit/libmisc/rtems-fdt/rtems-fdt.c
index 122407f630..0c8ccfd2c2 100644
--- a/cpukit/libmisc/rtems-fdt/rtems-fdt.c
+++ b/cpukit/libmisc/rtems-fdt/rtems-fdt.c
@@ -680,14 +680,14 @@ rtems_fdt_unload (rtems_fdt_handle* handle)
 
   rtems_chain_extract_unprotected (&handle->blob->node);
 
+  rtems_fdt_release_index(&handle->blob->index);
+
   free (handle->blob);
 
   handle->blob = NULL;
 
   rtems_fdt_unlock (fdt);
 
-  rtems_fdt_release_index(&handle->blob->index);
-
   return 0;
 }
 
diff --git a/cpukit/libmisc/shell/main_chmod.c b/cpukit/libmisc/shell/main_chmod.c
index 0c39072f6b..288fd52f4c 100644
--- a/cpukit/libmisc/shell/main_chmod.c
+++ b/cpukit/libmisc/shell/main_chmod.c
@@ -53,7 +53,7 @@ static int rtems_shell_main_chmod(
    *  Now change the files modes
    */
   for (n=2 ; n < argc ; n++)
-    chmod(argv[n++], mode);
+    chmod(argv[n], mode);
 
   return 0;
 }
diff --git a/cpukit/libmisc/shell/main_edit.c b/cpukit/libmisc/shell/main_edit.c
index e43ff68d2b..681e8c5f3c 100644
--- a/cpukit/libmisc/shell/main_edit.c
+++ b/cpukit/libmisc/shell/main_edit.c
@@ -407,6 +407,9 @@ static void move_gap(struct editor *ed, int pos, int minsize) {
     if (gapsize + MINEXTEND > minsize) minsize = gapsize + MINEXTEND;
     newsize = (ed->end - ed->start) - gapsize + minsize;
     start = (unsigned char *) malloc(newsize); // TODO check for out of memory
+    if (start == NULL) {
+        return;
+    }
     gap = start + pos;
     rest = gap + minsize;
     end = start + newsize;
@@ -1789,14 +1792,14 @@ static void save_editor(struct editor *ed) {
   ed->refresh = 1;
 }
 
-static void close_editor(struct editor *ed) {
+static struct editor* close_editor(struct editor *ed) {
   struct env *env = ed->env;
 
   if (ed->dirty) {
     display_message(ed, "Close %s without saving changes (y/n)? ", ed->filename);
     if (!ask()) {
       ed->refresh = 1;
-      return;
+      return ed;
     }
   }
 
@@ -1808,6 +1811,7 @@ static void close_editor(struct editor *ed) {
     new_file(ed, "");
   }
   ed->refresh = 1;
+  return ed;
 }
 
 static void pipe_command(struct editor *ed) {
@@ -2131,15 +2135,7 @@ static void edit(struct editor *ed) {
         case ctrl('s'): save_editor(ed); break;
         case ctrl('p'): pipe_command(ed); break;
 #endif
-#if defined(__rtems__)
-        /*
-         * Coverity spotted this as using ed after free() so changing
-         * the order of the statements.
-         */
-        case ctrl('w'): ed = ed->env->current; close_editor(ed); break;
-#else
-        case ctrl('w'): close_editor(ed); ed = ed->env->current; break;
-#endif
+        case ctrl('w'): ed = close_editor(ed); break;
       }
     }
   }