summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 01:34:20 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 01:34:20 +0000
commitebd7d7b7c9f2cbeeabe88a0154ffaeed031c4b9b (patch)
tree2d42088ffeb57a4acc8f731c2f89d6d90cc2142c
parent725622e863857df7e2eabe8db06765555fb0ae25 (diff)
Coverity #835: Plug memory leak in extension section parsing.
-rw-r--r--ChangeLog5
-rw-r--r--hw/xfree86/common/xf86Config.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 620ec399e..e3fd9e95e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-04-06 Adam Jackson <ajax@freedesktop.org>
+ * hw/xfree86/common/xf86Config.c:
+ Coverity #835: Plug memory leak in extension section parsing.
+
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
* hw/xfree86/parser/Keyboard.c:
Coverity #812: Fix parser memory leak.
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 96904c4f9..4eba06dfe 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.23 2006/03/12 00:11:33 krh Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.23.2.1 2006/04/03 21:59:58 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
@@ -2549,6 +2549,7 @@ configExtensions(XF86ConfExtensionsPtr conf_ext)
xf86Msg(X_ERROR,
"%s is not a valid value for the Extension option\n",
val);
+ xfree(n);
return FALSE;
}
@@ -2559,6 +2560,7 @@ configExtensions(XF86ConfExtensionsPtr conf_ext)
xf86Msg(X_WARNING, "Ignoring unrecognized extension \"%s\"\n",
name);
}
+ xfree(n);
}
}