<div dir="ltr">ack<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Apr 1, 2014 at 4:24 PM, Christophe Fergeau <span dir="ltr"><<a href="mailto:cfergeau@redhat.com" target="_blank">cfergeau@redhat.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">With the next commit, we won't always have a file xfer object available.<br>
This next commit will make sure NULL is never passed to the public file<br>
xfer functions, but it's safer to guard against that anyway in case<br>
this gets broken in the future.<br>
---<br>
 src/vdagent-file-xfers.c | 10 ++++++++++<br>
 1 file changed, 10 insertions(+)<br>
<br>
diff --git a/src/vdagent-file-xfers.c b/src/vdagent-file-xfers.c<br>
index b792282..379cda0 100644<br>
--- a/src/vdagent-file-xfers.c<br>
+++ b/src/vdagent-file-xfers.c<br>
@@ -97,6 +97,8 @@ struct vdagent_file_xfers *vdagent_file_xfers_create(<br>
<br>
 void vdagent_file_xfers_destroy(struct vdagent_file_xfers *xfers)<br>
 {<br>
+    g_return_if_fail(xfers != NULL);<br>
+<br>
     g_hash_table_destroy(xfers->xfers);<br>
     g_free(xfers->save_dir);<br>
     g_free(xfers);<br>
@@ -107,6 +109,8 @@ AgentFileXferTask *vdagent_file_xfers_get_task(<br>
 {<br>
     AgentFileXferTask *task;<br>
<br>
+    g_return_val_if_fail(xfers != NULL, NULL);<br>
+<br>
     task = g_hash_table_lookup(xfers->xfers, GUINT_TO_POINTER(id));<br>
     if (task == NULL)<br>
         syslog(LOG_ERR, "file-xfer: error can not find task %u", id);<br>
@@ -173,6 +177,8 @@ void vdagent_file_xfers_start(struct vdagent_file_xfers *xfers,<br>
     struct stat st;<br>
     int i;<br>
<br>
+    g_return_if_fail(xfers != NULL);<br>
+<br>
     if (g_hash_table_lookup(xfers->xfers, GUINT_TO_POINTER(msg->id))) {<br>
         syslog(LOG_ERR, "file-xfer: error id %u already exists, ignoring!",<br>
                msg->id);<br>
@@ -246,6 +252,8 @@ void vdagent_file_xfers_status(struct vdagent_file_xfers *xfers,<br>
 {<br>
     AgentFileXferTask *task;<br>
<br>
+    g_return_if_fail(xfers != NULL);<br>
+<br>
     task = vdagent_file_xfers_get_task(xfers, msg->id);<br>
     if (!task)<br>
         return;<br>
@@ -267,6 +275,8 @@ void vdagent_file_xfers_data(struct vdagent_file_xfers *xfers,<br>
     AgentFileXferTask *task;<br>
     int len, status = -1;<br>
<br>
+    g_return_if_fail(xfers != NULL);<br>
+<br>
     task = vdagent_file_xfers_get_task(xfers, msg->id);<br>
     if (!task)<br>
         return;<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.9.0<br>
<br>
_______________________________________________<br>
Spice-devel mailing list<br>
<a href="mailto:Spice-devel@lists.freedesktop.org">Spice-devel@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/spice-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/spice-devel</a><br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br>Marc-André Lureau
</div>