Merge remote-tracking branch 'raul/scanbuild'

.travis.yml

@@ -103,6 +103,18 @@ matrix:
       env:
         - E="TOOL=cmake && BUILD_TYPE=Release && CXX=clang++ && ARCH=-m64 && CC=clang"
 
+    - os: linux
+      cache:
+        apt: true
+        directories:
+          - $HOME/.ccache
+      addons:
+        apt:
+          sources: *sources
+          packages: ['clang','ccache','doxygen']
+      env:
+        - E="TOOL=autotools_scanbuild && BUILD_TYPE=Release && ARCH=-m64
+
 before_install:
   - eval "${E}"
   - export CXXFLAGS=${ARCH}

capi/geos_ts_c.cpp

@@ -2958,7 +2958,9 @@ extern "C" {
     {
 
         double length;
-        GEOSLength_r(extHandle, g, &length);
+        if(GEOSLength_r(extHandle, g, &length) != 1) {
+            return -1.0;
+        };
         return GEOSProject_r(extHandle, g, p) / length;
     }
 
@@ -2968,7 +2970,9 @@ extern "C" {
                                 double d)
     {
         double length;
-        GEOSLength_r(extHandle, g, &length);
+        if (GEOSLength_r(extHandle, g, &length) != 1) {
+            return 0;
+        }
         return GEOSInterpolate_r(extHandle, g, d * length);
     }
 

include/geos/algorithm/ttmath/ttmathbig.h

@@ -84,9 +84,9 @@ class Big
 
 public:
 
-Int<exp>  exponent;
-UInt<man> mantissa;
-unsigned char info;
+Int<exp>  exponent{0};
+UInt<man> mantissa{0};
+unsigned char info{0};
 
 
 /*!

include/geos/operation/distance/DistanceOp.h

@@ -185,9 +185,6 @@ class GEOS_DLL DistanceOp {
                        const std::vector<const geom::Polygon*>& polys,
                        std::array<std::unique_ptr<GeometryLocation>, 2> & locPtPoly);
 
-    void computeInside(std::unique_ptr<GeometryLocation> & ptLoc,
-                       const geom::Polygon* poly,
-                       std::array<std::unique_ptr<GeometryLocation>, 2> & locPtPoly);
 
     /**
      * Computes distance between facets (lines and points)

src/algorithm/LineIntersector.cpp

@@ -92,7 +92,6 @@ nearestEndpoint(const Coordinate& p1, const Coordinate& p2,
     }
     dist = Distance::pointToSegment(q2, p1, p2);
     if(dist < minDist) {
-        minDist = dist;
         nearestPt = &q2;
     }
     return *nearestPt;

src/algorithm/MinimumBoundingCircle.cpp

@@ -300,7 +300,7 @@ Coordinate
 MinimumBoundingCircle::pointWithMinAngleWithSegment(std::vector<Coordinate>& pts, Coordinate& P, Coordinate& Q)
 {
     double minAng = std::numeric_limits<double>::max();
-    const Coordinate* minAngPt = nullptr;
+    const Coordinate* minAngPt = &pts[0];
 
     for(const auto& p : pts) {
         if(p == P) {

src/algorithm/Orientation.cpp

@@ -16,6 +16,7 @@
  *
  **********************************************************************/
 
+#include <cassert>
 #include <cmath>
 #include <vector>
 
@@ -48,6 +49,7 @@ Orientation::isCCW(const geom::CoordinateSequence* ring)
 
     // # of points without closing endpoint
     const std::size_t nPts = ring->getSize() - 1;
+    assert(nPts >= 3); // This is here for scan-build
 
     // find highest point
     const geom::Coordinate* hiPt = &ring->getAt(0);

src/geom/LineSegment.cpp

@@ -231,7 +231,6 @@ LineSegment::closestPoints(const LineSegment& line)
     line.closestPoint(p1, close11);
     dist = close11.distance(p1);
     if(dist < minDistance) {
-        minDistance = dist;
         closestPt[0] = p1;
         closestPt[1] = close11;
     }

src/geom/util/CoordinateOperation.cpp

@@ -30,6 +30,10 @@ std::unique_ptr<Geometry>
 CoordinateOperation::edit(const Geometry* geometry,
                           const GeometryFactory* factory)
 {
+    if (geometry == nullptr) {
+        return nullptr;
+    }
+
     if(const LinearRing* ring = dynamic_cast<const LinearRing*>(geometry)) {
         const CoordinateSequence* coords = ring->getCoordinatesRO();
         auto newCoords = edit(coords, geometry);

src/geom/util/ShortCircuitedGeometryVisitor.cpp

@@ -32,6 +32,10 @@ ShortCircuitedGeometryVisitor::applyTo(const Geometry& geom)
 {
     for(std::size_t i = 0, n = geom.getNumGeometries(); i < n; ++i) {
         const Geometry* element = geom.getGeometryN(i);
+        if (element == nullptr) {
+            continue;
+        }
+
         if(dynamic_cast<const GeometryCollection*>(element)) {
             applyTo(*element);
         }

src/io/WKTReader.cpp

@@ -79,17 +79,17 @@ WKTReader::getCoordinates(StringTokenizer* tokenizer)
     Coordinate coord;
     getPreciseCoordinate(tokenizer, coord, dim);
 
-    auto coordinates = detail::make_unique<CoordinateArraySequence>(0, dim);
-    coordinates->add(coord);
+    std::vector<Coordinate> v;
+    v.push_back(coord);
 
     nextToken = getNextCloserOrComma(tokenizer);
     while(nextToken == ",") {
         getPreciseCoordinate(tokenizer, coord, dim);
-        coordinates->add(coord);
+        v.push_back(coord);
         nextToken = getNextCloserOrComma(tokenizer);
     }
 
-    return std::move(coordinates);
+    return geometryFactory->getCoordinateSequenceFactory()->create(std::move(v), dim);
 }
 
 

src/operation/distance/DistanceOp.cpp

@@ -260,31 +260,18 @@ DistanceOp::computeInside(vector<unique_ptr<GeometryLocation>> & locs,
 {
     for(auto& loc : locs) {
         for(const auto& poly : polys) {
-            computeInside(loc, poly, locPtPoly);
-            if(minDistance <= terminateDistance) {
-                return;
-            }
+			const Coordinate& pt = loc->getCoordinate();
+
+			if (Location::EXTERIOR != ptLocator.locate(pt, static_cast<const Geometry*>(poly))) {
+				minDistance = 0.0;
+				locPtPoly[0] = std::move(loc);
+				locPtPoly[1].reset(new GeometryLocation(poly, pt));
+				return;
+			}
         }
     }
 }
 
-/*private*/
-void
-DistanceOp::computeInside(std::unique_ptr<GeometryLocation> & ptLoc,
-                          const Polygon* poly,
-                          array<std::unique_ptr<GeometryLocation>, 2> & locPtPoly)
-{
-    const Coordinate& pt = ptLoc->getCoordinate();
-
-    // if pt is not in exterior, distance to geom is 0
-    if(Location::EXTERIOR != ptLocator.locate(pt, static_cast<const Geometry*>(poly))) {
-        minDistance = 0.0;
-        locPtPoly[0] = std::move(ptLoc);
-        locPtPoly[1].reset(new GeometryLocation(poly, pt));
-        return;
-    }
-}
-
 /*private*/
 void
 DistanceOp::computeFacetDistance()

src/operation/union/UnaryUnionOp.cpp

@@ -121,16 +121,13 @@ UnaryUnionOp::Union()
      */
 
     GeomPtr unionLA = unionWithNull(std::move(unionLines), std::move(unionPolygons));
-    assert(!unionLines.get());
-    assert(!unionPolygons.get());
+
 
     if(! unionPoints.get()) {
         ret = std::move(unionLA);
-        assert(!unionLA.get());
     }
     else if(! unionLA.get()) {
         ret = std::move(unionPoints);
-        assert(!unionPoints.get());
     }
     else {
         ret = PointGeometryUnion::Union(*unionPoints, *unionLA);

tests/xmltester/SimpleWKTTester.cpp

@@ -61,6 +61,8 @@ main(int /*argc*/, char** /*argv*/)
         out.flush();
         out.close();
         cout << "End of Testing" << endl;
+        delete r;
+        delete w;
 
     }
     catch(const GEOSException& ge) {

tools/ci/script_autotools_scanbuild.sh

@@ -0,0 +1,18 @@
+#!/bin/bash -e
+#
+# Travis CI script for GEOS build with GNU Autotools
+#
+# Copyright (C) 2013 Mateusz Loskot <[email protected]>
+#
+# This is free software; you can redistribute and/or modify it under
+# the terms of the GNU Lesser General Public Licence as published
+# by the Free Software Foundation.
+# See the COPYING file for more information.
+#
+source ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
+
+cd ${TRAVIS_BUILD_DIR}
+./autogen.sh
+cd -
+${TRAVIS_BUILD_DIR}/configure CC=clang CXX=clang++ CXXFLAGS="-std=c++11"
+scan-build --status-bugs make -j2