From b8a304a9f9089bf03e3649582cee7ea96718e92f Mon Sep 17 00:00:00 2001 From: Simon Dawson Date: Tue, 6 Nov 2012 03:14:58 +0000 Subject: [PATCH] lcdproc: bump version to 0.5.6 Signed-off-by: Simon Dawson Signed-off-by: Peter Korsgaard --- .../lcdproc-0.5.5-fix-menu-segfault.patch | 19 ------------------- package/lcdproc/lcdproc.mk | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch diff --git a/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch b/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch deleted file mode 100644 index f0ebe2dec9..0000000000 --- a/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch +++ /dev/null @@ -1,19 +0,0 @@ -Trying to add a menu item using menu_add_item causes a segmentation fault -in the LCDd server. This is caused by a read beyond the end of an array. - -This patch adds a safety check on the size of the argument array. - -Signed-off-by: Simon Dawson - -diff -Nurp a/server/commands/menu_commands.c b/server/commands/menu_commands.c ---- a/server/commands/menu_commands.c 2011-08-14 13:29:16.000000000 +0100 -+++ b/server/commands/menu_commands.c 2012-10-04 22:19:07.997409193 +0100 -@@ -198,7 +198,7 @@ menu_add_item_func(Client *c, int argc, - - /* call menu_set_item() with a temporarily allocated argv - * to process the remaining options */ -- if ((argc > 5) || (argv[4][0] == '-')) { -+ if ((argc > 5) || ((argc == 5) && argv[4][0] == '-')) { - // menu_add_item [] - // menu_set_item {