Merged latest from netCDF-cmake branch in preparation for 4.3.0 release.

CTestConfig.cmake

@@ -0,0 +1,20 @@
+# CTest/CDash configuration
+IF(USE_REMOTE_CDASH)
+	set(CTEST_PROJECT_NAME "NetCDF-C")
+	set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
+	set(CTEST_SITE "Unidata OSX")
+	set(CTEST_DROP_METHOD "http")
+	set(CTEST_DROP_SITE "my.cdash.org")
+	set(CTEST_DROP_LOCATION "/submit.php?project=NetCDF-C")
+	set(CTEST_DROP_SITE_CDASH TRUE)
+ELSEIF(BUILDING_TRUNK)
+	SET (CTEST_DROP_METHOD "http")
+	SET (CTEST_DROP_SITE "yakov.unidata.ucar.edu/")
+	SET (CTEST_DROP_LOCATION "CDash/submit.php?project=netCDF")
+	SET (CTEST_DROP_SITE_CDASH TRUE)	
+ELSE()
+	SET (CTEST_DROP_METHOD "http")
+	SET (CTEST_DROP_SITE "yakov.unidata.ucar.edu/")
+	SET (CTEST_DROP_LOCATION "CDash/submit.php?project=WinNETCDF")
+	SET (CTEST_DROP_SITE_CDASH TRUE)
+ENDIF()

include/ncconfigure.h

@@ -25,9 +25,9 @@ extern char* strdup(const char*);
 #if HAVE_BASETSD_H
 #ifndef SSIZE_T
 #include <BaseTsd.h>
-#endif
 #define ssize_t SSIZE_T
 #endif
+#endif
 
 
 

libdap2/cdf3.c

@@ -341,6 +341,10 @@ fprintf(stderr,"restruct: template=%s\n",dumptree(template));
 	/* Do the repairs */
 	ncstat = repairgrids(repairs);
     }
+
+    if(repairs)
+      nclistfree(repairs);
+
     return THROW(ncstat);
 }
 

libdispatch/nc.c

@@ -62,7 +62,11 @@ new_NC(NC_Dispatch* dispatcher, const char* path, NC** ncpp)
         free_NC(ncp);
 	return NC_ENOMEM;
     }
-    if(ncpp) *ncpp = ncp;
+    if(ncpp) {
+      *ncpp = ncp;
+    } else {
+      free_NC(ncp);
+    }
     return NC_NOERR;
 }
 

libsrc4/nc4attr.c

@@ -33,7 +33,7 @@ nc4_get_att(int ncid, NC *nc, int varid, const char *name,
 {
    NC_GRP_INFO_T *grp;
    NC_HDF5_FILE_INFO_T *h5;
-   NC_ATT_INFO_T *att;
+   NC_ATT_INFO_T *att = NULL;
    int my_attnum = -1;
 
    int need_to_convert = 0;

libsrc4/nc4file.c

@@ -851,7 +851,7 @@ static int
 read_hdf5_att(NC_GRP_INFO_T *grp, hid_t attid, NC_ATT_INFO_T *att)
 {
    hid_t spaceid = 0, file_typeid = 0;
-   hsize_t dims[1]; /* netcdf attributes always 1-D. */
+   hsize_t dims[1] = {0}; /* netcdf attributes always 1-D. */
    int retval = NC_NOERR;
    size_t type_size;
    int att_ndims;
@@ -1282,7 +1282,7 @@ static int
 read_var(NC_GRP_INFO_T *grp, hid_t datasetid, const char *obj_name, 
          size_t ndims, int is_scale, int num_scales, hid_t access_pid)
 {
-   NC_VAR_INFO_T *var;
+   NC_VAR_INFO_T *var = NULL;
    int natts, a, d;
 
    NC_ATT_INFO_T *att;
@@ -1309,7 +1309,10 @@ read_var(NC_GRP_INFO_T *grp, hid_t datasetid, const char *obj_name,
    /* Add a variable to the end of the group's var list. */
    if ((retval = nc4_var_list_add(&grp->var, &var)))
       return retval;
-            
+   
+   if(!var)
+     return NC_ENOMEM;
+
    /* Fill in what we already know. */
    var->hdf_datasetid = datasetid;
    var->varid = grp->nvars++;

ncdap_test/CMakeLists.txt

@@ -37,6 +37,7 @@ IF(ENABLE_TESTS)
 		add_bin_env_test(ncdap test_cvt)
 		add_bin_env_test(ncdap test_vara)
 	ENDIF()
+	add_bin_test(ncdap test_nstride_cached)
 	add_bin_test(ncdap test_partvar)
 	add_bin_test(ncdap test_varm3)
 	

ncdump/nciter.c

@@ -192,7 +192,9 @@ nc_get_iter(int ncid,
     memset((void*)iterp,0,sizeof(nciter_t)); /* make sure it is initialized */
 
     NC_CHECK(nc_inq_varndims(ncid, varid, &ndims));
-    dimids = (int *) emalloc((ndims + 1) * sizeof(size_t));
+    
+    dimids = (int *) emalloc((ndims + 1) * sizeof(int));
+    
     iterp->dimsizes = (size_t *) emalloc((ndims + 1) * sizeof(size_t));
     iterp->chunksizes = (size_t *) emalloc((ndims + 1) * sizeof(size_t));
 

oc2/oc.c

@@ -562,7 +562,7 @@ oc_dds_fieldbyname(OCobject link, OCobject ddsnode, const char* name, OCobject*
     err = oc_dds_nsubnodes(link,ddsnode,&count);
     if(err != OC_NOERR) return err;
     for(i=0;i<count;i++) {
-	int match;
+	int match=1;
 	OCobject field;
 	char* fieldname = NULL;
         err = oc_dds_ithfield(link,ddsnode,i,&field);
@@ -570,8 +570,11 @@ oc_dds_fieldbyname(OCobject link, OCobject ddsnode, const char* name, OCobject*
 	// Get the field's name
         err = oc_dds_name(link,field,&fieldname);
         if(err != OC_NOERR) return err;
-	match = strcmp(name,fieldname);
-	if(fieldname != NULL) free(fieldname);
+	if(fieldname != NULL) {
+	  match = strcmp(name,fieldname);
+	  free(fieldname);
+	}
+	 
 	if(match == 0) {
 	    if(fieldp) *fieldp = field;
 	    return OC_NOERR;