diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-15 21:08:54 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-15 21:08:54 +0000 |
| commit | fdeddc8e9da35c99bae08190a8476dc37ac8e9b8 (patch) | |
| tree | a28b8099d156ea27a5efc7d4603bbc2289363471 /user/libexif/CVE-2017-7544.patch | |
| parent | 230772b3aed14d14b9438ea9b2283fa28c7ebce5 (diff) | |
| parent | 29e941e719283d2570dc67038722d6ea6c19874e (diff) | |
| download | packages-fdeddc8e9da35c99bae08190a8476dc37ac8e9b8.tar.gz packages-fdeddc8e9da35c99bae08190a8476dc37ac8e9b8.tar.bz2 packages-fdeddc8e9da35c99bae08190a8476dc37ac8e9b8.tar.xz packages-fdeddc8e9da35c99bae08190a8476dc37ac8e9b8.zip | |
Merge branch 'sec/2020.06.02' into 'master'
Security updates for 2020.06.02
See merge request adelie/packages!464
Diffstat (limited to 'user/libexif/CVE-2017-7544.patch')
| -rw-r--r-- | user/libexif/CVE-2017-7544.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/user/libexif/CVE-2017-7544.patch b/user/libexif/CVE-2017-7544.patch deleted file mode 100644 index 534817417..000000000 --- a/user/libexif/CVE-2017-7544.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c39acd1692023b26290778a02a9232c873f9d71a Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <marcus@jet.franken.de> -Date: Tue, 25 Jul 2017 23:38:56 +0200 -Subject: [PATCH] On saving makernotes, make sure the makernote container tags - has a type with 1 byte components. - -Fixes (at least): - https://sourceforge.net/p/libexif/bugs/130 - https://sourceforge.net/p/libexif/bugs/129 ---- - libexif/exif-data.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index 67df4db..91f4c33 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e, - 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; -+ } - } - } - |