summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2006-04-07 15:53:21 +0000
committerDaniel Stone <daniel@fooishbar.org>2006-04-07 15:53:21 +0000
commit843146cfbaef234e13df9a62b6f0232a5efdf7f0 (patch)
tree4730749fc8580cc562604f3c7fb6f79ae513593c
parent5dacc822327689c0f096093756473c96fba67d76 (diff)
Coverity #1216: Fix double-close of file on error.
-rw-r--r--ChangeLog5
-rw-r--r--hw/xfree86/utils/xorgcfg/keyboard-cfg.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8865609ee..adb25286f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-07 Daniel Stone <daniel@freedesktop.org>
+
+ * hw/xfree86/utils/xorgcfg/keyboard-cfg.c:
+ Coverity #1216: Fix double-close of file on error.
+
2006-04-06 Keith Packard <keithp@keithp.com>
* fb/fbstipple.c: (fbEvenStipple):
diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
index 334070d4e..05b1aeb09 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
@@ -1013,7 +1013,6 @@ KeyboardRulesCallback(Widget w, XtPointer user_data, XtPointer call_data)
}
if (!XkbRF_LoadRules(fp, xkb_rules->list)) {
- fclose(fp);
fprintf(stderr, "Can't load rules\n");
}
fclose(fp);