From e9d271924731ef0e7c5269235280b4eb8b62e492 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Fri, 25 May 2012 17:06:01 +0200
Subject: [PATCH] config: getDaemSkippedPaths() could crash if daemSkippedPaths
 was empty

---
 src/common/rclconfig.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/common/rclconfig.cpp b/src/common/rclconfig.cpp
index d3102615..5f0bfc55 100644
--- a/src/common/rclconfig.cpp
+++ b/src/common/rclconfig.cpp
@@ -969,12 +969,17 @@ vector<string> RclConfig::getDaemSkippedPaths()
 	*it = path_tildexpand(*it);
 	*it = path_canon(*it);
     }
-    sort(dskpl.begin(), dskpl.end());
 
     vector<string> skpl1 = getSkippedPaths();
     vector<string> skpl;
-    merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(), skpl.begin());
-    unique(skpl.begin(), skpl.end());
+    if (dskpl.empty()) {
+	skpl = skpl1;
+    } else {
+	sort(dskpl.begin(), dskpl.end());
+	merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(), 
+	      skpl.begin());
+	unique(skpl.begin(), skpl.end());
+    }
     return skpl;
 }