security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

Fixed printing of badly encoded utf-8

Browse Source
This commit is contained in:
Werner Koch 2001-07-03 18:19:11 +00:00
parent bafeff8335
commit b000da8af8
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/ChangeLog
View File

@ -1,3 +1,9 @@
2001-07-03 Werner Koch <wk@gnupg.org>
* strgutil.c (utf8_to_native): Fixed printing of invalid utf-8
characters. Thomas Roessler reported that the escaping didn't work
correct.
2001-06-12 Werner Koch <wk@gnupg.org> 2001-06-12 Werner Koch <wk@gnupg.org>
* strgutil.c (ascii_memistr,ascii_isupper,ascii_islower, * strgutil.c (ascii_memistr,ascii_isupper,ascii_islower,

29
util/strgutil.c
View File

@ -447,7 +447,7 @@ utf8_to_native( const char *string, size_t length )
{ {
int nleft; int nleft;
int i; int i;
byte encbuf[7]; byte encbuf[8];
int encidx; int encidx;
const byte *s; const byte *s;
size_t n; size_t n;
@ -509,27 +509,32 @@ utf8_to_native( const char *string, size_t length )
else if( (*s & 0xe0) == 0xc0 ) { /* 110x xxxx */ else if( (*s & 0xe0) == 0xc0 ) { /* 110x xxxx */
val = *s & 0x1f; val = *s & 0x1f;
nleft = 1; nleft = 1;
encbuf[encidx=0] = *s; encidx = 0;
encbuf[encidx++] = *s;
} }
else if( (*s & 0xf0) == 0xe0 ) { /* 1110 xxxx */ else if( (*s & 0xf0) == 0xe0 ) { /* 1110 xxxx */
val = *s & 0x0f; val = *s & 0x0f;
nleft = 2; nleft = 2;
encbuf[encidx=0] = *s; encidx = 0;
encbuf[encidx++] = *s;
} }
else if( (*s & 0xf8) == 0xf0 ) { /* 1111 0xxx */ else if( (*s & 0xf8) == 0xf0 ) { /* 1111 0xxx */
val = *s & 0x07; val = *s & 0x07;
nleft = 3; nleft = 3;
encbuf[encidx=0] = *s; encidx = 0;
encbuf[encidx++] = *s;
} }
else if( (*s & 0xfc) == 0xf8 ) { /* 1111 10xx */ else if( (*s & 0xfc) == 0xf8 ) { /* 1111 10xx */
val = *s & 0x03; val = *s & 0x03;
nleft = 4; nleft = 4;
encbuf[encidx=0] = *s; encidx = 0;
encbuf[encidx++] = *s;
} }
else if( (*s & 0xfe) == 0xfc ) { /* 1111 110x */ else if( (*s & 0xfe) == 0xfc ) { /* 1111 110x */
val = *s & 0x01; val = *s & 0x01;
nleft = 5; nleft = 5;
encbuf[encidx=0] = *s; encidx = 0;
encbuf[encidx++] = *s;
} }
else { /* invalid encoding: print as \xnn */ else { /* invalid encoding: print as \xnn */
if( p ) { if( p ) {
@ -542,15 +547,20 @@ utf8_to_native( const char *string, size_t length )
} }
else if( *s < 0x80 || *s >= 0xc0 ) { /* invalid */ else if( *s < 0x80 || *s >= 0xc0 ) { /* invalid */
if( p ) { if( p ) {
for(i=0; i < encidx; i++ ) {
sprintf(p, "\\x%02x", encbuf[i] );
p += 4;
}
sprintf(p, "\\x%02x", *s ); sprintf(p, "\\x%02x", *s );
p += 4; p += 4;
} }
n += 4; n += 4 + 4*encidx;
nleft = 0; nleft = 0;
encidx = 0;
resync = 1; resync = 1;
} }
else { else {
encbuf[++encidx] = *s; encbuf[encidx++] = *s;
val <<= 6; val <<= 6;
val |= *s & 0x3f; val |= *s & 0x3f;
if( !--nleft ) { /* ready */ if( !--nleft ) { /* ready */
@ -571,6 +581,7 @@ utf8_to_native( const char *string, size_t length )
} }
} }
n += encidx*4; n += encidx*4;
encidx = 0;
} }
} }
else { /* native set */ else { /* native set */
@ -586,9 +597,9 @@ utf8_to_native( const char *string, size_t length )
} }
} }
n += encidx*4; n += encidx*4;
encidx = 0;
} }
} }
} }
} }