Fix utf-8 character encoding conversion

Felipe Zimmerle · Felipe Zimmerle · commit 739048749e11 · 2018-09-04T21:02:09.000-03:00
Reported on: #1794
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
 DD MMM YYYY - 2.9.3 - To be released
 ------------------------------------
 
+ * Fix utf-8 character encoding conversion
+   [Issue #1794 - @tinselcity, @zimmerle]
  * Fix ip tree lookup on netmask content
    [Issue #1793 - @tinselcity, @zimmerle]
  * IIS: set overrideModeDefault to Allow so that individual websites can
diff --git a/apache2/re_operators.c b/apache2/re_operators.c
@@ -4321,7 +4321,7 @@ static int detect_utf8_character(const unsigned char *p_read, unsigned int lengt
         else {
             unicode_len = 4;
             /* compute character number */
-            d = ((c & 0x07) << 18) | ((*(p_read + 1) & 0x3F) << 12) | ((*(p_read + 2) & 0x3F) < 6) | (*(p_read + 3) & 0x3F);
+            d = ((c & 0x07) << 18) | ((*(p_read + 1) & 0x3F) << 12) | ((*(p_read + 2) & 0x3F) << 6) | (*(p_read + 3) & 0x3F);
         }
     }
     /* any other first byte is invalid (RFC 3629) */

Original file line number	Diff line number	Diff line change
`@@ -4321,7 +4321,7 @@ static int detect_utf8_character(const unsigned char *p_read, unsigned int lengt`
`4321`	`4321`	`else {`
`4322`	`4322`	`unicode_len = 4;`
`4323`	`4323`	`/* compute character number */`
`4324`		`- d = ((c & 0x07) << 18) \| (((p_read + 1) & 0x3F) << 12) \| (((p_read + 2) & 0x3F) < 6) \| (*(p_read + 3) & 0x3F);`
	`4324`	`+ d = ((c & 0x07) << 18) \| (((p_read + 1) & 0x3F) << 12) \| (((p_read + 2) & 0x3F) << 6) \| (*(p_read + 3) & 0x3F);`
`4325`	`4325`	`}`
`4326`	`4326`	`}`
`4327`	`4327`	`/* any other first byte is invalid (RFC 3629) */`