Annotation of /trunk/hal/patches/hal-0.5.10-fix-endless-loop-on-empty-match-rules-in-fdi-files.patch
Parent Directory
| 
Revision Log
Revision 597 -
(hide annotations)
(download)
Mon May 19 19:05:19 2008 UTC (16 years ago) by niro
File size: 768 byte(s)
Mon May 19 19:05:19 2008 UTC (16 years ago) by niro
File size: 768 byte(s)
-gentoo patches
| 1 | niro | 597 | From 9c070ccc6ece5a3dfbed803cceabf0b51e1453f7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Danny Kukawka <danny.kukawka@web.de> | ||
| 3 | Date: Mon, 26 Nov 2007 18:52:21 +0100 | ||
| 4 | Subject: [PATCH] fix endless loop on empty match rules in fdi-files | ||
| 5 | |||
| 6 | Fixed endless loop on empty fdi (match) rules. Simply jump to the next | ||
| 7 | rule if this happen. | ||
| 8 | --- | ||
| 9 | hald/device_info.c | 1 + | ||
| 10 | 1 files changed, 1 insertions(+), 0 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/hald/device_info.c b/hald/device_info.c | ||
| 13 | index 438ec52..d601e60 100644 | ||
| 14 | --- a/hald/device_info.c | ||
| 15 | +++ b/hald/device_info.c | ||
| 16 | @@ -1109,6 +1109,7 @@ rules_match_and_merge_device (void *fdi_rules_list, HalDevice *d) | ||
| 17 | |||
| 18 | default: | ||
| 19 | HAL_WARNING(("Unhandled rule (%i)!", rule->rtype)); | ||
| 20 | + rule = di_jump(rule); | ||
| 21 | break; | ||
| 22 | } | ||
| 23 | rule = di_next(rule); | ||
| 24 | -- | ||
| 25 | 1.5.3.7 | ||
| 26 |