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:
f47e6ab
)
rtsp-stream: corrected if-statement in _get_server_port()
author
Patricia Muscalu
<patricia@axis.com>
Tue, 10 Jan 2017 07:34:50 +0000
(08:34 +0100)
committer
Tim-Philipp Müller
<tim@centricular.com>
Tue, 10 Jan 2017 10:38:13 +0000
(10:38 +0000)
This bug was accidentally introduced while fixing a segfault
in _get_server_port() function.
https://bugzilla.gnome.org/show_bug.cgi?id=776345
gst/rtsp-server/rtsp-stream.c
patch
|
blob
|
history
diff --git
a/gst/rtsp-server/rtsp-stream.c
b/gst/rtsp-server/rtsp-stream.c
index
6af69b4
..
445b924
100644
(file)
--- a/
gst/rtsp-server/rtsp-stream.c
+++ b/
gst/rtsp-server/rtsp-stream.c
@@
-1531,8
+1531,8
@@
gst_rtsp_stream_get_server_port (GstRTSPStream * stream,
}
g_mutex_lock (&priv->lock);
- if (family == G_SOCKET_FAMILY_IPV4
&& priv->server_addr_v4
) {
- if (server_port) {
+ if (family == G_SOCKET_FAMILY_IPV4) {
+ if (server_port
&& priv->server_addr_v4
) {
server_port->min = priv->server_addr_v4->port;
server_port->max =
priv->server_addr_v4->port + priv->server_addr_v4->n_ports - 1;