summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 01:29:39 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 01:29:39 +0000
commit12924d0da36ad2266bb040caac58534c07e85261 (patch)
treecf2ae87ce1229dc00b826d6aaab667cdb0beab41
parent49abff79957799e9229d5c0226ee1b0d7505003d (diff)
Coverity #812: Fix parser memory leak.
-rw-r--r--ChangeLog5
-rw-r--r--hw/xfree86/parser/Keyboard.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 762fffe2d..c964d7b6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-04-06 Adam Jackson <ajax@freedesktop.org>
+ * hw/xfree86/parser/Keyboard.c:
+ Coverity #812: Fix parser memory leak.
+
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
* hw/xfree86/dixmods/extmod/xf86vmode.c:
Coverity #818: Avoid memory leak on error path.
diff --git a/hw/xfree86/parser/Keyboard.c b/hw/xfree86/parser/Keyboard.c
index e1f8b0508..62031f629 100644
--- a/hw/xfree86/parser/Keyboard.c
+++ b/hw/xfree86/parser/Keyboard.c
@@ -167,6 +167,7 @@ xf86parseKeyboardSection (void)
xf86conffree(s1);
}
xf86unGetToken (token);
+ xf86conffree(s);
break;
case SERVERNUM:
xf86parseWarning(OBSOLETE_MSG, xf86tokenString());