aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2022-02-22 17:07:54 +0100
committerEven Rouault <even.rouault@spatialys.com>2022-02-22 17:07:54 +0100
commitbc34a84eab410b82a14e181da3eec598309e7312 (patch)
tree1a6cbc4e82c44cb3c62aadc4f970bfca894fd6ac
parentdd96597e86a0d4df1c6af0e32e1bb6bee1f840dd (diff)
downloadPROJ-bc34a84eab410b82a14e181da3eec598309e7312.tar.gz
PROJ-bc34a84eab410b82a14e181da3eec598309e7312.zip
proj_grid_info(): check pj_find_file() output (CID 383357)
-rw-r--r--src/4D_api.cpp37
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;
+ }
};
{