Re: [Merkaartor] Fix for a nasty crash

2015-03-18 Thread Ladislav Laska
Hi!

I've not seen this crash, but the fix seems reasonable.  It's now commited in 
git. Thanks for the contribution!

On Tue, Mar 17, 2015 at 11:06:30PM +0100, Lutz Mändle wrote:
 Hi,
 
 the attached patch resolves a nasty crash issue in merkaartor. The crash 
 happens accidentally after downloading osm data at the end of the parsing 
 xml stage, before displaying the downloaded data.
 Running merkaartor under a debugger reveals, that there is sometimes a 
 problem 
 with the indexed access on the PossiblePainters in Feature.cpp, a QList 
 descendant.
 
 -- Lutz Mändle Internet: lmaen...@gmx.net
 Berlin/Germany
 

 diff -Naur ./orig/merkaartor/src/Features/Feature.cpp 
 ./patched/merkaartor/src/Features/Feature.cpp
 --- ./orig/merkaartor/src/Features/Feature.cpp2015-03-17 
 22:01:18.780704736 +0100
 +++ ./patched/merkaartor/src/Features/Feature.cpp 2015-03-17 
 20:57:45.0 +0100
 @@ -618,6 +618,7 @@
  if (!PossiblePaintersUpToDate)
  updatePossiblePainters();
  
 +QMutexLocker mutlock(theFeature-featMutex);
  CurrentPainter = NULL;
  PixelPerMForPainter = PixelPerM;
  for (int i=0; iPossiblePainters.size(); ++i)

 ___
 Merkaartor mailing list
 Merkaartor@openstreetmap.org
 https://lists.openstreetmap.org/listinfo/merkaartor


-- 
S pozdravem Ladislav Láska  la...@kam.mff.cuni.cz
Katedra Aplikované Matematiky, MFF UK   tel.: +420 739 464 167

___
Merkaartor mailing list
Merkaartor@openstreetmap.org
https://lists.openstreetmap.org/listinfo/merkaartor


[Merkaartor] Fix for a nasty crash

2015-03-17 Thread Lutz Mändle

Hi,

the attached patch resolves a nasty crash issue in merkaartor. The crash 
happens accidentally after downloading osm data at the end of the 
parsing xml stage, before displaying the downloaded data.
Running merkaartor under a debugger reveals, that there is sometimes a 
problem with the indexed access on the PossiblePainters in Feature.cpp, 
a QList descendant.


--
Lutz Mändle Internet: lmaen...@gmx.net
Berlin/Germany

diff -Naur ./orig/merkaartor/src/Features/Feature.cpp ./patched/merkaartor/src/Features/Feature.cpp
--- ./orig/merkaartor/src/Features/Feature.cpp	2015-03-17 22:01:18.780704736 +0100
+++ ./patched/merkaartor/src/Features/Feature.cpp	2015-03-17 20:57:45.0 +0100
@@ -618,6 +618,7 @@
 if (!PossiblePaintersUpToDate)
 updatePossiblePainters();
 
+QMutexLocker mutlock(theFeature-featMutex);
 CurrentPainter = NULL;
 PixelPerMForPainter = PixelPerM;
 for (int i=0; iPossiblePainters.size(); ++i)
___
Merkaartor mailing list
Merkaartor@openstreetmap.org
https://lists.openstreetmap.org/listinfo/merkaartor