diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2017-05-23 22:08:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 22:08:36 +0200 |
| commit | adc03319ef5e79f69524431e7718a30752f659fe (patch) | |
| tree | be3d2874b150289edfe8f3694adc3ce259c770c5 /src/pj_transform.c | |
| parent | a54611f16cf2140d93f8a33563bbc79af136636a (diff) | |
| parent | 9ebed249a6c8957b345396f6085090f7d2cd0e47 (diff) | |
| download | PROJ-adc03319ef5e79f69524431e7718a30752f659fe.tar.gz PROJ-adc03319ef5e79f69524431e7718a30752f659fe.zip | |
Merge pull request #518 from rouault/fix_ossfuzz_1809
Avoid potentially very long loop when normalizing longitudes around long_wrap_center
Diffstat (limited to 'src/pj_transform.c')
| -rw-r--r-- | src/pj_transform.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/pj_transform.c b/src/pj_transform.c index 6e48948d..212d8842 100644 --- a/src/pj_transform.c +++ b/src/pj_transform.c @@ -422,13 +422,17 @@ int pj_transform( PJ *srcdefn, PJ *dstdefn, long point_count, int point_offset, { for( i = 0; i < point_count; i++ ) { - if( x[point_offset*i] == HUGE_VAL ) + double val = x[point_offset*i]; + if( val == HUGE_VAL ) continue; - while( x[point_offset*i] < dstdefn->long_wrap_center - M_PI ) - x[point_offset*i] += M_TWOPI; - while( x[point_offset*i] > dstdefn->long_wrap_center + M_PI ) - x[point_offset*i] -= M_TWOPI; + /* Get fast in ] -2 PI, 2 PI [ range */ + val = fmod(val, M_TWOPI); + while( val < dstdefn->long_wrap_center - M_PI ) + val += M_TWOPI; + while( val > dstdefn->long_wrap_center + M_PI ) + val -= M_TWOPI; + x[point_offset*i] = val; } } |