From 7648d777302595d819e2a34e41bbda157392667b Mon Sep 17 00:00:00 2001 From: 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/templatelist.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'server/src/templatelist.cc') diff --git a/server/src/templatelist.cc b/server/src/templatelist.cc index 2e6f176..cdf2b4b 100644 --- a/server/src/templatelist.cc +++ b/server/src/templatelist.cc @@ -63,9 +63,14 @@ TemplateList::TemplateList(std::string templatepath) std::vector::iterator i = templates.begin(); while(i != templates.end()) { TemplateHeaderParser parser(templatepath + "/" + *i); - parser.parse(); - Template *templ = parser.getTemplate(); - (*this)[templ->attributes["name"]][VersionStr(templ->attributes["version"])] = *i; + try { + parser.parse(); + Template *templ = parser.getTemplate(); + (*this)[templ->attributes["name"]][VersionStr(templ->attributes["version"])] = *i; + } catch(Exception &e) { + PRACRO_WARN(templatelist, "Skipping %s: %s\n", i->c_str(), e.what()); + } + i++; } -- cgit v1.2.3