aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-01-29 20:41:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-01-29 20:41:46 +0000
commit1207285ca0e626fd87d448d811fe1a760d7c4a23 (patch)
treecafe9e3bb5e743eacd599ad5c00e2d09a2740d20
parent3c5f6c039975047971a77ab2ec2369d0d987b031 (diff)
parent7d0a228c3e00b09c289b7e42590a0e4033b08a24 (diff)
downloadlibxaac-1207285ca0e626fd87d448d811fe1a760d7c4a23.tar.gz
Merge "Fix for segv in impd_filter_banks_process function"
-rw-r--r--decoder/drc_src/impd_drc_dynamic_payload.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/decoder/drc_src/impd_drc_dynamic_payload.c b/decoder/drc_src/impd_drc_dynamic_payload.c
index 5d961e1..4fa54ec 100644
--- a/decoder/drc_src/impd_drc_dynamic_payload.c
+++ b/decoder/drc_src/impd_drc_dynamic_payload.c
@@ -272,8 +272,10 @@ WORD32 impd_dec_times(ia_bit_buf_struct* it_bit_buff,
e++;
}
}
- str_node[k].time = time_offs + time_delta * delta_tmin;
- time_offs = str_node[k].time;
+ time_offs += time_delta * delta_tmin;
+ if (time_offs >= (2 * AUDIO_CODEC_FRAME_SIZE_MAX - drc_frame_size))
+ return UNEXPECTED_ERROR;
+ str_node[k].time = time_offs;
}
}
return (0);