memleak

DennisHeimbigner · Nov 5, 2023 · 66349b0 · 66349b0
1 parent 4268de1
commit 66349b0
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 28 deletions.
diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
@@ -6,7 +6,7 @@
 
 name: Run macOS-based netCDF Tests
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/.github/workflows/run_tests_s3.yml b/.github/workflows/run_tests_s3.yml
@@ -9,7 +9,7 @@
 
 name: Run S3 netCDF Tests (under Ubuntu Linux)
 
-on: [workflow_dispatch]
+on: [push,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
@@ -4,7 +4,7 @@
 
 name: Run Ubuntu/Linux netCDF Tests
 
-on: [pull_request, workflow_dispatch]
+on: [push,pull_request, workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml
@@ -1,6 +1,6 @@
 name: Run Cygwin-based tests
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml
@@ -9,7 +9,7 @@ name: Run MSYS2, MinGW64-based Tests (Not Visual Studio)
 env:
   CPPFLAGS: "-D_BSD_SOURCE"
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/libdap4/d4file.c b/libdap4/d4file.c
@@ -46,7 +46,6 @@ NCD4_open(const char * path, int mode,
     NCD4INFO* d4info = NULL;
     const char* value;
     NC* nc;
-    NCD4meta* meta = NULL;
     size_t len = 0;
     void* contents = NULL;
     NCD4response* dmrresp = NULL;
@@ -204,7 +203,7 @@ NCD4_open(const char * path, int mode,
 #endif
 
     /* Build the substrate metadata */
-    ret = NCD4_metabuild(d4info->dmrmetadata,meta->ncid);
+    ret = NCD4_metabuild(d4info->dmrmetadata,d4info->dmrmetadata->ncid);
     if(ret != NC_NOERR && ret != NC_EVARSIZE) goto done;
 
     /* Remember the response */
@@ -634,7 +633,6 @@ NCD4_newResponse(NCD4INFO* info, NCD4response** respp)
 void
 NCD4_reclaimResponse(NCD4response* d4resp)
 {
-    int i;
     struct NCD4serial* serial = NULL;
     if(d4resp == NULL) return;
     serial = &d4resp->serial;
@@ -644,7 +642,6 @@ NCD4_reclaimResponse(NCD4response* d4resp)
     nullfree(serial->dmr);
     nullfree(serial->errdata);
 
-#ifdef XXXX
     /* clear all fields */
     memset(serial,0,sizeof(struct NCD4serial));
 
@@ -684,7 +681,6 @@ NCD4_reclaimMeta(NCD4meta* dataset)
     int i;
     if(dataset == NULL) return;
 
-#endif /*XXXX*/
     for(i=0;i<nclistlength(dataset->allnodes);i++) {
 	NCD4node* node = (NCD4node*)nclistget(dataset->allnodes,i);
 	reclaimNode(node);

diff --git a/libdap4/d4varx.c b/libdap4/d4varx.c
@@ -187,24 +187,31 @@ getvarx(int gid, int varid, NCD4INFO** infop, NCD4node** varp,
     }
 
     /* Read and process the data */
-        /* Setup the meta-data for the DAP */
-	if((ret=NCD4_newMeta(info,&dapmeta))) goto done;
-	if((ret=NCD4_newResponse(info,&dapresp))) goto done;
-	dapresp->mode = NCD4_DAP;
-	nclistpush(info->responses,dapresp);
-        if((ret=NCD4_readDAP(info, info->controls.flags.flags, ceuri, dapresp))) goto done;
-        /* Extract DMR and dechunk the data part */
-        if((ret=NCD4_dechunk(dapresp))) goto done;
-        /* Process the dmr part */
-	if((ret=NCD4_parse(dapmeta,dapresp,1))) goto done;
-	/* See if we are checksumming */
-        if((ret=NCD4_inferChecksums(dapmeta,dapresp))) goto done;
-	/* connect variables and corresponding dap data */
-        if((ret = NCD4_parcelvars(dapmeta,dapresp))) goto done;
-	/* Process checksums and byte-order swapping */
-        if((ret = NCD4_processdata(dapmeta,dapresp))) goto done;
-	/* Transfer and process the data */
-        if((ret = mapvars(dapmeta,dmrmeta,dapresp->inferredchecksumming))) goto done;
+
+    /* Setup the meta-data for the DAP */
+    if((ret=NCD4_newMeta(info,&dapmeta))) goto done;
+    if((ret=NCD4_newResponse(info,&dapresp))) goto done;
+    dapresp->mode = NCD4_DAP;
+    nclistpush(info->responses,dapresp);
+    if((ret=NCD4_readDAP(info, info->controls.flags.flags, ceuri, dapresp))) goto done;
+
+    /* Extract DMR and dechunk the data part */
+    if((ret=NCD4_dechunk(dapresp))) goto done;
+
+    /* Process the dmr part */
+    if((ret=NCD4_parse(dapmeta,dapresp,1))) goto done;
+
+    /* See if we are checksumming */
+    if((ret=NCD4_inferChecksums(dapmeta,dapresp))) goto done;
+
+    /* connect variables and corresponding dap data */
+    if((ret = NCD4_parcelvars(dapmeta,dapresp))) goto done;
+
+    /* Process checksums and byte-order swapping */
+    if((ret = NCD4_processdata(dapmeta,dapresp))) goto done;
+
+    /* Transfer and process the data */
+    if((ret = mapvars(dapmeta,dmrmeta,dapresp->inferredchecksumming))) goto done;
 
 validated:
     /* Return relevant info */