diff options
| author | Leo Famulari <leo@famulari.name> | 2017-03-20 18:22:14 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-03-20 18:25:02 -0400 |
| commit | deee8a9dfcd86e3f97035f2d71e34dfadbc09397 (patch) | |
| tree | d773f074b12f2c67b97ae61a54016e440dc5acf2 | |
| parent | 957699ee92a86367d4ba60d1e3a02431b2852963 (diff) | |
| download | guix-deee8a9dfcd86e3f97035f2d71e34dfadbc09397.tar.gz guix-deee8a9dfcd86e3f97035f2d71e34dfadbc09397.zip | |
gnu: Remove leftover patch.
* gnu/packages/patches/openjpeg-use-after-free-fix.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/openjpeg-use-after-free-fix.patch | 48 |
2 files changed, 0 insertions, 49 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index a194469c4e..6e6f03a3ec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -798,7 +798,6 @@ dist_patch_DATA = \ %D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openjpeg-CVE-2016-9850-CVE-2016-9851.patch \ %D%/packages/patches/openjpeg-CVE-2016-9572-CVE-2016-9573.patch \ - %D%/packages/patches/openjpeg-use-after-free-fix.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \ diff --git a/gnu/packages/patches/openjpeg-use-after-free-fix.patch b/gnu/packages/patches/openjpeg-use-after-free-fix.patch deleted file mode 100644 index 1a9cb1ae1d..0000000000 --- a/gnu/packages/patches/openjpeg-use-after-free-fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 940100c28ae28931722290794889cf84a92c5f6f Mon Sep 17 00:00:00 2001 -From: mayeut <mayeut@users.noreply.github.com> -Date: Sun, 6 Sep 2015 17:24:03 +0200 -Subject: [PATCH] Fix potential use-after-free in opj_j2k_write_mco function - -Fixes #563 ---- - src/lib/openjp2/j2k.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c -index 19a48f5..d487d89 100644 ---- a/src/lib/openjp2/j2k.c -+++ b/src/lib/openjp2/j2k.c -@@ -5559,8 +5559,7 @@ static OPJ_BOOL opj_j2k_write_mco( opj_j2k_t *p_j2k, - assert(p_stream != 00); - - l_tcp =&(p_j2k->m_cp.tcps[p_j2k->m_current_tile_number]); -- l_current_data = p_j2k->m_specific_param.m_encoder.m_header_tile_data; -- -+ - l_mco_size = 5 + l_tcp->m_nb_mcc_records; - if (l_mco_size > p_j2k->m_specific_param.m_encoder.m_header_tile_data_size) { - -@@ -5575,6 +5574,8 @@ static OPJ_BOOL opj_j2k_write_mco( opj_j2k_t *p_j2k, - p_j2k->m_specific_param.m_encoder.m_header_tile_data = new_header_tile_data; - p_j2k->m_specific_param.m_encoder.m_header_tile_data_size = l_mco_size; - } -+ l_current_data = p_j2k->m_specific_param.m_encoder.m_header_tile_data; -+ - - opj_write_bytes(l_current_data,J2K_MS_MCO,2); /* MCO */ - l_current_data += 2; -@@ -5586,10 +5587,9 @@ static OPJ_BOOL opj_j2k_write_mco( opj_j2k_t *p_j2k, - ++l_current_data; - - l_mcc_record = l_tcp->m_mcc_records; -- for (i=0;i<l_tcp->m_nb_mcc_records;++i) { -+ for (i=0;i<l_tcp->m_nb_mcc_records;++i) { - opj_write_bytes(l_current_data,l_mcc_record->m_index,1);/* Imco -> use the mcc indicated by 1*/ - ++l_current_data; -- - ++l_mcc_record; - } - --- -2.5.0 - |