X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fgopher.c;h=e1acf5039c23174f91baa9933a7c80724e628f68;hb=b0aaf304a778f0a49d42c032aa83efa62c3291c4;hp=6a829c8ce5e603c28f0a0bbff930577edf44904c;hpb=8709ba907a7f6f44e392161221d9628fa74b22f6;p=ffmpeg diff --git a/libavformat/gopher.c b/libavformat/gopher.c index 6a829c8ce5e..e1acf5039c2 100644 --- a/libavformat/gopher.c +++ b/libavformat/gopher.c @@ -72,24 +72,17 @@ static int gopher_close(URLContext *h) ffurl_close(s->hd); s->hd = NULL; } - av_freep(&h->priv_data); return 0; } static int gopher_open(URLContext *h, const char *uri, int flags) { - GopherContext *s; + GopherContext *s = h->priv_data; char hostname[1024], auth[1024], path[1024], buf[1024]; int port, err; h->is_streamed = 1; - s = av_malloc(sizeof(GopherContext)); - if (!s) { - return AVERROR(ENOMEM); - } - h->priv_data = s; - /* needed in any case to build the host string */ av_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, path, sizeof(path), uri); @@ -122,9 +115,10 @@ static int gopher_read(URLContext *h, uint8_t *buf, int size) URLProtocol ff_gopher_protocol = { - .name = "gopher", - .url_open = gopher_open, - .url_read = gopher_read, - .url_write = gopher_write, - .url_close = gopher_close, + .name = "gopher", + .url_open = gopher_open, + .url_read = gopher_read, + .url_write = gopher_write, + .url_close = gopher_close, + .priv_data_size = sizeof(GopherContext), };