[FFmpeg-cvslog] lavf/udp: do not return an uninitialized value from udp_open()

Anton Khirnov git at videolan.org
Tue Jan 11 10:12:58 EET 2022


ffmpeg | branch: release/5.0 | Anton Khirnov <anton at khirnov.net> | Mon Jan 10 17:41:02 2022 +0100| [92c57aece4db7997befc910ce458ff501d8cc5ca] | committer: Anton Khirnov

lavf/udp: do not return an uninitialized value from udp_open()

(cherry picked from commit 3c2b67446875f925909fa33d8ee14264e11c293d)
Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92c57aece4db7997befc910ce458ff501d8cc5ca
---

 libavformat/udp.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/udp.c b/libavformat/udp.c
index b8b0e19609..180d96a988 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -739,8 +739,10 @@ static int udp_open(URLContext *h, const char *uri, int flags)
     /* XXX: fix av_url_split */
     if (hostname[0] == '\0' || hostname[0] == '?') {
         /* only accepts null hostname if input */
-        if (!(flags & AVIO_FLAG_READ))
+        if (!(flags & AVIO_FLAG_READ)) {
+            ret = AVERROR(EINVAL);
             goto fail;
+        }
     } else {
         if ((ret = ff_udp_set_remote_url(h, uri)) < 0)
             goto fail;
@@ -750,8 +752,10 @@ static int udp_open(URLContext *h, const char *uri, int flags)
         s->local_port = port;
 
     udp_fd = udp_socket_create(h, &my_addr, &len, s->localaddr);
-    if (udp_fd < 0)
+    if (udp_fd < 0) {
+        ret = AVERROR(EIO);
         goto fail;
+    }
 
     s->local_addr_storage=my_addr; //store for future multicast join
 



More information about the ffmpeg-cvslog mailing list