Changeset b893cd6 in mainline

Timestamp:

2013-04-03T19:01:53Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

aab8e3d3

Parents:

a94de68

Message:

hound: add null checks

Location:

uspace/srv/audio/hound

Files:

• audio_sink.h (modified) (1 diff)
• audio_source.c (modified) (1 diff)
• audio_source.h (modified) (1 diff)
• connection.c (modified) (1 diff)

uspace/srv/audio/hound/audio_sink.h

@@ -59 +59 @@
 static inline audio_sink_t * audio_sink_list_instance(link_t *l)
 {
-        return list_get_instance(l, audio_sink_t, link);
+        return l ? list_get_instance(l, audio_sink_t, link) : NULL;
 }
 

uspace/srv/audio/hound/audio_source.c

@@ -59 +59 @@
         list_initialize(&source->connections);
         source->name = str_dup(name);
+        if (!source->name)
+                return ENOMEM;
         source->private_data = data;
         source->connection_change = connection_change;

uspace/srv/audio/hound/audio_source.h

@@ -60 +60 @@
 static inline audio_source_t * audio_source_list_instance(link_t *l)
 {
-        return list_get_instance(l, audio_source_t, link);
+        return l ? list_get_instance(l, audio_source_t, link) : NULL;
 }
 

uspace/srv/audio/hound/connection.c

@@ -54 +54 @@
                 list_append(&conn->sink_link, &sink->connections);
                 audio_sink_set_format(sink, audio_source_format(source));
-                source->connection_change(source, true);
-                sink->connection_change(sink, true);
+                if (source->connection_change)
+                        source->connection_change(source, true);
+                if (sink->connection_change)
+                        sink->connection_change(sink, true);
         }
         return conn;