From ae4368a3ca49dfb22ddc5dad403e930a3ff80618 Mon Sep 17 00:00:00 2001
From: Arkshine <hv.contact@gmail.com>
Date: Mon, 1 Feb 2016 22:34:33 +0100
Subject: [PATCH] Remove inline comment support in multilingual INI parser

---
 amxmodx/CLang.cpp        |  2 +-
 amxmodx/CTextParsers.cpp | 61 +++++++++++++++++++++-------------------
 amxmodx/CTextParsers.h   |  3 +-
 public/ITextParsers.h    |  4 ++-
 4 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/amxmodx/CLang.cpp b/amxmodx/CLang.cpp
index f8d1c84a..90ab488c 100755
--- a/amxmodx/CLang.cpp
+++ b/amxmodx/CLang.cpp
@@ -490,7 +490,7 @@ int CLangMngr::MergeDefinitionFile(const char *file)
 	Data.currentFile = file;
 
 	unsigned int line, col;
-	bool result = textparsers->ParseFile_INI(file, static_cast<ITextListener_INI*>(this), &line, &col);
+	bool result = textparsers->ParseFile_INI(file, static_cast<ITextListener_INI*>(this), &line, &col, false);
 
 	if (!result)
 	{
diff --git a/amxmodx/CTextParsers.cpp b/amxmodx/CTextParsers.cpp
index 8d384834..2e7a83c4 100644
--- a/amxmodx/CTextParsers.cpp
+++ b/amxmodx/CTextParsers.cpp
@@ -778,7 +778,7 @@ failed:
 * INI parser
 */
 
-bool TextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listener, unsigned int *line, unsigned int *col)
+bool TextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listener, unsigned int *line, unsigned int *col, bool inline_comment)
 {
 	FILE *fp = fopen(file, "rt");
 	unsigned int curline = 0;
@@ -842,47 +842,50 @@ bool TextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listene
 			continue;
 		}
 
-		/* Now search for comment characters */
-		in_quote = false;
-		save_ptr = ptr;
-		for (size_t i = 0; i<len; i++, ptr++)
+		if (inline_comment)
 		{
-			if (!in_quote)
+			/* Now search for comment characters */
+			in_quote = false;
+			save_ptr = ptr;
+			for (size_t i = 0; i<len; i++, ptr++)
 			{
-				switch (*ptr)
+				if (!in_quote)
 				{
-					case '"':
+					switch (*ptr)
 					{
-						in_quote = true;
-						break;
-					}
-					case ';':
-					{
-						/* Stop the loop */
-						len = i;
+						case '"':
+						{
+							in_quote = true;
+							break;
+						}
+						case ';':
+						{
+							/* Stop the loop */
+							len = i;
 
-						/* Terminate the string here */
-						*ptr = '\0';
-						break;
+							/* Terminate the string here */
+							*ptr = '\0';
+							break;
+						}
+					}
+				}
+				else 
+				{
+					if (*ptr == '"')
+					{
+						in_quote = false;
 					}
 				}
 			}
-			else 
+
+			if (!len)
 			{
-				if (*ptr == '"')
-				{
-					in_quote = false;
-				}
+				continue;
 			}
-		}
 
-		if (!len)
-		{
-			continue;
+			ptr = save_ptr;
 		}
 
-		ptr = save_ptr;
-
 		/* Lastly, strip ending whitespace off */
 		for (size_t i = len - 1; i<len; i--)
 		{
diff --git a/amxmodx/CTextParsers.h b/amxmodx/CTextParsers.h
index e3e9985f..cf735f2d 100644
--- a/amxmodx/CTextParsers.h
+++ b/amxmodx/CTextParsers.h
@@ -52,7 +52,8 @@ public:
 	bool ParseFile_INI(const char *file,
 		ITextListener_INI *ini_listener,
 		unsigned int *line,
-		unsigned int *col);
+		unsigned int *col,
+		bool inline_comment);
 
 	SMCError ParseFile_SMC(const char *file,
 		ITextListener_SMC *smc_listener,
diff --git a/public/ITextParsers.h b/public/ITextParsers.h
index 67e27a46..a69feaba 100644
--- a/public/ITextParsers.h
+++ b/public/ITextParsers.h
@@ -351,12 +351,14 @@
 		 * @param ini_listener	Event handler for reading file.
 		 * @param line			If non-NULL, will contain last line parsed (0 if file could not be opened).
 		 * @param col			If non-NULL, will contain last column parsed (undefined if file could not be opened).
+		 * @param inline_comment Whether inline comment is allowed.
 		 * @return				True if parsing succeeded, false if file couldn't be opened or there was a syntax error.
 		 */
 		virtual bool ParseFile_INI(const char *file,
 									ITextListener_INI *ini_listener,
 									unsigned int *line,
-									unsigned int *col) =0;
+									unsigned int *col,
+									bool inline_comment = true) =0;
 
 		/**
 		 * @brief Parses an SMC-format text file.