From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 11 Oct 2017 23:16:23 +0000 (+0200)
Subject: opj_j2k_set_threads(): add sanity check to error out if called after opj_read_header()
X-Git-Tag: v2.3.1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be6ea90e13fe81a922d831b589c54554282e5545;p=openjpeg

opj_j2k_set_threads(): add sanity check to error out if called after opj_read_header()
---

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index ad6e1b86..6318719c 100644
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -6419,7 +6419,9 @@ void opj_j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters)
 
 OPJ_BOOL opj_j2k_set_threads(opj_j2k_t *j2k, OPJ_UINT32 num_threads)
 {
-    if (opj_has_thread_support()) {
+    /* Currently we pass the thread-pool to the tcd, so we cannot re-set it */
+    /* afterwards */
+    if (opj_has_thread_support() && j2k->m_tcd == NULL) {
         opj_thread_pool_destroy(j2k->m_tp);
         j2k->m_tp = NULL;
         if (num_threads <= (OPJ_UINT32)INT_MAX) {