Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-26 12:27:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update UTF-8 validation checks.

Browse Source
This commit is contained in:
Roger A. Light
2017-07-30 21:57:43 +01:00
parent df9ad5f0bd
commit b11855821e
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/utf8_mosq.c
+6 -6
View File
@@ -60,11 +60,11 @@ int mosquitto_validate_utf8(const char *str, int len)
}
/* Reconstruct full code point */
if(i == len-codelen+1){
/* Not enough data */
return MOSQ_ERR_MALFORMED_UTF8;
}
for(j=0; j<codelen-1; j++){
if(i == len-1){
/* Not enough data */
return MOSQ_ERR_MALFORMED_UTF8;
}
if((ustr[++i] & 0xC0) != 0x80){
/* Not a continuation byte */
return MOSQ_ERR_MALFORMED_UTF8;
@@ -77,12 +77,12 @@ int mosquitto_validate_utf8(const char *str, int len)
return MOSQ_ERR_MALFORMED_UTF8;
}
/* Check for overlong encodings */
/* Check for overlong or out of range encodings */
if(codelen == 2 && codepoint < 0x0080){
return MOSQ_ERR_MALFORMED_UTF8;
}else if(codelen == 3 && codepoint < 0x0800){
return MOSQ_ERR_MALFORMED_UTF8;
}else if(codelen == 4 && codepoint < 0x10000){
}else if(codelen == 4 && (codepoint < 0x10000 || codepoint > 0x10FFFF)){
return MOSQ_ERR_MALFORMED_UTF8;
}
}
test/lib/c/09-util-utf8-validate.c
+2 -1
View File
@@ -53,7 +53,8 @@ int main(int argc, char *argv[])
assert_valid("2.3.2 U-0000E000 = ee 80 80 = \"\"");
assert_valid("2.3.3 U-0000FFFD = ef bf bd = \"�\"");
assert_valid("2.3.4 U-0010FFFF = f4 8f bf bf = \"�\"");
assert_valid("2.3.5 U-00110000 = f4 90 80 80 = \"�\"");
/* This used to be valid in pre-2003 utf-8 */
assert_invalid("2.3.5 U-00110000 = f4 90 80 80 = \"�\"");
/* 3 Malformed sequences */
/* 3.1 Unexpected continuation bytes */
test/lib/cpp/09-util-utf8-validate.cpp
+2 -1
View File
@@ -53,7 +53,8 @@ int main(int argc, char *argv[])
assert_valid("2.3.2 U-0000E000 = ee 80 80 = \"\"");
assert_valid("2.3.3 U-0000FFFD = ef bf bd = \"�\"");
assert_valid("2.3.4 U-0010FFFF = f4 8f bf bf = \"�\"");
assert_valid("2.3.5 U-00110000 = f4 90 80 80 = \"�\"");
/* This used to be valid in pre-2003 utf-8 */
assert_invalid("2.3.5 U-00110000 = f4 90 80 80 = \"�\"");
/* 3 Malformed sequences */
/* 3.1 Unexpected continuation bytes */