From 7648d777302595d819e2a34e41bbda157392667b Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Thu, 30 Jul 2009 09:47:03 +0000
Subject: Make sure we don't hang in an infinite loop when encountering
 malformed macro/template files.

---
 server/src/macrolist.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'server/src/macrolist.cc')

diff --git a/server/src/macrolist.cc b/server/src/macrolist.cc
index 0e86a47..b67f239 100644
--- a/server/src/macrolist.cc
+++ b/server/src/macrolist.cc
@@ -63,9 +63,13 @@ MacroList::MacroList(std::string macropath)
   std::vector<std::string>::iterator i = macros.begin();
   while(i != macros.end()) {
     MacroHeaderParser parser(macropath + "/" + *i);
-    parser.parse();
-    Macro *macro = parser.getMacro();
-    (*this)[macro->attributes["name"]][VersionStr(macro->attributes["version"])] = *i;
+    try {
+      parser.parse();
+      Macro *macro = parser.getMacro();
+      (*this)[macro->attributes["name"]][VersionStr(macro->attributes["version"])] = *i;
+    } catch(Exception &e) {
+      PRACRO_WARN(macrolist, "Skipping %s: %s\n", i->c_str(), e.what());
+    }
     i++;
   }
 
-- 
cgit v1.2.3