sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix Fix problematic realloc (#19812)

Browse Source
pull/20337/head
Dean Lee 5 years ago committed by GitHub
parent e654d9ddf9
commit e736029235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      selfdrive/loggerd/omx_encoder.cc

6
selfdrive/loggerd/omx_encoder.cc
Unescape View File

@ -349,12 +349,10 @@ void OmxEncoder::handle_out_buf(OmxEncoder *e, OMX_BUFFERHEADERTYPE *out_buf) {
if (e->remuxing) { if (e->remuxing) {
if (!e->wrote_codec_config && e->codec_config_len > 0) { if (!e->wrote_codec_config && e->codec_config_len > 0) {
if (e->codec_ctx->extradata_size < e->codec_config_len) { // extradata will be freed by av_free() in avcodec_free_context()
e->codec_ctx->extradata = (uint8_t *)realloc(e->codec_ctx->extradata, e->codec_config_len + AV_INPUT_BUFFER_PADDING_SIZE); e->codec_ctx->extradata = (uint8_t*)av_mallocz(e->codec_config_len + AV_INPUT_BUFFER_PADDING_SIZE);
}
e->codec_ctx->extradata_size = e->codec_config_len; e->codec_ctx->extradata_size = e->codec_config_len;
memcpy(e->codec_ctx->extradata, e->codec_config, e->codec_config_len); memcpy(e->codec_ctx->extradata, e->codec_config, e->codec_config_len);
memset(e->codec_ctx->extradata + e->codec_ctx->extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
err = avcodec_parameters_from_context(e->out_stream->codecpar, e->codec_ctx); err = avcodec_parameters_from_context(e->out_stream->codecpar, e->codec_ctx);
assert(err >= 0); assert(err >= 0);

Write Preview
Loading…
Cancel
Save