Skip to content
Permalink
Browse files

Merge pull request #1771 from wchen329/cf18_maintenence

Fix Coverity Scan Issue CID 1404242 and Broken Malformed CF Rejection
  • Loading branch information...
rouault committed Aug 13, 2019
2 parents af3e497 + 7abbaf5 commit a2476c72897002d506be6dc830ef197c9cd78a0a
Showing with 4 additions and 4 deletions.
  1. +1 −3 autotest/gdrivers/netcdf.py
  2. +3 −1 gdal/frmts/netcdf/netcdfsg.cpp
@@ -3112,9 +3112,7 @@ def test_bad_cf1_8():
assert(corrupt_poly_1 is None)
assert(corrupt_poly_2 is None)
assert(corrupt_poly_3 is None)

# this error is no longer fatal
assert(uneq_x_y != None)
assert(uneq_x_y is None)

def test_point_read():
if gdaltest.netcdf_drv is None:
@@ -357,7 +357,8 @@ namespace nccfdriver
* (3) there are at least two node coordinate variable ids
*/

int all_dim = INVALID_VAR_ID; bool dim_set = false;
int all_dim = INVALID_VAR_ID;
bool dim_set = false;
int dimC = 0;
//(1) one dimension check, each node_coordinates have same dimension
for(size_t nvitr = 0; nvitr < nodec_varIds.size(); nvitr++)
@@ -380,6 +381,7 @@ namespace nccfdriver
if(!dim_set)
{
all_dim = inter_dim[0];
dim_set = true;
}

else

0 comments on commit a2476c7

Please sign in to comment.
You can’t perform that action at this time.