summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-12-14 09:03:34 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-12-14 09:03:34 +0000
commit7f5b33003f0f6701458d6ad031b34fe667532458 (patch)
treef795674152cc5a2e699cad5b08452d1965ca829d
parent860723ad456840e5ae320151822cce317ac65e51 (diff)
better fix for mixer buffer overflow, copy to epulse
SVN revision: 80919
-rw-r--r--msg.c2
-rw-r--r--pa.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/msg.c b/msg.c
index ec35fc9..078c4e0 100644
--- a/msg.c
+++ b/msg.c
@@ -154,7 +154,7 @@ msg_send_creds(Pulse *conn, Pulse_Tag *tag)
154 int r; 154 int r;
155 155
156 INF("trying to send 20 byte auth header"); 156 INF("trying to send 20 byte auth header");
157 r = send(ecore_main_fd_handler_fd_get(conn->fdh), &tag->header[tag->pos], PA_PSTREAM_DESCRIPTOR_MAX - tag->pos, MSG_NOSIGNAL); 157 r = send(ecore_main_fd_handler_fd_get(conn->fdh), &tag->header[tag->pos], sizeof(tag->header) - (tag->pos * sizeof(tag->header[0])), MSG_NOSIGNAL);
158 INF("%i bytes sent!", r); 158 INF("%i bytes sent!", r);
159 if ((!r) || (r == (int)sizeof(tag->header))) tag->auth = EINA_TRUE; 159 if ((!r) || (r == (int)sizeof(tag->header))) tag->auth = EINA_TRUE;
160 else if (r < 0) 160 else if (r < 0)
diff --git a/pa.c b/pa.c
index f72d898..5616409 100644
--- a/pa.c
+++ b/pa.c
@@ -218,7 +218,7 @@ pulse_recv(Pulse *conn, Ecore_Fd_Handler *fdh)
218 { 218 {
219 ecore_main_fd_handler_active_set(fdh, ECORE_FD_WRITE); 219 ecore_main_fd_handler_active_set(fdh, ECORE_FD_WRITE);
220 pulse_tag_free(tag); 220 pulse_tag_free(tag);
221 tag = NULL; 221 return (void*)1;
222 } 222 }
223 return tag; 223 return tag;
224error: 224error: