From 503a2b302d9e13b99be4574e5d7b8821dd31504d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 28 Jun 2012 21:59:59 +0300 Subject: Add validation for some xml parameters. --- src/utils/xml.cpp | 17 +++++++++++++++++ src/utils/xml.h | 6 ++++++ 2 files changed, 23 insertions(+) (limited to 'src/utils') diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 140da72df..f7350ce92 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -122,6 +122,23 @@ namespace XML return ret; } + int getIntProperty(XmlNodePtr node, const char* name, int def, int min, int max) + { + int &ret = def; + + xmlChar *prop = xmlGetProp(node, BAD_CAST name); + if (prop) + { + ret = atoi(reinterpret_cast(prop)); + xmlFree(prop); + } + if (ret < min) + ret = min; + else if (ret > max) + ret = max; + return ret; + } + double getFloatProperty(XmlNodePtr node, const char* name, double def) { double &ret = def; diff --git a/src/utils/xml.h b/src/utils/xml.h index eb5ee88b0..a4ff7eb2e 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -85,6 +85,12 @@ namespace XML */ int getProperty(XmlNodePtr node, const char *name, int def); + /** + * Gets an integer property from an XmlNodePtr. + */ + int getIntProperty(XmlNodePtr node, const char* name, int def, + int min, int max); + /** * Gets a string property from an XmlNodePtr. */ -- cgit v1.2.3-70-g09d2