Skip to content

Commit 5d5a36d

Browse files
committed
GTIFSetFromProj4(): avoid unlikely floating point division by zero (CID 1589229)
1 parent e00dcd6 commit 5d5a36d

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

libgeotiff/geotiff_proj4.c

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/******************************************************************************
2-
* $Id$
32
*
43
* Project: libgeotiff
54
* Purpose: Code to convert a normalized GeoTIFF definition into a PROJ.4
@@ -9,23 +8,7 @@
98
******************************************************************************
109
* Copyright (c) 1999, Frank Warmerdam
1110
*
12-
* Permission is hereby granted, free of charge, to any person obtaining a
13-
* copy of this software and associated documentation files (the "Software"),
14-
* to deal in the Software without restriction, including without limitation
15-
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
16-
* and/or sell copies of the Software, and to permit persons to whom the
17-
* Software is furnished to do so, subject to the following conditions:
18-
*
19-
* The above copyright notice and this permission notice shall be included
20-
* in all copies or substantial portions of the Software.
21-
*
22-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
23-
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
24-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
25-
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
26-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
27-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
28-
* DEALINGS IN THE SOFTWARE.
11+
* SPDX-License-Identifier: MIT
2912
******************************************************************************
3013
*/
3114

@@ -238,7 +221,7 @@ int GTIFSetFromProj4( GTIF *gtif, const char *proj4 )
238221
dfSemiMajor = OSR_GDV(papszNV,"a",0.0);
239222
dfSemiMinor = OSR_GDV(papszNV,"b",0.0);
240223
dfInvFlattening = OSR_GDV(papszNV,"rf",0.0);
241-
if( dfSemiMinor != 0.0 && dfInvFlattening == 0.0 )
224+
if( dfSemiMajor != 0.0 && dfSemiMinor != 0.0 && dfInvFlattening == 0.0 )
242225
dfInvFlattening = -1.0 / (dfSemiMinor/dfSemiMajor - 1.0);
243226
}
244227

0 commit comments

Comments
 (0)