mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-char: convert to use error checked base64 decode

Browse Source 
Switch from using g_base64_decode over to qbase64_decode
in order to get error checking of the base64 input data.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2015-11-23 15:29:59 +00:00
parent 89bc0b6cae
commit e9cf2fe07f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qapi-schema.json
View File

@ -295,8 +295,6 @@
# @format: #optional data encoding (default 'utf8'). # @format: #optional data encoding (default 'utf8').
# - base64: data must be base64 encoded text. Its binary # - base64: data must be base64 encoded text. Its binary
# decoding gets written. # decoding gets written.
# Bug: invalid base64 is currently not rejected.
# Whitespace *is* invalid.
# - utf8: data's UTF-8 encoding is written # - utf8: data's UTF-8 encoding is written
# - data itself is always Unicode regardless of format, like # - data itself is always Unicode regardless of format, like
# any other string. # any other string.

8
qemu-char.c
View File

@ -32,6 +32,7 @@
#include "qapi/qmp-input-visitor.h" #include "qapi/qmp-input-visitor.h"
#include "qapi/qmp-output-visitor.h" #include "qapi/qmp-output-visitor.h"
#include "qapi-visit.h" #include "qapi-visit.h"
#include "qemu/base64.h"
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@ -3264,7 +3265,12 @@ void qmp_ringbuf_write(const char *device, const char *data,
} }
if (has_format && (format == DATA_FORMAT_BASE64)) { if (has_format && (format == DATA_FORMAT_BASE64)) {
write_data = g_base64_decode(data, &write_count); write_data = qbase64_decode(data, -1,
&write_count,
errp);
if (!write_data) {
return;
}
} else { } else {
write_data = (uint8_t *)data; write_data = (uint8_t *)data;
write_count = strlen(data); write_count = strlen(data);

2
qmp-commands.hx
View File

@ -512,8 +512,6 @@ Arguments:
- "data": data to write (json-string) - "data": data to write (json-string)
- "format": data format (json-string, optional) - "format": data format (json-string, optional)
- Possible values: "utf8" (default), "base64" - Possible values: "utf8" (default), "base64"
Bug: invalid base64 is currently not rejected.
Whitespace *is* invalid.
Example: Example: