package/matio: bump to version 1.5.18
PATCH 1/1 package/matio: bump to version 1.5.18
- Drop all patches (already in version)
- Update hash of COPYING (update in year:
https://github.com/tbeu/matio/commit/4638154d738ae1cae3ebac6b86ddcde63e69a92f)
https://github.com/tbeu/matio/releases/tag/v1.5.18
Signed-off-by Fabrice Fontaine <[email protected]>
--- .../0001-Avoid-uninitialized-memory.patch | 27 ----------- .../0002-Fix-illegal-memory-access.patch | 47 ------------------- .../0003-Fix-illegal-memory-access.patch | 46 ------------------ package/matio/0004-Fix-memory-leak.patch | 39 --------------- package/matio/matio.hash | 6 +-- package/matio/matio.mk | 11 +---- 6 files changed, 4 insertions(+), 172 deletions(-) delete mode 100644 package/matio/0001-Avoid-uninitialized-memory.patch delete mode 100644 package/matio/0002-Fix-illegal-memory-access.patch delete mode 100644 package/matio/0003-Fix-illegal-memory-access.patch delete mode 100644 package/matio/0004-Fix-memory-leak.patch
package/matio/0001-Avoid-uninitialized-memory.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 651a8e28099edb5fbb9e4e1d4d3238848f446c9a Mon Sep 17 00:00:00 2001 -From: tbeu <[email protected]> -Date: Fri, 30 Aug 2019 09:21:26 +0200 -Subject: [PATCH] Avoid uninitialized memory - -As reported by https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16856 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/tbeu/matio/commit/651a8e28099edb5fbb9e4e1d4d3238848f446c9a] ---- - src/mat4.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/mat4.c b/src/mat4.c -index 601a3d6..93b4308 100644 ---- a/src/mat4.c -+++ b/src/mat4.c -@@ -917,6 +917,8 @@ Mat_VarReadNextInfo4(mat_t *mat) - if ( tmp != readresult ) { - Mat_VarFree(matvar); - return NULL; -+ } else { -+ matvar->name[tmp - 1] = '\0'; - } - - matvar->internal->datapos = ftell((FILE*)mat->fp);
package/matio/0002-Fix-illegal-memory-access.patch deleted +0 -47
47 lines not on this page · raw message
package/matio/0003-Fix-illegal-memory-access.patch deleted +0 -46
46 lines not on this page · raw message
package/matio/0004-Fix-memory-leak.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From a47b7cd3aca70e9a0bddf8146eb4ab0cbd19c2c3 Mon Sep 17 00:00:00 2001 -From: tbeu <[email protected]> -Date: Fri, 15 Nov 2019 23:20:41 +0100 -Subject: [PATCH] Fix memory leak - -As reported by https://github.com/tbeu/matio/issues/131 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/tbeu/matio/commit/a47b7cd3aca70e9a0bddf8146eb4ab0cbd19c2c3] ---- - src/mat.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/mat.c b/src/mat.c -index c9c6bd1..e62a9d2 100644 ---- a/src/mat.c -+++ b/src/mat.c -@@ -220,6 +220,11 @@ int SafeMulDims(const matvar_t *matvar, size_t* nelems) - { - int i; - -+ if ( matvar->rank == 0 ) { -+ *nelems = 0; -+ return 0; -+ } -+ - for ( i = 0; i < matvar->rank; i++ ) { - if ( !psnip_safe_size_mul(nelems, *nelems, matvar->dims[i]) ) { - *nelems = 0; -@@ -1640,7 +1645,7 @@ Mat_VarFree(matvar_t *matvar) - } - #endif - if ( NULL != matvar->internal->fieldnames && -- matvar->internal->num_fields > 0 ) { -+ matvar->internal->num_fields > 0 ) { - size_t i; - for ( i = 0; i < matvar->internal->num_fields; i++ ) { - if ( NULL != matvar->internal->fieldnames[i] )
package/matio/matio.hash +3 -3
@@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.17/ -sha512 af8ff11c7c44fea9ea6886e381f49ef9186946f3def98ad9695f2d5d1df045c35e8f4ceac12a44be397f7bbd708b4803762b5ce54c45b60a9f446d551c04f5d2 matio-1.5.17.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.18/ +sha512 c43e562a101348d64139a056f28bce37c59c6667d701200255ccf9d8b6adf7a92ae9c11c8d921ec8a652cdc81c5de9ab247907279c54c52905adfd65bc3fb90f matio-1.5.18.tar.gz # Locally computed -sha256 62a0cab69eeadb3697a2249d5a869915b89e62b59b794dd70802c2b8624ed374 COPYING +sha256 19494e9c9154a5e3f834e99d65fab0653b84280df7c98d1886a98d2bd28369c1 COPYING
package/matio/matio.mk +1 -10
@@ -4,22 +4,13 @@ # ################################################################################ -MATIO_VERSION = 1.5.17 +MATIO_VERSION = 1.5.18 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING MATIO_DEPENDENCIES = zlib MATIO_INSTALL_STAGING = YES -# 0001-Avoid-uninitialized-memory.patch -MATIO_IGNORE_CVES += CVE-2019-17533 -# 0002-Fix-illegal-memory-access.patch -MATIO_IGNORE_CVES += CVE-2019-20017 CVE-2019-20020 -# 0003-Fix-illegal-memory-access.patch -MATIO_IGNORE_CVES += CVE-2019-20017 CVE-2019-20018 -# 0004-Fix-memory-leak.patch -MATIO_IGNORE_CVES += CVE-2019-20052 - # va_copy() MATIO_CONF_ENV = ac_cv_va_copy=yes
Signature · 1 line
2.28.0
Thomas Petazzoni
AppliedPATCH 1/1 package/matio: bump to version 1.5.18
Quoted 7 lines · On Sun, 20 Sep 2020 12:19:08 +0200 Fabrice Fontaine…
- Drop all patches (already in version)
- Update hash of COPYING (update in year:
https://github.com/tbeu/matio/commit/4638154d738ae1cae3ebac6b86ddcde63e69a92f)https://github.com/tbeu/matio/releases/tag/v1.5.18
Signed-off-by Fabrice Fontaine <[email protected]>
Quoted 12 lines
--- .../0001-Avoid-uninitialized-memory.patch | 27 ----------- .../0002-Fix-illegal-memory-access.patch | 47 ------------------- .../0003-Fix-illegal-memory-access.patch | 46 ------------------ package/matio/0004-Fix-memory-leak.patch | 39 --------------- package/matio/matio.hash | 6 +-- package/matio/matio.mk | 11 +---- 6 files changed, 4 insertions(+), 172 deletions(-) delete mode 100644 package/matio/0001-Avoid-uninitialized-memory.patch delete mode 100644 package/matio/0002-Fix-illegal-memory-access.patch delete mode 100644 package/matio/0003-Fix-illegal-memory-access.patch delete mode 100644 package/matio/0004-Fix-memory-leak.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com