Skip to content
Browse files
Release of 2.8.8
  • Loading branch information
jef-n committed Mar 25, 2016
1 parent ea74db3 commit 22678d97dcf9c9e0f56ac9ffdf89785395521b27
Showing with 101 additions and 3 deletions.
  1. +1 −1 CMakeLists.txt
  2. +92 −0 ChangeLog
  3. +8 −2 debian/changelog
@@ -1,6 +1,6 @@
IF (POLICY CMP0048) # in CMake 3.0.0+
@@ -1,3 +1,95 @@
Even Rouault <> 2016-03-24

[Spatialite] Fix crash on iterator closing if connection failed.

If an iterator fails to open the spatialite database (mHandle == nullptr
in QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator() ),
a crash will occur at the destruction of the QgsSpatiaLiteFeatureSource,
due to the iterator not being removed from the list of active iterators.

Currently QgsSpatiaLiteFeatureIterator::close() does not call
iteratorClosed() if mHandle is invalid, which later causes
QgsAbstractFeatureSource::~QgsAbstractFeatureSource() to try calling
the close() method of a now defunct iterator.

If not applying the patch, the added test case crashes with:

177: src/providers/spatialite/qgsspatialiteconnection.cpp: 736: (openDb) [1ms] New sqlite connection for /tmp/test.sqlite.corrupt
177: src/providers/spatialite/qgsspatialiteconnection.cpp: 750: (openDb) [1ms] Failure while connecting to: /tmp/test.sqlite.corrupt
177: invalid metadata tables
177: src/core/qgsfeaturerequest.cpp: 259: (~QgsAbstractFeatureSource) [0ms] closing active iterator
177: CMake Error at PyQgsSpatialiteProvider.cmake:22 (MESSAGE):
177: Test failed: Segmentation fault
(cherry picked from commit 2b15eaa14d9e5067ed32f41572d5e9658fa8b278)

Even Rouault <> 2016-03-24

Use consistant default value of 60000ms for /qgis/networkAndProxy/networkTimeout

Currently there's an inconsistancy between the Options dialog that displays a
default value of 60000ms for network request timeouts, whereas places in the
code use 20000ms. I propose to align on 60000s, since there are occurrences
of network requests, for example big WFS GetFeature requests, that can take
more than 20s to start.

(testqgswcspublicservers.cpp update added)

(cherry picked from commit 2f7d4a78)

Even Rouault <> 2016-03-23

[Spatialite] Use correct free function for sqlite3_bind_blob of geometries

Currently sqlite3_bind_blob() uses free() as the free function of WKB
blobs returned by convertFromGeosWKB(). But those are allocated with
new[] and should consequently be freed with delete[].

Spotted by Valgrind:
==4014== Mismatched free() / delete / delete []
==4014== at 0x4C287BE: free (vg_replace_malloc.c:446)
==4014== by 0xE42E481: sqlite3VdbeMemReleaseExternal (sqlite3.c:57237)
==4014== by 0xE42E4E3: sqlite3VdbeMemRelease (sqlite3.c:57252)
==4014== by 0xE42EC3E: releaseMemArray (sqlite3.c:59208)
==4014== by 0xE42ED1E: sqlite3VdbeDeleteObject (sqlite3.c:60561)
==4014== by 0xE46A6DB: sqlite3VdbeFinalize (sqlite3.c:60528)
==4014== by 0xE46A916: sqlite3_finalize (sqlite3.c:61431)
==4014== by 0x7FB23958: QgsSpatiaLiteProvider::addFeatures(QList<QgsFeature>&) (qgsspatialiteprovider.cpp:3752)
==4014== Address 0x8e2a8b30 is 0 bytes inside a block of size 94 alloc'd
==4014== at 0x4C29520: operator new[](unsigned long) (vg_replace_malloc.c:363)
==4014== by 0x7FB1B964: QgsSpatiaLiteProvider::convertFromGeosWKB(unsigned char const*, int, unsigned char**, int*, int) (qgsspatialiteprovider.cpp:1341)
==4014== by 0x7FB234B5: QgsSpatiaLiteProvider::addFeatures(QList<QgsFeature>&) (qgsspatialiteprovider.cpp:3676)

(cherry picked from commit 2e04162e377969e41675d1c2f7f36da7f171c945)

Juergen E. Fischer <> 2016-03-19

crssync: skip more crses that cannot be copied

(cherry picked from commit 71429be7a289e1b8050005dabcb3e0e33ac1cdbd)

Juergen E. Fischer <> 2016-03-15

Add internal qwtpolar 1.1.1 for Qwt 6.1

(cherry picked from commit c3881d48b18e6dd8119abdd76cf76963b5f35481)

Juergen E. Fischer <> 2016-03-08

globe: adapt to osgearth 2.7

(cherry picked from commit 342a754c399b785053dc766402486acd72e39be9)

rldhont <> 2016-03-09

[BUGFIX][QGIS Server] To avoid infinite loop in layer creation

Insert layer in registry and cache before addValueRelationLayersForLayer

Juergen E. Fischer <> 2016-02-26

Release of 2.8.7

Juergen E. Fischer <> 2016-02-26

german translation update
@@ -1,8 +1,14 @@
qgis (2.8.7) UNRELEASED; urgency=medium
qgis (2.8.8) UNRELEASED; urgency=medium

* Release of 2.8.8

-- Jürgen E. Fischer <> Fri, 25 Mar 2016 13:19:22 +0100

qgis (2.8.7) unstable; urgency=medium

* Release of 2.8.7

-- Jürgen E. Fischer <> Fri, 26 Feb 2016 13:00:10 +0100
-- Jürgen E. Fischer <> Fri, 25 Mar 2016 13:19:22 +0100

qgis (2.8.6) unstable; urgency=medium

0 comments on commit 22678d9

Please sign in to comment.