From df0fdb31cb60c71777db0f75195e9f43cd8ba6c5 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Mon, 30 Jun 2014 01:27:37 +0200
Subject: fix crash bug with connectors because of constructor "ConnRef(Router
 *router, const unsigned int id)", _srcVert and _dstVert can be NULL, and
 _active can be false. this constructor seems unfinished, but is used
 elsewhere in the code. hence the crash.

Fixed bugs:
  - https://launchpad.net/bugs/977003

(bzr r13444)
---
 src/libavoid/connector.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/libavoid/connector.cpp')

diff --git a/src/libavoid/connector.cpp b/src/libavoid/connector.cpp
index 8dcb66f2d..b8c99a48c 100644
--- a/src/libavoid/connector.cpp
+++ b/src/libavoid/connector.cpp
@@ -442,11 +442,11 @@ void ConnRef::makeActive(void)
 
 void ConnRef::makeInactive(void)
 {
-    COLA_ASSERT(_active);
-    
-    // Remove from connRefs list.
-    _router->connRefs.erase(_pos);
-    _active = false;
+    if (_active) {
+        // Remove from connRefs list.
+        _router->connRefs.erase(_pos);
+        _active = false;
+    }
 }
 
 
@@ -553,8 +553,12 @@ void ConnRef::unInitialise(void)
 
 void ConnRef::removeFromGraph(void)
 {
-    _srcVert->removeFromGraph();
-    _dstVert->removeFromGraph();
+    if (_srcVert) {
+        _srcVert->removeFromGraph();
+    }
+    if (_dstVert) {
+        _dstVert->removeFromGraph();
+    }
 }
 
 
-- 
cgit v1.2.3


From 10f3e62a490f3942c0f5be3947d99c4a4f41ea1e Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Thu, 7 Aug 2014 08:06:10 +0200
Subject: Connectors. Fix for Bug #1155046 (Assertion pathlen < 200 failed).

Fixed bugs:
  - https://launchpad.net/bugs/1155046

(bzr r13501)
---
 src/libavoid/connector.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/libavoid/connector.cpp')

diff --git a/src/libavoid/connector.cpp b/src/libavoid/connector.cpp
index b8c99a48c..40ded7498 100644
--- a/src/libavoid/connector.cpp
+++ b/src/libavoid/connector.cpp
@@ -845,7 +845,10 @@ bool ConnRef::generatePath(void)
             break;
         }
         // Check we don't have an apparent infinite connector path.
-        COLA_ASSERT(pathlen < 200);
+//#ifdef PATHDEBUG
+        db_printf("Path length: %i\n", pathlen);
+//#endif
+        COLA_ASSERT(pathlen < 10000);
     }
     std::vector<Point> path(pathlen);
 
-- 
cgit v1.2.3