Merge pull request #12 from zenden2k/master

Fixed "wrap around" of unsigned int in CParser::error(); Fixed memory leak in CSelector* CParser::parseSelector();
lazytiger · May 18, 2015 · 60a6d45 · 60a6d45
2 parents 6391c99 + 7778b36
commit 60a6d45
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/Document.cpp b/src/Document.cpp
@@ -20,7 +20,7 @@ CDocument::CDocument()
 	mpOutput = NULL;
 }
 
-void CDocument::parse(std::string aInput)
+void CDocument::parse(const std::string& aInput)
 {
 	reset();
 	mpOutput = gumbo_parse(aInput.c_str());

diff --git a/src/Document.h b/src/Document.h
@@ -26,7 +26,7 @@ class CDocument: public CObject
 
 		CDocument();
 
-		void parse(std::string aInput);
+		void parse(const std::string& aInput);
 
 		virtual ~CDocument();
 

diff --git a/src/Parser.cpp b/src/Parser.cpp
@@ -86,6 +86,7 @@ CSelector* CParser::parseSelector()
 			return ret;
 		}
 
+		CSelector* oldRet = ret;
 		CSelector* sel = parseSimpleSelectorSequence();
 		if (combinator == ' ')
 		{
@@ -107,6 +108,8 @@ CSelector* CParser::parseSelector()
 		{
 			throw error("impossible");
 		}
+		oldRet->release();
+		sel->release();
 	}
 
 	throw error("impossible");
@@ -956,9 +959,8 @@ std::string CParser::error(std::string message)
 	}
 
 	std::string ret = message + " at:";
-	for (unsigned int i = ds.size() - 1; i >= 0; i--)
-	{
-		ret.push_back(ds[i]);
+	for (std::string::reverse_iterator rit = ds.rbegin(); rit != ds.rend(); ++rit) {
+		ret.push_back(*rit);
 	}
 
 	return ret;