summaryrefslogtreecommitdiff
path: root/qemu-char.c
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2015-11-23 15:29:59 +0000
committerDaniel P. Berrange <berrange@redhat.com>2015-12-18 16:25:08 +0000
commite9cf2fe07ff70e939f80c624b44c10a4442eef0b (patch)
treeb95a5ea9918d7d1ede762b407d962d9a819a9f0a /qemu-char.c
parent89bc0b6cae6e40e9247bf911162b0aee0c818c4c (diff)
downloadqemu-e9cf2fe07ff70e939f80c624b44c10a4442eef0b.tar.gz
qemu-e9cf2fe07ff70e939f80c624b44c10a4442eef0b.tar.bz2
qemu-e9cf2fe07ff70e939f80c624b44c10a4442eef0b.zip
qemu-char: convert to use error checked base64 decode
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>
Diffstat (limited to 'qemu-char.c')
-rw-r--r--qemu-char.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/qemu-char.c b/qemu-char.c
index 66703e3f0a..00a7526761 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -32,6 +32,7 @@
#include "qapi/qmp-input-visitor.h"
#include "qapi/qmp-output-visitor.h"
#include "qapi-visit.h"
+#include "qemu/base64.h"
#include <unistd.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)) {
- write_data = g_base64_decode(data, &write_count);
+ write_data = qbase64_decode(data, -1,
+ &write_count,
+ errp);
+ if (!write_data) {
+ return;
+ }
} else {
write_data = (uint8_t *)data;
write_count = strlen(data);