diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2020-01-13 22:13:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 22:13:16 +0100 |
| commit | 0e708619977c207d606bd8d52aa399d937dab299 (patch) | |
| tree | e252da9d24de2e18a0bf0da3f4093c0a489f192f /src | |
| parent | 542359e993e93b75907b2c2a12da38fe83d5c349 (diff) | |
| parent | 3f3af95e0a7f421c84617ce21a2bae1c01368397 (diff) | |
| download | PROJ-0e708619977c207d606bd8d52aa399d937dab299.tar.gz PROJ-0e708619977c207d606bd8d52aa399d937dab299.zip | |
Merge pull request #1843 from rouault/fix_ossfuzz_20072
unitconvert with mjd time format: avoid potential integer overflow
Diffstat (limited to 'src')
| -rw-r--r-- | src/conversions/unitconvert.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/conversions/unitconvert.cpp b/src/conversions/unitconvert.cpp index 8472355d..f8439aee 100644 --- a/src/conversions/unitconvert.cpp +++ b/src/conversions/unitconvert.cpp @@ -164,7 +164,8 @@ static double decimalyear_to_mjd(double decimalyear) { double fractional_year; double mjd; - if( decimalyear < -10000 || decimalyear > 10000 ) + // Written this way to deal with NaN input + if( !(decimalyear >= -10000 && decimalyear <= 10000) ) return 0; year = lround(floor(decimalyear)); |