diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index f5c25c6dde..ae2c38edb5 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20	Chris Johns <chrisj@rtems.org>
+
+	Coverity Id 9
+	* libmisc/shell/main_ls.c: Modify conditional to avoid NULL
+	dereference.
+
 2010-01-19	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	Coverity Id 10
diff --git a/cpukit/libmisc/shell/main_ls.c b/cpukit/libmisc/shell/main_ls.c
index ace56411de..f1cbbcfc91 100644
--- a/cpukit/libmisc/shell/main_ls.c
+++ b/cpukit/libmisc/shell/main_ls.c
@@ -627,7 +627,7 @@ display(rtems_shell_ls_globals* globals, FTSENT *p, FTSENT *list)
 				np->group = &np->data[ulen + 1];
 				(void)strcpy(np->group, group);
 
-				if (f_flags) {
+				 if (f_flags && flags) {
 					np->flags = &np->data[ulen + glen + 2];
 				  	(void)strcpy(np->flags, flags);
 				}