diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2022-02-22 20:51:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 20:51:05 +0100 |
| commit | 5b7c4575e549d2765da39a9708a42fa6317926f1 (patch) | |
| tree | 32ea9e79e558f0576170cc6fa85e693739b1e7ec /src/4D_api.cpp | |
| parent | dd96597e86a0d4df1c6af0e32e1bb6bee1f840dd (diff) | |
| parent | 27d6a335dba16a083f5ecf76e8ce8d6034bb130f (diff) | |
| download | PROJ-5b7c4575e549d2765da39a9708a42fa6317926f1.tar.gz PROJ-5b7c4575e549d2765da39a9708a42fa6317926f1.zip | |
Merge pull request #3072 from rouault/coverity_scan
Fix various issues found by Coverity scan
Diffstat (limited to 'src/4D_api.cpp')
| -rw-r--r-- | src/4D_api.cpp | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/4D_api.cpp b/src/4D_api.cpp index 94458398..a7baaf93 100644 --- a/src/4D_api.cpp +++ b/src/4D_api.cpp @@ -2276,24 +2276,25 @@ PJ_GRID_INFO proj_grid_info(const char *gridname) { strncpy (grinfo.gridname, gridname, sizeof(grinfo.gridname) - 1); /* full path of grid */ - pj_find_file(ctx, gridname, grinfo.filename, sizeof(grinfo.filename) - 1); - - /* grid format */ - strncpy (grinfo.format, format.c_str(), sizeof(grinfo.format) - 1); - - /* grid size */ - grinfo.n_lon = grid.width(); - grinfo.n_lat = grid.height(); - - /* cell size */ - grinfo.cs_lon = extent.resX; - grinfo.cs_lat = extent.resY; - - /* bounds of grid */ - grinfo.lowerleft.lam = extent.west; - grinfo.lowerleft.phi = extent.south; - grinfo.upperright.lam = extent.east; - grinfo.upperright.phi = extent.north; + if( pj_find_file(ctx, gridname, grinfo.filename, sizeof(grinfo.filename) - 1) ) + { + /* grid format */ + strncpy (grinfo.format, format.c_str(), sizeof(grinfo.format) - 1); + + /* grid size */ + grinfo.n_lon = grid.width(); + grinfo.n_lat = grid.height(); + + /* cell size */ + grinfo.cs_lon = extent.resX; + grinfo.cs_lat = extent.resY; + + /* bounds of grid */ + grinfo.lowerleft.lam = extent.west; + grinfo.lowerleft.phi = extent.south; + grinfo.upperright.lam = extent.east; + grinfo.upperright.phi = extent.north; + } }; { |