Commit 3b980403 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Fixed a segfault that could occur when running findimageoverlaps. Fixes #4810. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7700 41f8697f-d340-4b68-9986-7bafba869bb8
parent e7aedbaa

isis/src/base/apps/findimageoverlaps/findimageoverlaps.xml

+3 −0
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ 
      Added an exception for giving findimageoverlaps a cube list of only 

      one cube. Fixes #4200.

    </change>

    <change name="Ian Humphrey" date="2017-05-23">

      Added a tryLock to avoid a segfault that could occur on OSX. Fixes #4810.

    </change>

  </history>



  <groups>

isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.cpp

+1 −0
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ namespace Isis { 
      // unblock the writing process after every 10 polygons if we need to write

      if (p_calculatedSoFar % 10 == 0 && (!snlist || (p_lonLatOverlaps.size() > snlist->size()))) {

        if (p_threadedCalculate) {

          p_calculatePolygonMutex.tryLock();

          p_calculatePolygonMutex.unlock();

        }

      }

isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.h

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ namespace Isis { 
   *                          message by latest Qt library 5.7.

   *   @history 2016-12-09 Marjorie Hahn - Added mutex tryLock() calls before unlocking to prevent

   *                          undefined behavior caused by unlocking an unlocked mutex.

   *   @history 2017-05-23 Ian Humphrey - Added a tryLock() to FindAllOverlaps to prevent a

   *                           segfault from occuring on OSX with certain data. Fixes #4810.

   * 

   */

  class ImageOverlapSet : private QThread {