projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9e122f6
)
videoaggregator: Make sure not to unref a NULL pointer
author
Thibault Saunier
<tsaunier@gnome.org>
Wed, 30 Jul 2014 09:57:46 +0000
(11:57 +0200)
committer
Thibault Saunier
<tsaunier@gnome.org>
Mon, 6 Oct 2014 16:57:28 +0000
(18:57 +0200)
gst-libs/gst/video/gstvideoaggregator.c
patch
|
blob
|
history
diff --git
a/gst-libs/gst/video/gstvideoaggregator.c
b/gst-libs/gst/video/gstvideoaggregator.c
index
ae4b9ea
..
ff7ea3b
100644
(file)
--- a/
gst-libs/gst/video/gstvideoaggregator.c
+++ b/
gst-libs/gst/video/gstvideoaggregator.c
@@
-940,7
+940,8
@@
gst_videoaggregator_fill_queues (GstVideoAggregator * vagg,
} else {
gst_buffer_unref (buf);
buf = gst_aggregator_pad_steal_buffer (bpad);
- gst_buffer_unref (buf);
+ if (buf)
+ gst_buffer_unref (buf);
}
eos = FALSE;
} else if (start_time >= output_end_time) {
@@
-956,7
+957,8
@@
gst_videoaggregator_fill_queues (GstVideoAggregator * vagg,
} else {
gst_buffer_unref (buf);
buf = gst_aggregator_pad_steal_buffer (bpad);
- gst_buffer_unref (buf);
+ if (buf)
+ gst_buffer_unref (buf);
}
need_more_data = TRUE;