Changeset 1281

Timestamp:

30/09/09 13:43:27 (3 years ago)

Author:

Freddie Akeroyd

Message:

Merge in changes r1278:r1280 from trunk for hdf5 NXgetslab memory leak
refs #115,#192

File:

• branches/4.2/src/napi5.c (modified) (2 diffs)

branches/4.2/src/napi5.c

@@ -1737 +1737 @@
         }
        /* map datatypes of other plateforms */
-       if (data_id==H5T_STRING)
+       if (data_id == H5T_STRING)
        {
          dims = H5Tget_size(pFile->iCurrentT);
@@ -1759 +1759 @@
                      pFile->iCurrentS, H5P_DEFAULT,data);
       }    
+      /* cleanup */
+      if (data_id == H5T_STRING) { /* we used H5Tcopy */
+         H5Tclose(memtype_id);
+      }
+      H5Sclose(memspace);
 
       if (iRet < 0) 
+
         {
           NXIReportError (NXpData, "ERROR: Reading slab failed");