[SCM] libgroove/upstream: playlist: fix segfault on out of memory
andrewrk-guest at users.alioth.debian.org
andrewrk-guest at users.alioth.debian.org
Wed Apr 2 06:29:56 UTC 2014
The following commit has been merged in the upstream branch:
commit 33d806d7e4ac7efa43a5ffa4d67dc01e287dd6a7
Author: Andrew Kelley <superjoe30 at gmail.com>
Date: Thu Mar 27 11:10:54 2014 -0700
playlist: fix segfault on out of memory
diff --git a/groove/playlist.c b/groove/playlist.c
index c9f683f..1c4d3cb 100644
--- a/groove/playlist.c
+++ b/groove/playlist.c
@@ -735,11 +735,12 @@ static int add_sink_to_map(struct GroovePlaylist *playlist, struct GrooveSink *s
struct GroovePlaylistPrivate *p = (struct GroovePlaylistPrivate *) playlist;
struct SinkStack *stack_entry = av_mallocz(sizeof(struct SinkStack));
- stack_entry->sink = sink;
if (!stack_entry)
return -1;
+ stack_entry->sink = sink;
+
struct SinkMap *map_item = p->sink_map;
while (map_item) {
// if our sink matches the example sink from this map entry,
--
libgroove packaging
More information about the pkg-multimedia-commits
mailing list