From 7a0f441e1410b3a0d97374c00c4007552d7dd27a Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Fri, 15 Jan 2016 14:43:43 -0800 Subject: openjpeg: Set proper upper bound for an array in opj_pi_update_decode_poc(). R=tsepez@chromium.org BUG=571480 Review URL: https://codereview.chromium.org/1583233008 . --- third_party/libopenjpeg20/pi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/libopenjpeg20/pi.c') diff --git a/third_party/libopenjpeg20/pi.c b/third_party/libopenjpeg20/pi.c index 462e07c836..9097e31a0e 100644 --- a/third_party/libopenjpeg20/pi.c +++ b/third_party/libopenjpeg20/pi.c @@ -1028,7 +1028,7 @@ static void opj_pi_update_decode_poc (opj_pi_iterator_t * p_pi, l_current_pi->poc.precno0 = 0; l_current_pi->poc.resno1 = l_current_poc->resno1; /* Resolution Level Index #0 (End) */ l_current_pi->poc.compno1 = l_current_poc->compno1; /* Component Index #0 (End) */ - l_current_pi->poc.layno1 = l_current_poc->layno1; /* Layer Index #0 (End) */ + l_current_pi->poc.layno1 = opj_uint_min(l_current_poc->layno1, p_tcp->numlayers); /* Layer Index #0 (End) */ l_current_pi->poc.precno1 = p_max_precision; ++l_current_pi; ++l_current_poc; -- cgit v1.2.3