diff options
| author | Kurt Schwehr <schwehr@google.com> | 2018-03-20 23:20:04 -0700 |
|---|---|---|
| committer | Kurt Schwehr <schwehr@google.com> | 2018-03-20 23:20:04 -0700 |
| commit | 36682c4648ce66b2ec10eea667527ded1f96d01c (patch) | |
| tree | 92ae5f1edc174ec459a02d40266ceb70d951030d /src/pj_gridinfo.c | |
| parent | 50c80eceb7d61bbc0a2c8e5909ee54e0051c3d96 (diff) | |
| download | PROJ-36682c4648ce66b2ec10eea667527ded1f96d01c.tar.gz PROJ-36682c4648ce66b2ec10eea667527ded1f96d01c.zip | |
Handle the case where nad_ctable2_init returns NULL.
Make CTABLE V2 handling the same as CTABLE.
The pj_log call hit a NULL pointer during fuzzing.
Found with autofuzz.
Diffstat (limited to 'src/pj_gridinfo.c')
| -rw-r--r-- | src/pj_gridinfo.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c index 0f90d655..c33e69c7 100644 --- a/src/pj_gridinfo.c +++ b/src/pj_gridinfo.c @@ -942,13 +942,21 @@ PJ_GRIDINFO *pj_gridinfo_init( projCtx ctx, const char *gridname ) gilist->format = "ctable2"; gilist->ct = ct; - pj_log( ctx, PJ_LOG_DEBUG_MAJOR, - "Ctable2 %s %dx%d: LL=(%.9g,%.9g) UR=(%.9g,%.9g)\n", - ct->id, - ct->lim.lam, ct->lim.phi, - ct->ll.lam * RAD_TO_DEG, ct->ll.phi * RAD_TO_DEG, - (ct->ll.lam + (ct->lim.lam-1)*ct->del.lam) * RAD_TO_DEG, - (ct->ll.phi + (ct->lim.phi-1)*ct->del.phi) * RAD_TO_DEG ); + if (ct == NULL) + { + pj_log( ctx, PJ_LOG_DEBUG_MAJOR, + "CTABLE V2 ct is NULL."); + } + else + { + pj_log( ctx, PJ_LOG_DEBUG_MAJOR, + "Ctable2 %s %dx%d: LL=(%.9g,%.9g) UR=(%.9g,%.9g)\n", + ct->id, + ct->lim.lam, ct->lim.phi, + ct->ll.lam * RAD_TO_DEG, ct->ll.phi * RAD_TO_DEG, + (ct->ll.lam + (ct->lim.lam-1)*ct->del.lam) * RAD_TO_DEG, + (ct->ll.phi + (ct->lim.phi-1)*ct->del.phi) * RAD_TO_DEG ); + } } else |