diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2014-02-27 18:45:15 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2014-09-18 13:34:26 +0200 |
| commit | ec9f11064efee2ad3f0be0d36f5fdbbbe2d51ad9 (patch) | |
| tree | 224c0784c0d62a5e6d78e589c36223347244a835 | |
| parent | 072fb03fa47b18dd6cdd3b5c764d59e06fc5815e (diff) | |
| download | vd_agent-ec9f11064efee2ad3f0be0d36f5fdbbbe2d51ad9.tar.gz vd_agent-ec9f11064efee2ad3f0be0d36f5fdbbbe2d51ad9.tar.xz vd_agent-ec9f11064efee2ad3f0be0d36f5fdbbbe2d51ad9.zip | |
Add g_return_if_fail() guards to file xfer public functions
With the next commit, we won't always have a file xfer object available.
This next commit will make sure NULL is never passed to the public file
xfer functions, but it's safer to guard against that anyway in case
this gets broken in the future.
| -rw-r--r-- | src/vdagent-file-xfers.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/vdagent-file-xfers.c b/src/vdagent-file-xfers.c index b792282..379cda0 100644 --- a/src/vdagent-file-xfers.c +++ b/src/vdagent-file-xfers.c @@ -97,6 +97,8 @@ struct vdagent_file_xfers *vdagent_file_xfers_create( void vdagent_file_xfers_destroy(struct vdagent_file_xfers *xfers) { + g_return_if_fail(xfers != NULL); + g_hash_table_destroy(xfers->xfers); g_free(xfers->save_dir); g_free(xfers); @@ -107,6 +109,8 @@ AgentFileXferTask *vdagent_file_xfers_get_task( { AgentFileXferTask *task; + g_return_val_if_fail(xfers != NULL, NULL); + task = g_hash_table_lookup(xfers->xfers, GUINT_TO_POINTER(id)); if (task == NULL) syslog(LOG_ERR, "file-xfer: error can not find task %u", id); @@ -173,6 +177,8 @@ void vdagent_file_xfers_start(struct vdagent_file_xfers *xfers, struct stat st; int i; + g_return_if_fail(xfers != NULL); + if (g_hash_table_lookup(xfers->xfers, GUINT_TO_POINTER(msg->id))) { syslog(LOG_ERR, "file-xfer: error id %u already exists, ignoring!", msg->id); @@ -246,6 +252,8 @@ void vdagent_file_xfers_status(struct vdagent_file_xfers *xfers, { AgentFileXferTask *task; + g_return_if_fail(xfers != NULL); + task = vdagent_file_xfers_get_task(xfers, msg->id); if (!task) return; @@ -267,6 +275,8 @@ void vdagent_file_xfers_data(struct vdagent_file_xfers *xfers, AgentFileXferTask *task; int len, status = -1; + g_return_if_fail(xfers != NULL); + task = vdagent_file_xfers_get_task(xfers, msg->id); if (!task) return; |