frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Coverity #838: Plug two more memory leaks.

This commit is contained in:
Adam Jackson 2006-04-07 01:41:00 +00:00
parent 69477ea4b6
commit 5ef711032b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-04-06 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/common/xf86Config.c:
Coverity #838: Plug two more memory leaks.
2006-04-06 Adam Jackson <ajax@freedesktop.org> 2006-04-06 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/common/xf86Config.c: * hw/xfree86/common/xf86Config.c:

10
hw/xfree86/common/xf86Config.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.26 2006/04/07 01:35:43 ajax Exp $ */ /* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.27 2006/04/07 01:37:11 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
@ -1952,8 +1952,10 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
idp = conf_layout->lay_inactive_lst; idp = conf_layout->lay_inactive_lst;
count = 0; count = 0;
while (idp) { while (idp) {
if (!configDevice(&gdp[count], idp->inactive_device, FALSE)) if (!configDevice(&gdp[count], idp->inactive_device, FALSE)) {
xfree(gdp);
return FALSE; return FALSE;
}
count++; count++;
idp = (XF86ConfInactivePtr)idp->list.next; idp = (XF86ConfInactivePtr)idp->list.next;
} }
@ -1975,8 +1977,10 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
irp = conf_layout->lay_input_lst; irp = conf_layout->lay_input_lst;
count = 0; count = 0;
while (irp) { while (irp) {
if (!configInput(&indp[count], irp->iref_inputdev, X_CONFIG)) if (!configInput(&indp[count], irp->iref_inputdev, X_CONFIG)) {
xfree(indp);
return FALSE; return FALSE;
}
indp[count].extraOptions = irp->iref_option_lst; indp[count].extraOptions = irp->iref_option_lst;
count++; count++;
irp = (XF86ConfInputrefPtr)irp->list.next; irp = (XF86ConfInputrefPtr)irp->list.next;