diff options
| author | Marius Bakke <marius@gnu.org> | 2020-05-26 22:38:12 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:38:12 +0200 |
| commit | 8a7a5dc7805f4628e60f90af6b2416f951d0c034 (patch) | |
| tree | 63f13443ea5c9e7ee5bb219fc9ff4f1eacfbf21a /gnu/packages/patches/libexif-CVE-2017-7544.patch | |
| parent | c37b621cf3f0cd9c06677b4be6f931d927e7fea5 (diff) | |
| parent | 8bd0b533b30d7ee5e03aee99a2eb96d5b0b1c836 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/libexif-CVE-2017-7544.patch')
| -rw-r--r-- | gnu/packages/patches/libexif-CVE-2017-7544.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/gnu/packages/patches/libexif-CVE-2017-7544.patch b/gnu/packages/patches/libexif-CVE-2017-7544.patch deleted file mode 100644 index c4ea373dc5..0000000000 --- a/gnu/packages/patches/libexif-CVE-2017-7544.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix CVE-2017-7544: - -https://sourceforge.net/p/libexif/bugs/130/ -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7544 - -Patch copied from upstream bug tracker: - -https://sourceforge.net/p/libexif/bugs/130/#489a - -Index: libexif/exif-data.c -=================================================================== -RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v -retrieving revision 1.131 -diff -u -r1.131 exif-data.c ---- a/libexif/exif-data.c 12 Jul 2012 17:28:26 -0000 1.131 -+++ b/libexif/exif-data.c 25 Jul 2017 21:34:06 -0000 -@@ -255,6 +255,12 @@ - exif_mnote_data_set_offset (data->priv->md, *ds - 6); - exif_mnote_data_save (data->priv->md, &e->data, &e->size); - e->components = e->size; -+ if (exif_format_get_size (e->format) != 1) { -+ /* e->format is taken from input code, -+ * but we need to make sure it is a 1 byte -+ * entity due to the multiplication below. */ -+ e->format = EXIF_FORMAT_UNDEFINED; -+ } - } - } - |