diff options
author | Scott Garman <scott.a.garman@intel.com> | 2012-12-22 21:52:27 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-03 12:34:23 +0000 |
commit | 01c1421270ae0c14a6547d7025137d36f3e98b0e (patch) | |
tree | d5a498dfd812fb78b3cd8bcaf8b5edb82319abda /meta | |
parent | 2ccb03f9b71db3bace4e60fafafcc2c80bd8b48f (diff) | |
download | poky-01c1421270ae0c14a6547d7025137d36f3e98b0e.tar.gz |
psplash: new patch to fix segfault
This fixes a segmentation fault when passing -a without
an argument.
Fixes [YOCTO #2903]
(From OE-Core rev: f5b8ba5e51ac41cf375119a88083617f667a85d5)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/psplash/files/psplash_fix_bad_arg_segfault.patch | 22 | ||||
-rw-r--r-- | meta/recipes-core/psplash/psplash_git.bb | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/meta/recipes-core/psplash/files/psplash_fix_bad_arg_segfault.patch b/meta/recipes-core/psplash/files/psplash_fix_bad_arg_segfault.patch new file mode 100644 index 0000000000..f69c8a2d5e --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash_fix_bad_arg_segfault.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Fix segmentation fault when passing -a without angle value. | ||
2 | |||
3 | When psplash -a is called instead of psplash -a<angle value>, it will | ||
4 | cause a segmentation fault by calling an out of bound argv[]. | ||
5 | |||
6 | Upstream-Status: Accepted | ||
7 | Needed for denzil since we're not upgrading the recipe. | ||
8 | |||
9 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
10 | |||
11 | diff -urN git.orig/psplash.c git/psplash.c | ||
12 | --- git.orig/psplash.c 2012-12-22 21:28:05.830631789 -0800 | ||
13 | +++ git/psplash.c 2012-12-22 21:29:54.962633330 -0800 | ||
14 | @@ -219,7 +219,7 @@ | ||
15 | |||
16 | if (!strcmp(argv[i],"-a") || !strcmp(argv[i],"--angle")) | ||
17 | { | ||
18 | - if (++i > argc) goto fail; | ||
19 | + if (++i >= argc) goto fail; | ||
20 | angle = atoi(argv[i]); | ||
21 | continue; | ||
22 | } | ||
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index f93afea2d0..56a953b557 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
@@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85b | |||
7 | 7 | ||
8 | SRCREV = "e05374aae945bcfc6d962ed0d7b2774b77987e1d" | 8 | SRCREV = "e05374aae945bcfc6d962ed0d7b2774b77987e1d" |
9 | PV = "0.1+git${SRCPV}" | 9 | PV = "0.1+git${SRCPV}" |
10 | PR = "r2" | 10 | PR = "r3" |
11 | 11 | ||
12 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ | 12 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ |
13 | file://psplash-init \ | 13 | file://psplash-init \ |
14 | file://psplash_fix_bad_arg_segfault.patch \ | ||
14 | ${SPLASH_IMAGES}" | 15 | ${SPLASH_IMAGES}" |
15 | 16 | ||
16 | SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" | 17 | SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" |