GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json: Improve auto-base64 encoding to not split UTF-8 chars.

Browse Source 
* src/gpgme-json.c (make_data_object): Switch to Base64 also for UTF-8
characters.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-05-09 16:41:05 +02:00
parent e2a8a87bf9
commit e54b110aec
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gpgme-json.c
View File

@ -610,7 +610,8 @@ make_data_object (cjson_t result, gpgme_data_t data, size_t chunksize,
{ {
gpg_error_t err; gpg_error_t err;
char *buffer; char *buffer;
size_t buflen; const char *s;
size_t buflen, n;
int c; int c;
if (!base64 || base64 == -1) /* Make sure that we really have a string. */ if (!base64 || base64 == -1) /* Make sure that we really have a string. */
@ -629,13 +630,18 @@ make_data_object (cjson_t result, gpgme_data_t data, size_t chunksize,
base64 = 0; base64 = 0;
if (!buflen) if (!buflen)
log_fatal ("Appended Nul byte got lost\n"); log_fatal ("Appended Nul byte got lost\n");
if (memchr (buffer, 0, buflen-1)) /* Figure out if there is any Nul octet in the buffer. In that
{ * case we need to Base-64 the buffer. Due to problems with the
buflen--; /* Adjust for the extra nul byte. */ * browser's Javascript we use Base-64 also in case an UTF-8
base64 = 1; * character is in the buffer. This is because the chunking may
} * split an UTF-8 characters and JS can't handle this. */
/* Fixme: We might want to do more advanced heuristics than to for (s=buffer, n=0; n < buflen -1; s++, n++)
* only look for a Nul. */ if (!*s || (*s & 0x80))
{
buflen--; /* Adjust for the extra nul byte. */
base64 = 1;
break;
}
} }
/* Adjust the chunksize if we need to do base64 conversion. */ /* Adjust the chunksize if we need to do base64 conversion. */