MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-15 08:45:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Plug bad mem leak if using libavcodec 54.35 (libav9) or above

Browse Source
This commit is contained in:
ejurgensen 2014-01-19 23:09:40 +01:00
parent 32f4109b1f
commit c2c072eb58
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/transcode.c
View File

@ -264,15 +264,15 @@ transcode(struct transcode_ctx *ctx, struct evbuffer *evbuf, int wanted)
{ {
out_size = av_samples_get_buffer_size(&out_linesize, 2, frame->nb_samples, AV_SAMPLE_FMT_S16, 0); out_size = av_samples_get_buffer_size(&out_linesize, 2, frame->nb_samples, AV_SAMPLE_FMT_S16, 0);
buf = av_realloc(ctx->re_abuffer, out_size); ctx->re_abuffer = av_realloc(ctx->re_abuffer, out_size);
if (!buf) if (!ctx->re_abuffer)
{ {
DPRINTF(E_LOG, L_XCODE, "Out of memory for resample buffer!\n"); DPRINTF(E_LOG, L_XCODE, "Out of memory for resample buffer!\n");
return -1; return -1;
} }
out_samples = avresample_convert(ctx->resample_ctx, (uint8_t **)&buf, out_linesize, frame->nb_samples, out_samples = avresample_convert(ctx->resample_ctx, (uint8_t **)&ctx->re_abuffer, out_linesize, frame->nb_samples,
(uint8_t **)frame->data, frame->linesize[0], frame->nb_samples); (uint8_t **)frame->data, frame->linesize[0], frame->nb_samples);
if (out_samples < 0) if (out_samples < 0)
{ {
@ -282,6 +282,7 @@ transcode(struct transcode_ctx *ctx, struct evbuffer *evbuf, int wanted)
} }
buflen = out_samples * 2 * 2; /* 16bit samples, 2 channels */ buflen = out_samples * 2 * 2; /* 16bit samples, 2 channels */
buf = ctx->re_abuffer;
} }
else else
{ {