diff options
-rw-r--r-- | meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch | 27 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch new file mode 100644 index 000000000..2db67966c --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 97fefd050976bbbfca9608499f6a7d9fb86e70db Mon Sep 17 00:00:00 2001 | ||
2 | From: Sam Lantinga <slouken@libsdl.org> | ||
3 | Date: Tue, 30 Jul 2019 11:00:00 -0700 | ||
4 | Subject: [PATCH] Fixed bug 4538 - validate image size when loading BMP files | ||
5 | --- | ||
6 | src/video/SDL_bmp.c | 5 +++++ | ||
7 | 1 file changed, 5 insertions(+) | ||
8 | |||
9 | diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c | ||
10 | index 8eadc5f..5b5e12c 100644 | ||
11 | --- a/src/video/SDL_bmp.c | ||
12 | +++ b/src/video/SDL_bmp.c | ||
13 | @@ -143,6 +143,11 @@ SDL_Surface * SDL_LoadBMP_RW (SDL_RWops *src, int freesrc) | ||
14 | (void) biYPelsPerMeter; | ||
15 | (void) biClrImportant; | ||
16 | |||
17 | + if (biWidth <= 0 || biHeight == 0) { | ||
18 | + SDL_SetError("BMP file with bad dimensions (%dx%d)", biWidth, biHeight); | ||
19 | + was_error = SDL_TRUE; | ||
20 | + goto done; | ||
21 | + } | ||
22 | if (biHeight < 0) { | ||
23 | topDown = SDL_TRUE; | ||
24 | biHeight = -biHeight; | ||
25 | -- | ||
26 | 2.25.1 | ||
27 | |||
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb index 7a0190832..d91a1856b 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb | |||
@@ -27,6 +27,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ | |||
27 | file://CVE-2019-7637.patch \ | 27 | file://CVE-2019-7637.patch \ |
28 | file://CVE-2019-7638.patch \ | 28 | file://CVE-2019-7638.patch \ |
29 | file://CVE-2019-7576.patch \ | 29 | file://CVE-2019-7576.patch \ |
30 | file://CVE-2019-13616.patch \ | ||
30 | " | 31 | " |
31 | 32 | ||
32 | UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar" | 33 | UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar" |