scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-17 03:50:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed utf8 bug, which sometimes lead to z85 handling of pure binary data

Browse Source
This commit is contained in:
TLINDEN
2014-03-17 19:15:04 +01:00
parent 322a135ee3
commit b6dadceda3
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpcp/z85.c
View File

@@ -101,7 +101,6 @@ size_t _buffer_is_binary(byte *buf, size_t len) {
for (pos=1; pos<len; ++pos) {
if(buf[pos] == '\0' || (buf[pos] != '\r' && buf[pos] != '\n' && isprint(buf[pos]) == 0)) {
/* it's probably a binary char */
/* check for utf8 */
wide[0] = buf[pos];
for(i=1; i<3; i++) {
@@ -112,20 +111,23 @@ size_t _buffer_is_binary(byte *buf, size_t len) {
if(is_utf8(wide) > 1) {
pos += i; /* jump over the utf we already found */
utf = 1;
break;
}
}
else
break;
}
memset(wide, 0, 4);
if(utf == 1) {
/* it's a utf8 char, continue checking, reset wide */
memset(wide, 0, 4);
utf = 0;
continue;
}
break; /* if we reach this, then it's binary and not utf8, stop checking */
}
}
if(pos < len)
return pos; /* binary */
else