ffmpeg | branch: release/4.4 | Anton Khirnov <[email protected]> | Mon Jan 10 17:41:02 2022 +0100| [91aa03952a7ad36f08367ba145dbf0d5f7d23356] | committer: Anton Khirnov
lavf/udp: do not return an uninitialized value from udp_open() (cherry picked from commit 3c2b67446875f925909fa33d8ee14264e11c293d) Signed-off-by: Anton Khirnov <[email protected]> Conflicts: libavformat/udp.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91aa03952a7ad36f08367ba145dbf0d5f7d23356 --- libavformat/udp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 9b9d3de197..1f8b85cfca 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -740,8 +740,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; @@ -754,8 +756,10 @@ static int udp_open(URLContext *h, const char *uri, int flags) udp_fd = udp_socket_create(h, &my_addr, &len, localaddr); else 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 _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
