"Cleanse" language tag - somebody managed to put newline into multiple fields

Author: rupor-github

CMakeLists.txt

@@ -14,7 +14,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 # Project version number
 set(PRJ_VERSION_MAJOR 9)
-set(PRJ_VERSION_MINOR 42)
+set(PRJ_VERSION_MINOR 43)
 configure_file("${PROJECT_SOURCE_DIR}/cmake/version.h.in" "${PROJECT_BINARY_DIR}/version.h")
 include_directories("${PROJECT_BINARY_DIR}")
 

lib2inpx/lib2inpx.cpp

@@ -655,7 +655,7 @@ void process_book(const mysql_connection& mysql, MYSQL_ROW record, const string&
     string book_type(record[3]);
     string book_deleted(record[4]);
     string book_time(record[5]);
-    string book_lang(record[6]);
+    string book_lang(cleanse_lang(record[6]));
     string book_kwds = (record[7] == NULL) ? "" : fix_data(cleanse(record[7]), g_limits.KeyWords);
 
     string book_md5;

lib2inpx/util.cpp

@@ -151,6 +151,16 @@ string cleanse(const string& s)
     return str;
 }
 
+string cleanse_lang(const string& s)
+{
+    string str(s);
+    boost::algorithm::erase_all(str, "\r");
+    boost::algorithm::erase_all(str, "\n");
+    boost::algorithm::trim_right(str);
+    boost::algorithm::trim_left(str);
+    return str;
+}
+
 string duplicate_quote(const string& str) { return boost::algorithm::replace_all_copy(str, "\'", "\'\'"); }
 
 #endif // DO_NOT_INCLUDE_PARSER
@@ -622,7 +632,7 @@ void fb2_parser::on_book_title(const std::string& str, const attributes_t& attrs
 
 void fb2_parser::on_keywords(const std::string& str, const attributes_t& attrs) { m_keywords = fix_data(cleanse(str), g_limits.KeyWords); }
 
-void fb2_parser::on_lang(const std::string& str, const attributes_t& attrs) { m_language = str; }
+void fb2_parser::on_lang(const std::string& str, const attributes_t& attrs) { m_language = cleanse_lang(str); }
 
 void fb2_parser::on_sequence(const std::string& str, const attributes_t& attrs)
 {

lib2inpx/util.h

@@ -25,6 +25,7 @@ extern bool      g_fix;
 void initialize_limits(const std::string& config);
 std::string fix_data(const std::string& str, size_t max_len);
 std::string cleanse(const std::string& s);
+std::string cleanse_lang(const std::string& s);
 
 #endif // DO_NOT_INCLUDE_PARSER