highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/avio: Don't use incompatible function pointer type for call

Browse Source 
It is undefined behaviour even in cases where it works
(it works because it is only a const uint8_t* vs. uint8_t* difference).

Instead add a cbuf parameter to pass a const buffer (for writing)
as well as a parameter indicating whether we are reading or writing;
retry_transfer_wrapper() itself then uses the correct function
based upon this information.

Reviewed-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <git@haerdin.se>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-09-06 15:31:42 +02:00
parent a18ccbfaeb
commit b67171893d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/avio.c
View File

@ -348,10 +348,9 @@ fail:
} }
static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf,
const uint8_t *cbuf,
int size, int size_min, int size, int size_min,
int (*transfer_func)(URLContext *h, int read)
uint8_t *buf,
int size))
{ {
int ret, len; int ret, len;
int fast_retries = 5; int fast_retries = 5;
@ -361,7 +360,8 @@ static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf,
while (len < size_min) { while (len < size_min) {
if (ff_check_interrupt(&h->interrupt_callback)) if (ff_check_interrupt(&h->interrupt_callback))
return AVERROR_EXIT; return AVERROR_EXIT;
ret = transfer_func(h, buf + len, size - len); ret = read ? h->prot->url_read (h, buf + len, size - len):
h->prot->url_write(h, cbuf + len, size - len);
if (ret == AVERROR(EINTR)) if (ret == AVERROR(EINTR))
continue; continue;
if (h->flags & AVIO_FLAG_NONBLOCK) if (h->flags & AVIO_FLAG_NONBLOCK)
@ -398,14 +398,14 @@ int ffurl_read2(void *urlcontext, uint8_t *buf, int size)
if (!(h->flags & AVIO_FLAG_READ)) if (!(h->flags & AVIO_FLAG_READ))
return AVERROR(EIO); return AVERROR(EIO);
return retry_transfer_wrapper(h, buf, size, 1, h->prot->url_read); return retry_transfer_wrapper(h, buf, NULL, size, 1, 1);
} }
int ffurl_read_complete(URLContext *h, unsigned char *buf, int size) int ffurl_read_complete(URLContext *h, unsigned char *buf, int size)
{ {
if (!(h->flags & AVIO_FLAG_READ)) if (!(h->flags & AVIO_FLAG_READ))
return AVERROR(EIO); return AVERROR(EIO);
return retry_transfer_wrapper(h, buf, size, size, h->prot->url_read); return retry_transfer_wrapper(h, buf, NULL, size, size, 1);
} }
#if FF_API_AVIO_WRITE_NONCONST #if FF_API_AVIO_WRITE_NONCONST
@ -422,9 +422,7 @@ int ffurl_write2(void *urlcontext, const uint8_t *buf, int size)
if (h->max_packet_size && size > h->max_packet_size) if (h->max_packet_size && size > h->max_packet_size)
return AVERROR(EIO); return AVERROR(EIO);
return retry_transfer_wrapper(h, (unsigned char *)buf, size, size, return retry_transfer_wrapper(h, NULL, buf, size, size, 0);
(int (*)(struct URLContext *, uint8_t *, int))
h->prot->url_write);
} }
int64_t ffurl_seek2(void *urlcontext, int64_t pos, int whence) int64_t ffurl_seek2(void *urlcontext, int64_t pos, int whence)