Fix the SecUnicodeMapFile and SecUnicodeCodePage

Author: Felipe Zimmerle

CHANGES

@@ -1,6 +1,8 @@
 v3.0.3 - YYYY-MMM-DD (to be released)
 -------------------------------------
 
+ - Fix the SecUnicodeMapFile and SecUnicodeCodePage
+   [xxxx - @zimmerle]
  - Changes the timing to save the rule message
    [0xca270 - @zimmerle]
  - Fix crash in msc_rules_add_file() when using disruptive action in chain

headers/modsecurity/rules_properties.h

@@ -82,9 +82,10 @@ class ConfigSet {
 
 class ConfigUnicodeMap {
  public:
-    ConfigUnicodeMap() : m_set(false), m_unicode_map_table(NULL) { }
+    ConfigUnicodeMap() : m_set(false), m_unicode_map_table(NULL), m_unicode_codepage(0) { }
     bool m_set;
     int *m_unicode_map_table;
+    unsigned long int m_unicode_codepage;
 };
 
 class RulesProperties {
@@ -352,6 +353,8 @@ class RulesProperties {
         if (from->m_unicodeMapTable.m_set == true) {
             to->m_unicodeMapTable.m_unicode_map_table = \
                 from->m_unicodeMapTable.m_unicode_map_table;
+            to->m_unicodeMapTable.m_unicode_codepage = \
+                from->m_unicodeMapTable.m_unicode_codepage;
             to->m_unicodeMapTable.m_set = true;
         }
 

src/parser/location.hh

@@ -1,4 +1,4 @@
-// A Bison parser, made by GNU Bison 3.0.5.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Locations for Bison parsers in C++
 
@@ -42,7 +42,7 @@
 
 
 namespace yy {
-#line 46 "location.hh" // location.cc:292
+#line 46 "location.hh" // location.cc:290
   /// Abstract a location.
   class location
   {
@@ -167,7 +167,7 @@ namespace yy {
    ** Avoid duplicate information.
    */
   template <typename YYChar>
-  inline std::basic_ostream<YYChar>&
+  std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
   {
     unsigned end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
@@ -185,5 +185,5 @@ namespace yy {
 
 
 } // yy
-#line 189 "location.hh" // location.cc:292
+#line 189 "location.hh" // location.cc:290
 #endif // !YY_YY_LOCATION_HH_INCLUDED

src/parser/position.hh

@@ -1,4 +1,4 @@
-// A Bison parser, made by GNU Bison 3.0.5.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Positions for Bison parsers in C++
 
@@ -52,7 +52,7 @@
 
 
 namespace yy {
-#line 56 "position.hh" // location.cc:292
+#line 56 "position.hh" // location.cc:290
   /// Abstract a position.
   class position
   {
@@ -104,12 +104,10 @@ namespace yy {
     unsigned column;
 
   private:
-    /// Compute max(min, lhs+rhs) (provided min <= lhs).
-    static unsigned add_ (unsigned lhs, int rhs, unsigned min)
+    /// Compute max(min, lhs+rhs).
+    static unsigned add_ (unsigned lhs, int rhs, int min)
     {
-      return (0 < rhs || -static_cast<unsigned>(rhs) < lhs
-              ? rhs + lhs
-              : min);
+      return static_cast<unsigned>(std::max(min, static_cast<int>(lhs) + rhs));
     }
   };
 
@@ -165,7 +163,7 @@ namespace yy {
    ** \param pos a reference to the position to redirect
    */
   template <typename YYChar>
-  inline std::basic_ostream<YYChar>&
+  std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
   {
     if (pos.filename)
@@ -175,5 +173,5 @@ namespace yy {
 
 
 } // yy
-#line 179 "position.hh" // location.cc:292
+#line 177 "position.hh" // location.cc:290
 #endif // !YY_YY_POSITION_HH_INCLUDED