[Sblim-commit] sfcb interopServerProvider.c, 1.33, 1.34 ChangeLog, 1.667, 1.668 NEWS, 1.593, 1.594

[Chris B. <buc...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv23860

Modified Files:
	interopServerProvider.c ChangeLog NEWS 
Log Message:
[ 3324168 ] gatherNameSpacesData() may closedir() a NULL pointer

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.593
retrieving revision 1.594
diff -u -d -r1.593 -r1.594
--- NEWS	21 Jun 2011 22:05:55 -0000	1.593
+++ NEWS	21 Jun 2011 22:12:12 -0000	1.594
@@ -21,6 +21,7 @@
 - 3323427 Unnecessary NULL check in httpAdapter
 - 3324214 Remove dead code from providerDrv:loadProvider()
 - 3324131 indCIMXMLHandler may return uninitialized CMPIStatus
+- 3324168 gatherNameSpacesData() may closedir() a NULL pointer
 
 Changes in 1.3.11
 =================

Index: interopServerProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/interopServerProvider.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- interopServerProvider.c	10 May 2011 23:01:33 -0000	1.33
+++ interopServerProvider.c	21 Jun 2011 22:12:12 -0000	1.34
@@ -120,28 +120,30 @@
    int l;
    
    dir=opendir(dn);
-   if (dir) while ((de=readdir(dir))!=NULL) {
-     if (strcmp(de->d_name,".")==0) continue;
-     if (strcmp(de->d_name,"..")==0) continue;
-     l=strlen(dn)+strlen(de->d_name)+4;
-     n=(char*)malloc(l+8);
-     strcpy(n,dn);
-     strcat(n,"/");
-     strcat(n,de->d_name);
-     de_test = opendir(n);
-     if (de_test == NULL) {
-       free(n);
-       continue;
-     }
-     closedir(de_test);
+   if (dir) {
+     while ((de=readdir(dir))!=NULL) {
+       if (strcmp(de->d_name,".")==0) continue;
+       if (strcmp(de->d_name,"..")==0) continue;
+       l=strlen(dn)+strlen(de->d_name)+4;
+       n=(char*)malloc(l+8);
+       strcpy(n,dn);
+       strcat(n,"/");
+       strcat(n,de->d_name);
+       de_test = opendir(n);
+       if (de_test == NULL) {
+         free(n);
+         continue;
+       }
+       closedir(de_test);
      
-     genNameSpaceData(n,de->d_name,dbl,rslt,op,ci,nsOpt);
-     if (nsOpt!=1) { 
-        if (nsOpt==0) gatherNameSpacesData(n,dbl,rslt,op,ci,nsOpt);
+       genNameSpaceData(n,de->d_name,dbl,rslt,op,ci,nsOpt);
+       if (nsOpt!=1) { 
+         if (nsOpt==0) gatherNameSpacesData(n,dbl,rslt,op,ci,nsOpt);
+       }
+       free(n);
      }
-     free(n);
+     closedir(dir);
    }
-   closedir(dir);     
 } 
 
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.667
retrieving revision 1.668
diff -u -d -r1.667 -r1.668
--- ChangeLog	21 Jun 2011 22:05:55 -0000	1.667
+++ ChangeLog	21 Jun 2011 22:12:12 -0000	1.668
@@ -1,5 +1,8 @@
 2011-06-21  Chris Buccella  <buc...@li...>
 
+	* interopServerProvider.c:
+	[ 3324168 ] gatherNameSpacesData() may closedir() a NULL pointer
+
 	* indCIMXMLHandler.c:
 	[ 3324131 ] indCIMXMLHandler may return uninitialized CMPIStatus
 
@@ -38,7 +41,7 @@
 	cimXmlRequest.c, cimXmlRequest.h, httpAdapter.c, Makefile.am,
 	configure.ac, default.reg.in:
 	[ 3313833 ] Allow for passthrough for expired user to update password
-	
+
 2011-05-02 Michael Chase-Salerno <br...@li...>
 
 	* configure.ac