Changeset 63d6ff9 in mainline

Timestamp:

2012-07-13T04:52:05Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f3fced0

Parents:

d93a5a6f

Message:

hound: Fix few leaks and memory corruption bugs.

Location:

uspace/srv/audio/hound

Files:

• audio_source.c (modified) (1 diff)
• hound.c (modified) (1 diff)
• main.c (modified) (4 diffs)

uspace/srv/audio/hound/audio_source.c

@@ -71 +71 @@
 void audio_source_fini(audio_source_t *source)
 {
-        if (!source)
-                return;
+        assert(source);
         assert(source->connected_sink == NULL);
         free(source->name);
-        free(source);
+        source->name = NULL;
 }
 

uspace/srv/audio/hound/hound.c

@@ -55 +55 @@
                     audio_ ## type ## _list_instance(it); \
                 if (str_cmp(name, dev->name) == 0) { \
-                        log_debug("%s with name %s is already present", \
+                        log_debug("%s with name '%s' is already present", \
                             #type, name); \
-                        return NULL; \
+                        return dev; \
                 } \
         } \

uspace/srv/audio/hound/main.c

@@ -68 +68 @@
         size_t size = 0;
         ipc_callid_t callid;
-        async_data_read_receive(&callid, &size);
+        async_data_write_receive(&callid, &size);
         char *buffer = malloc(size);
         if (buffer) {
-                async_data_read_finalize(callid, buffer, size);
+                async_data_write_finalize(callid, buffer, size);
                 buffer[size - 1] = 0;
                 log_verbose("Got name from client: %s", buffer);
@@ -83 +83 @@
         async_sess_t *s = async_callback_receive_start(EXCHANGE_ATOMIC, &call);
         async_answer_0(callid, s ? EOK : ENOMEM);
-        log_verbose("Received callback session");
+        if (s) {
+                log_verbose("Received callback session");
+        } else
+                log_debug("Failed to receive callback session");
         return s;
 }
@@ -148 +151 @@
                         const char *name = get_name();
                         async_sess_t *sess = get_session();
-                        audio_client_t * client =
+                        audio_client_t *client =
                             audio_client_get_playback(name, &format, sess);
+                        free(name);
                         if (!client) {
                                 log_error("Failed to create playback client");
                                 async_answer_0(callid, ENOMEM);
+                                break;
                         }
                         int ret = hound_add_source(&hound, &client->source);
@@ -162 +167 @@
                                 break;
                         }
+                        log_info("Added audio client %p '%s'",
+                            client, client->name);
                         async_answer_0(callid, EOK);
                         list_append(&client->link, &local_playback);