Changeset 13583

Show
Ignore:
Timestamp:
01/23/08 16:22:50 (6 months ago)
Author:
rouault
Message:

Fix minor memory leaks and one incorrect memory usage in HDF5

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/frmts/hdf5/hdf5dataset.cpp

    r11897 r13583  
    291291        CPLFree( poH5Object->pszName ); 
    292292    } 
     293 
     294    if( poH5Object->pszUnderscorePath != NULL ) { 
     295        CPLFree( poH5Object->pszUnderscorePath ); 
     296    } 
    293297/* -------------------------------------------------------------------- */ 
    294298/*      All Children are visited and can be deleted.                    */ 
    …… 
    337341        if( strlen( poH5Object->pszName ) == 1 ) { 
    338342            strcat(pszPath, poH5Object->pszName ); 
    339             strcat(pszUnderscoreSpaceInName, poH5Object->pszName); 
     343            strcpy(pszUnderscoreSpaceInName, poH5Object->pszName); 
    340344        } 
    341345        else { 

  • trunk/gdal/frmts/hdf5/hdf5imagedataset.cpp

    r13566 r13583  
    102102    nGCPCount       = -1; 
    103103    pszProjection   = NULL; 
     104    pszGCPProjection= NULL; 
    104105    pasGCPList      = NULL; 
    105106    papszName       = NULL; 
    …… 
    123124    if( papszName != NULL ) 
    124125        CSLDestroy( papszName ); 
     126 
     127    CPLFree(pszProjection); 
     128    CPLFree(pszGCPProjection); 
    125129 
    126130    if( dims ) 
    …… 
    548552         
    549553        oSRS.SetWellKnownGeogCS( "WGS84" ); 
     554  CPLFree(pszProjection); 
    550555        oSRS.exportToWkt( &pszProjection ); 
    551556        oSRS.exportToWkt( &pszGCPProjection );