diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2015-11-23 15:37:07 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2015-12-18 16:25:08 +0000 |
| commit | 920639cab0fe28d003c90b53bd8b66e8fb333bdd (patch) | |
| tree | 6140738c5da2a22c018f9e24c3303c85235ba551 /qga/commands.c | |
| parent | e9cf2fe07ff70e939f80c624b44c10a4442eef0b (diff) | |
| download | qemu-920639cab0fe28d003c90b53bd8b66e8fb333bdd.zip qemu-920639cab0fe28d003c90b53bd8b66e8fb333bdd.tar.gz qemu-920639cab0fe28d003c90b53bd8b66e8fb333bdd.tar.bz2 | |
qga: 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 'qga/commands.c')
| -rw-r--r-- | qga/commands.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/qga/commands.c b/qga/commands.c index bb73e7d..58568d8 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -14,6 +14,7 @@ #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" #include "qapi/qmp/qerror.h" +#include "qemu/base64.h" /* Maximum captured guest-exec out_data/err_data - 16MB */ #define GUEST_EXEC_MAX_OUTPUT (16*1024*1024) @@ -393,10 +394,19 @@ GuestExec *qmp_guest_exec(const char *path, GIOChannel *in_ch, *out_ch, *err_ch; GSpawnFlags flags; bool has_output = (has_capture_output && capture_output); + uint8_t *input = NULL; + size_t ninput = 0; arglist.value = (char *)path; arglist.next = has_arg ? arg : NULL; + if (has_input_data) { + input = qbase64_decode(input_data, -1, &ninput, err); + if (!input) { + return NULL; + } + } + argv = guest_exec_get_args(&arglist, true); envp = has_env ? guest_exec_get_args(env, false) : NULL; @@ -425,7 +435,8 @@ GuestExec *qmp_guest_exec(const char *path, g_child_watch_add(pid, guest_exec_child_watch, gei); if (has_input_data) { - gei->in.data = g_base64_decode(input_data, &gei->in.size); + gei->in.data = input; + gei->in.size = ninput; #ifdef G_OS_WIN32 in_ch = g_io_channel_win32_new_fd(in_fd); #else |