Merge pull request #57 from gleventhal/master

Fix unchecked opendir to prevent dereferencing a NULL pointer
Atoptool · May 26, 2019 · b54801c · b54801c
2 parents fa4db43 + e7000f7
commit b54801c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/photoproc.c b/photoproc.c
@@ -311,6 +311,12 @@ photoproc(struct tstat *tasklist, int maxtask)
 			{
 				dirtask = opendir(".");
 
+				if( dirtask == NULL )		
+				{
+					if(chdir("../..") == -1);  /* leave task and process-level directories */
+					continue;
+				}
+
 				while ((tent=readdir(dirtask)) && tval<maxtask)
 				{
 					struct tstat *curthr = tasklist+tval;